From 94e9037522922b67e8af412b4cfe476f5e991118 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 23:00:35 +0000
Subject: [PATCH] AutoRefactor: fix modifiers usage

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java                  |   41 
 opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java                                               |   14 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java            |    3 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java                                         |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java            |    3 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java                                            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java            |   14 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java                                |   11 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java                 |   19 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java                                 |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java                   |    5 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java                          |    7 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java                                |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java                    |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java                                             |    2 
 opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java                                   |    8 
 opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java                                 |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java                                        |   20 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java                   |   38 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java                     |   12 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java       |    5 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java               |   32 
 opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java                                  |    5 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java                                 |   14 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java                         |    3 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java              |    5 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java                              |    2 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java                                |    8 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java                       |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java                                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java                   |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java               |    3 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java                            |    2 
 opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java                                    |   28 
 opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java                                              |    2 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java     |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java             |    6 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java                       |    2 
 opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java                           |   12 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java                   |    2 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java                    |   18 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java                     |    2 
 opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java                                       |   46 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java              |   17 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java                             |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java                                             |    8 
 opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java                                       |   13 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java                           |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java                                      |    9 
 opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java                            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java                                       |   11 
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java                               |    5 
 opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java                               |    2 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java                 |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java           |   22 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java                                     |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java                      |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java             |   16 
 opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java                      |   14 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java                                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java                                   |    5 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java                                 |   25 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java                                            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java               |    2 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java                    |   28 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java              |    3 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java              |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java            |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java      |    3 
 opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java                                   |    5 
 opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java                                         |    6 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java              |    8 
 opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java                                        |    2 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java                               |    4 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java                                     |    2 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java                        |   19 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java                |   28 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java                |   23 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java                                   |   14 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java                                        |   16 
 opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java                        |    5 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java                            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java                               |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java                      |    6 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java                                   |    3 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java                                 |    6 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java                      |   32 
 opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java                  |    2 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java                 |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java                 |    3 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java                |    5 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java           |   22 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java                            |    8 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java                                  |    6 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java       |    8 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java                                  |   10 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java                  |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java                               |    4 
 opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java                                 |    8 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java            |   10 
 opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java       |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java      |    3 
 opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java                            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java            |    3 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java            |   10 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java                  |   62 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java                 |   26 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java             |    8 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java                    |    2 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java              |   14 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java          |   16 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java     |   22 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java            |   24 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java                                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java                                         |    2 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java                |   24 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java           |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java                                 |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java              |    5 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java                  |   14 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java                  |    8 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java              |   27 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java                                         |    2 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java                        |    3 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java              |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java               |    7 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java                                            |    5 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java       |   14 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java                    |    2 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java                   |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java                                   |    5 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java                    |   18 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java                        |   39 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java                                           |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java             |   14 
 opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java                                 |    7 
 opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java                               |   17 
 opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java                              |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java                |    3 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java                |    3 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java            |   22 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java                           |    6 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java           |    4 
 opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java                                         |   16 
 opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java                                 |    5 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java                  |   43 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java                      |   14 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java                 |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java                      |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java            |   22 
 opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java                                          |    3 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java             |   14 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java                  |    3 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java                |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java                |   14 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java                                 |    4 
 opendj-server-legacy/src/messages/src/org/opends/messages/Category.java                                            |   10 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java                 |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java                                         |   12 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java             |   18 
 opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java           |   48 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java           |   14 
 opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java                                        |    2 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java                 |    3 
 opendj-server-legacy/src/messages/src/org/opends/messages/Severity.java                                            |   12 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java                                   |    6 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java                                    |   18 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java                                  |    8 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java             |   20 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java              |   26 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java                 |   14 
 opendj-server-legacy/nohup.out                                                                                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java               |   22 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java                      |    3 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java             |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java                        |   18 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java                                          |   31 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java             |   26 
 opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java                                       |   14 
 opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java                |    7 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java                |   18 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java |    3 
 opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java                 |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java                                       |    8 
 208 files changed, 1,028 insertions(+), 1,042 deletions(-)

diff --git a/opendj-server-legacy/nohup.out b/opendj-server-legacy/nohup.out
new file mode 100644
index 0000000..ebec5fb
--- /dev/null
+++ b/opendj-server-legacy/nohup.out
@@ -0,0 +1,4 @@
+Feb 17, 2015 7:26:11 PM org.springframework.context.support.AbstractApplicationContext prepareRefresh
+INFO: Refreshing org.springframework.context.annotation.AnnotationConfigApplicationContext@121a412b: startup date [Tue Feb 17 19:26:11 CET 2015]; root of context hierarchy
+Feb 17, 2015 7:26:13 PM org.springframework.beans.factory.support.DefaultListableBeanFactory preInstantiateSingletons
+INFO: Pre-instantiating singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@2128d41b: defining beans [org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,infinitestConfig,org.springframework.context.annotation.ConfigurationClassPostProcessor.importAwareProcessor,coreLifecycleObserver,swtEventQueue,visualStatusPresenter,slowTestObserver,resultCollectorBean,markerClearingRunnable,preferenceChangeHandler,infinitestActivationController,javaProjectSet,coreFactory,eclipseWorkspace,workspaceResourceFinder,infinitestCoreRegistry,markerPlacer,resourceLookupAdapter,slowMarkerRegistry,problemMarkerRegistry,markerClearingObserver,cleanEventProcessor,classFileChangeProcessor,coreUpdateNotifier,saveDetector,testResultAggregator,failureMediator,workspace,sourceContainer]; root of factory hierarchy
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java b/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java
index 80c2a4e..781658e 100644
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java
+++ b/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java
@@ -22,10 +22,13 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
-
 package javax.jnlp;
 
+import java.io.IOException;
+import java.net.URL;
+
 /**
  * This is just an empty implementation of DownloadService.  It does define
  * only the methods of the JNLP API used in the class 
@@ -43,12 +46,9 @@
  * javaws.jar will be provided by the Java Web Start Runtime environment.  So
  * we are not providing the javaws-stub.jar during runtime: it is used only
  * for compilation.
- *
  */
 public interface DownloadService {
-	public boolean isResourceCached(java.net.URL url, String version);
-	public void removeResource(java.net.URL url, String version)
-	 throws java.io.IOException;
-	public void loadResource(java.net.URL ref, String version,
-			DownloadServiceListener listener) throws java.io.IOException;
+  boolean isResourceCached(URL url, String version);
+  void removeResource(URL url, String version) throws IOException;
+  void loadResource(URL ref, String version, DownloadServiceListener listener) throws IOException;
 }
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java b/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
index 328db1f..7870483 100644
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
+++ b/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package javax.jnlp;
@@ -41,16 +42,12 @@
  * javaws.jar will be provided by the Java Web Start Runtime environment.  So
  * we are not providing the javaws-stub.jar during runtime: it is used only
  * for compilation.
- *
  */
 import java.net.URL;
 
 public interface DownloadServiceListener {
-	public void downloadFailed(URL url, String version);
-	public void progress(URL url, String version, long readSoFar, long total,
-		      int overallPercent);
-	public void upgradingArchive(URL url, String version, int patchPercent,
-		      int overallPercent);
-	public void validating(URL url, String version, long entry, long total,
-		      int overallPercent);
+  void downloadFailed(URL url, String version);
+  void progress(URL url, String version, long readSoFar, long total, int overallPercent);
+  void upgradingArchive(URL url, String version, int patchPercent, int overallPercent);
+  void validating(URL url, String version, long entry, long total, int overallPercent);
 }
diff --git a/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java b/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java
index abe1e3c..123a516 100644
--- a/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java
+++ b/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package netscape.ldap;
 
@@ -47,6 +48,6 @@
  */
 public interface LDAPSocketFactory
 {
-  public Socket makeSocket(String host, int port);
+  Socket makeSocket(String host, int port);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index 569cb39..4dbde40 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -257,7 +257,7 @@
   /**
    * The list of server properties that are multivalued.
    */
-  private final static Set<ServerProperty> MULTIVALUED_SERVER_PROPERTIES =
+  private static final Set<ServerProperty> MULTIVALUED_SERVER_PROPERTIES =
     new HashSet<ServerProperty>();
   static
   {
@@ -312,8 +312,7 @@
   /**
    * The list of server group properties that are multivalued.
    */
-  private final static
-  Set<ServerGroupProperty> MULTIVALUED_SERVER_GROUP_PROPERTIES =
+  private static final Set<ServerGroupProperty> MULTIVALUED_SERVER_GROUP_PROPERTIES =
     new HashSet<ServerGroupProperty>();
   static
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
index b77aefa..8498b12 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 
 package org.opends.admin.ads.util;
@@ -768,7 +768,7 @@
    * LDAP entry.
    * @throws NamingException if there is an error processing the entry.
    */
-  static public String getFirstValue(SearchResult entry, String attrName)
+  public static String getFirstValue(SearchResult entry, String attrName)
   throws NamingException
   {
     String v = null;
@@ -801,7 +801,7 @@
    * in a LDAP entry.
    * @throws NamingException if there is an error processing the entry.
    */
-  static public Set<String> getValues(SearchResult entry, String attrName)
+  public static Set<String> getValues(SearchResult entry, String attrName)
   throws NamingException
   {
     Set<String> values = new HashSet<String>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index e134566..9a73bcf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -57,13 +57,13 @@
  */
 public class ControlPanelLauncher
 {
-  static private ControlPanelArgumentParser  argParser;
+  private static ControlPanelArgumentParser  argParser;
 
   /** Prefix for log files. */
-  static public final String LOG_FILE_PREFIX = "opendj-control-panel-";
+  public static final String LOG_FILE_PREFIX = "opendj-control-panel-";
 
   /** Suffix for log files. */
-  static public final String LOG_FILE_SUFFIX = ".log";
+  public static final String LOG_FILE_SUFFIX = ".log";
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java
index dcdb895..8a26212 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringAttributes.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -40,42 +40,42 @@
    * localized name of the operation associated with the attribute).
    * @return the message associated with the attribute.
    */
-  public LocalizableMessage getMessage();
+  LocalizableMessage getMessage();
 
   /**
    * Returns the name of the attribute.
    * @return the name of the attribute.
    */
-  public String getAttributeName();
+  String getAttributeName();
 
   /**
    * Tells whether this is the number of aborted operations.
    * @return <CODE>true</CODE> if this corresponds to the number of aborted
    * operations and <CODE>false</CODE> otherwise.
    */
-  public boolean isAborted();
+  boolean isAborted();
 
   /**
    * Return whether this attribute contains a numeric value or not.
    * @return <CODE>true</CODE> if the value is numeric and <CODE>false</CODE>
    * otherwise.
    */
-  public boolean isNumeric();
+  boolean isNumeric();
 
   /**
    * Return whether this attribute contains a time value or not.
    * @return <CODE>true</CODE> if the value is a time and <CODE>false</CODE>
    * otherwise.
    */
-  public boolean isTime();
+  boolean isTime();
 
   /**
    * Return whether this attribute contains a numeric date value or not.
-   * The date is a long value in miliseconds.
+   * The date is a long value in milliseconds.
    * @return <CODE>true</CODE> if the value is date and <CODE>false</CODE>
    * otherwise.
    */
-  public boolean isNumericDate();
+  boolean isNumericDate();
 
   /**
    * Return whether this attribute contains a GMT date value or not.  The date
@@ -83,14 +83,14 @@
    * @return <CODE>true</CODE> if the value is a GMT date and <CODE>false</CODE>
    * otherwise.
    */
-  public boolean isGMTDate();
+  boolean isGMTDate();
 
   /**
    * Return whether this attribute represents a value in bytes or not.
    * @return <CODE>true</CODE> if the value represents a value in bytes and
    * <CODE>false</CODE> otherwise.
    */
-  public boolean isValueInBytes();
+  boolean isValueInBytes();
 
   /**
    * Returns <CODE>true</CODE> if the average for this attribute makes sense
@@ -98,5 +98,5 @@
    * @return <CODE>true</CODE> if the average for this attribute makes sense
    * and <CODE>false</CODE> otherwise.
    */
-  public boolean canHaveAverage();
+  boolean canHaveAverage();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 0fa1271..5d6aad5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -598,7 +598,7 @@
    * @return <CODE>true</CODE> if the two schema attributes are equal and
    * <CODE>false</CODE> otherwise.
    */
-  private static final boolean areAttributesEqual(AttributeType attr1, AttributeType attr2)
+  private static boolean areAttributesEqual(AttributeType attr1, AttributeType attr2)
   {
     return attr1.getOID().equals(attr2.getOID())
         && attr1.isCollective() == attr2.isCollective()
@@ -630,7 +630,7 @@
    * @return <CODE>true</CODE> if the two schema objectclasses are equal and
    * <CODE>false</CODE> otherwise.
    */
-  private static final boolean areObjectClassesEqual(ObjectClass oc1, ObjectClass oc2)
+  private static boolean areObjectClassesEqual(ObjectClass oc1, ObjectClass oc2)
   {
     return oc1.getOID().equals(oc2.getOID())
         && oc1.isExtensibleObject() == oc2.isExtensibleObject()
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java
index f9aaee8..9ddff81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -37,5 +38,5 @@
    * Method called when a set of backends are populated.
    * @param ev the event notifying that a set of backends have been populated.
    */
-  public void backendPopulated(BackendPopulatedEvent ev);
+  void backendPopulated(BackendPopulatedEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
index da2220f..a5ed2b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -36,5 +37,5 @@
    * Method called when a backup is created.
    * @param ev the event notifying that the backup was created.
    */
-  public void backupCreated(BackupCreatedEvent ev);
+  void backupCreated(BackupCreatedEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java
index 279007f..e7059c0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -38,5 +39,5 @@
    * generated.
    * @param e the browser event.
    */
-  public void processBrowserEvent(BrowserEvent e);
+  void processBrowserEvent(BrowserEvent e);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
index 2474098..ac70453 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigChangeListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -37,5 +38,5 @@
    * Method that is called when a change in the configuration occurred.
    * @param ev the configuration change event.
    */
-  public void configurationChanged(ConfigurationChangeEvent ev);
+  void configurationChanged(ConfigurationChangeEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
index eb95c1a..3b6f92a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ConfigurationElementCreatedListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -38,5 +39,5 @@
    * Method that is called when a new configuration element was created.
    * @param ev the configuration change event.
    */
-  public void elementCreated(ConfigurationElementCreatedEvent ev);
+  void elementCreated(ConfigurationElementCreatedEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java
index 3a5a2f6..676c4f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/EntryReadListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -38,10 +39,10 @@
    * Notifies that an entry was successfully read.
    * @param ev the event containing the search result.
    */
-  public void entryRead(EntryReadEvent ev);
+  void entryRead(EntryReadEvent ev);
   /**
    * Notifies that an error reading an entry.
    * @param ev the event describing the error.
    */
-  public void entryReadError(EntryReadErrorEvent ev);
+  void entryReadError(EntryReadErrorEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
index 42b82d6..6df449e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexModifiedListener.java
@@ -22,14 +22,13 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
-
 package org.opends.guitools.controlpanel.event;
 
 /**
  * Interface that must be implemented by the objects that want to receive
  * notifications when an index has been modified.
- *
  */
 public interface IndexModifiedListener
 {
@@ -37,11 +36,11 @@
    * Notification that an index has been modified.
    * @param ev the index event.
    */
-  public void indexModified(IndexModifiedEvent ev);
+  void indexModified(IndexModifiedEvent ev);
 
   /**
    * Notification that the indexes in a backend have been modified.
    * @param ev the index event.
    */
-  public void backendIndexesModified(IndexModifiedEvent ev);
+  void backendIndexesModified(IndexModifiedEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
index 6c498c9..c30d3de 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/IndexSelectionListener.java
@@ -22,15 +22,14 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
-
 package org.opends.guitools.controlpanel.event;
 
 /**
  * Interface that must be implemented by the objects that want to receive
  * notifications when an index has been selected.  This is used in the dialog
  * 'Manage Index' to notify that a new index is selected on the tree.
- *
  */
 public interface IndexSelectionListener
 {
@@ -38,5 +37,5 @@
    * Notification that an index has been selected.
    * @param ev the index selection event.
    */
-  public void indexSelected(IndexSelectionEvent ev);
+  void indexSelected(IndexSelectionEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
index 81d1cd7..740f59a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/LDAPEntryChangedListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -39,5 +40,5 @@
    * Notification that an LDAP entry has been modified.
    * @param ev the event.
    */
-  public void entryChanged(LDAPEntryChangedEvent ev);
+  void entryChanged(LDAPEntryChangedEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java
index 85ddce8..17bc92a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/MoveListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -40,5 +41,5 @@
    * Notification that the entry is being moved.
    * @param ev the event.
    */
-  public void processMoveEvent(MoveEvent ev);
+  void processMoveEvent(MoveEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java
index d3e7210..7dd1f20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/PrintStreamListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -40,5 +41,5 @@
    * Notification that a new line has been written in a PrintStream.
    * @param line the new line.
    */
-  public void newLine(String line);
+  void newLine(String line);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
index 03317d8..78d6083 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ReferralAuthenticationListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -39,5 +40,5 @@
    * Notification that some authentication changed.
    *
    */
-  public void notifyAuthDataChanged();
+  void notifyAuthDataChanged();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
index 0e69f00..0f93c3e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/SchemaElementSelectionListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -39,5 +40,5 @@
    * Notification that a schema element has been selected.
    * @param ev the schema element selection event.
    */
-  public void schemaElementSelected(SchemaElementSelectionEvent ev);
+  void schemaElementSelected(SchemaElementSelectionEvent ev);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
index fd41815..e9ad35f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java
@@ -26,15 +26,16 @@
  */
 package org.opends.guitools.controlpanel.task;
 
+import static com.forgerock.opendj.cli.Utils.*;
+import static com.forgerock.opendj.util.OperatingSystem.*;
+
 import static org.opends.messages.AdminToolMessages.*;
-import static com.forgerock.opendj.util.OperatingSystem.isWindows;
-import static com.forgerock.opendj.cli.Utils.OBFUSCATED_VALUE;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Map;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.naming.NamingException;
@@ -43,12 +44,13 @@
 import javax.naming.directory.ModificationItem;
 import javax.naming.ldap.InitialLdapContext;
 
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
 import org.opends.admin.ads.util.ConnectionUtils;
 import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
 import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
 import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedEvent;
-import org.opends.guitools.controlpanel.event.
- ConfigurationElementCreatedListener;
+import org.opends.guitools.controlpanel.event.ConfigurationElementCreatedListener;
 import org.opends.guitools.controlpanel.event.PrintStreamListener;
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 import org.opends.guitools.controlpanel.ui.ProgressDialog;
@@ -56,20 +58,18 @@
 import org.opends.guitools.controlpanel.util.ConfigReader;
 import org.opends.guitools.controlpanel.util.ProcessReader;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 import org.opends.quicksetup.Installation;
 import org.opends.quicksetup.UserData;
-import org.forgerock.opendj.ldap.ByteString;
 import org.opends.server.types.DN;
 import org.opends.server.types.Schema;
 import org.opends.server.util.Base64;
 import org.opends.server.util.SetupUtils;
+
 import com.forgerock.opendj.cli.CommandBuilder;
 
 /**
  * The class used to define a number of common methods and mechanisms for the
  * tasks that are run in the Control Panel.
- *
  */
 public abstract class Task
 {
@@ -77,7 +77,6 @@
   private String binDir;
   /**
    * The different task types.
-   *
    */
   public enum Type
   {
@@ -290,6 +289,7 @@
        * Add a new line to the logs.
        * @param msg the new line.
        */
+      @Override
       public void newLine(String msg)
       {
         outputLogs.append(msg).append("\n");
@@ -302,6 +302,7 @@
        * Add a new line to the error logs.
        * @param msg the new line.
        */
+      @Override
       public void newLine(String msg)
       {
         errorLogs.append(msg).append("\n");
@@ -1007,8 +1008,7 @@
   /**
    * The separator used to link the lines of the resulting command-lines.
    */
-  private final static String LINE_SEPARATOR =
-    CommandBuilder.HTML_LINE_SEPARATOR;
+  private static final String LINE_SEPARATOR = CommandBuilder.HTML_LINE_SEPARATOR;
 
   /**
    * Returns the equivalent command line in HTML without font properties.
@@ -1020,9 +1020,8 @@
       List<String> args)
   {
     StringBuilder sb = new StringBuilder(cmdName);
-    for (int i=0; i<args.size(); i++)
+    for (String arg : args)
     {
-      String arg = args.get(i);
       if (arg.charAt(0) == '-')
       {
         sb.append(LINE_SEPARATOR);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
index 053818f..c5b815e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -80,8 +80,8 @@
 
   private boolean valueChanged;
 
-  private final static int MAX_IMAGE_HEIGHT = 300;
-  private final static int MAX_BASE64_TO_DISPLAY = 3 * 1024;
+  private static final int MAX_IMAGE_HEIGHT = 300;
+  private static final int MAX_BASE64_TO_DISPLAY = 3 * 1024;
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
index 30e2906..c5df510 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -209,7 +209,7 @@
   /**
    * The font of the table header.
    */
-  public final static Font headerFont =
+  public static final Font headerFont =
   UIManager.getFont("TableHeader.font").deriveFont(Font.BOLD);
   /**
    * The font to be used in the title of the error panes.
@@ -237,11 +237,11 @@
   /**
    * The font to be used in the table.
    */
-  public final static Font tableFont = UIManager.getFont("Table.font");
+  public static final Font tableFont = UIManager.getFont("Table.font");
   /**
    * The font to be used in the title of the TitlePanel component.
    */
-  public final static Font titleFont =
+  public static final Font titleFont =
   defaultFont.deriveFont(Font.BOLD).deriveFont(14f);
   /**
    * Text color indicating that a field is not valid.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
index 2759f36..0942f56 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -72,7 +72,7 @@
 public class GenericDialog extends JDialog
 {
   private static final long serialVersionUID = -2643144936460484112L;
-  private final static Color buttonPanelBackground =
+  private static final Color buttonPanelBackground =
     ColorAndFontConstants.greyBackground;
   private JButton okButton;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
index c5834d1..a13388e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -72,7 +72,7 @@
 public class GenericFrame extends JFrame
 {
   private static final long serialVersionUID = -2643144936460484112L;
-  private final static Color buttonPanelBackground =
+  private static final Color buttonPanelBackground =
     ColorAndFontConstants.greyBackground;
   private JButton okButton;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
index d04b4d2..0bfae1e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -56,8 +56,8 @@
   private BackendVLVIndexesPanel backendVLVIndexesPanel =
     new BackendVLVIndexesPanel();
 
-  private final static String NOTHING_SELECTED = "Nothing Selected";
-  private final static String MULTIPLE_SELECTED = "Multiple Selected";
+  private static final String NOTHING_SELECTED = "Nothing Selected";
+  private static final String MULTIPLE_SELECTED = "Multiple Selected";
 
   /**
    * Default constructor.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
index 637827f..d6207d1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -72,7 +72,7 @@
 
   private Object value;
 
-  private final static int THUMBNAIL_HEIGHT = 50;
+  private static final int THUMBNAIL_HEIGHT = 50;
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
index a634c44..24f8f1b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -55,7 +56,7 @@
   private static final long serialVersionUID = 6191857253411571940L;
   private Border buttonSelectedBorder;
   private Border buttonUnselectedBorder;
-  private final static Color backgroundColor =
+  private static final Color backgroundColor =
     ColorAndFontConstants.greyBackground;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
index 871284a..016c743 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -40,7 +41,7 @@
    * URL of the displayed entry.
    * @return the URL of the displayed entry.
    */
-  public LDAPURL getURL();
+  LDAPURL getURL();
 
 
   /**
@@ -49,7 +50,7 @@
    * @return <CODE>true</CODE> if the displayed entry is the top entry of a
    * suffix and <CODE>false</CODE> otherwise.
    */
-  public boolean isSuffix();
+  boolean isSuffix();
 
 
   /**
@@ -58,7 +59,7 @@
    * @return <CODE>true</CODE> if the displayed entry is the root node of the
    * server (the dn="" entry) and <CODE>false</CODE> otherwise.
    */
-  public boolean isRootNode();
+  boolean isRootNode();
 
   /**
    * Returns <CODE>true</CODE> if the displayed entry is not located on the
@@ -71,7 +72,7 @@
    * the browser controller. Returns <CODE>false</CODE> otherwise.
    *
    */
-  public boolean isRemote();
+  boolean isRemote();
 
 
   /**
@@ -79,14 +80,14 @@
    * -1 if the numsubordinates attribute is not defined.
    * @return the value of numsubordinates for the entry.
    */
-  public int getNumSubOrdinates();
+  int getNumSubOrdinates();
 
 
   /**
    * Returns the value of hassubordinates for the entry.
    * @return the value of hassubordinates for the entry.
    */
-  public boolean hasSubOrdinates();
+  boolean hasSubOrdinates();
 
   /**
    * Returns the referrals attached to the displayed entry.
@@ -94,14 +95,14 @@
    * Returns <CODE>null</CODE> if the attribute is not present.
    * @return the referrals attached to the displayed entry.
    */
-  public String[] getReferral();
+  String[] getReferral();
 
 
   /**
    * Returns the error detected while reading this entry.
    * @return the error detected while reading this entry.
    */
-  public int getErrorType();
+  int getErrorType();
 
 
   /**
@@ -109,7 +110,7 @@
    * Returns <CODE>null</CODE> if getErrorType() == ERROR_NONE.
    * @return the exception associated to the error.
    */
-  public Exception getErrorException();
+  Exception getErrorException();
 
 
   /**
@@ -118,36 +119,36 @@
    * errorArg contains the String representing the faulty LDAP URL.
    * @return the argument associated to an error/exception.
    */
-  public Object getErrorArg();
+  Object getErrorArg();
 
   /**
    * Returns the basic node associated with the node info.
    * @return the basic node associated with the node info.
    */
-  public BasicNode getNode();
+  BasicNode getNode();
 
 
   /**
    * Returns the TreePath corresponding to the displayed entry.
    * @return the TreePath corresponding to the displayed entry.
    */
-  public TreePath getTreePath();
+  TreePath getTreePath();
 
 
   /**
-   * Tells wether the node passed as parameter represents the same node as this
+   * Tells whether the node passed as parameter represents the same node as this
    * one.
    * @param node the node.
    * @return <CODE>true</CODE> if the node passed as parameter represents the
    * same node as this one and <CODE>false</CODE> otherwise.
    */
-  public boolean representsSameNode(BrowserNodeInfo node);
+  boolean representsSameNode(BrowserNodeInfo node);
 
   /**
    * Returns the object class value of the entry that the nodes represents.
    * @return the object class value of the entry that the nodes represents.
    */
-  public String[] getObjectClassValues();
+  String[] getObjectClassValues();
 
   /**
    * Error types
@@ -155,20 +156,18 @@
   /**
    * No error happened.
    */
-  public static final int ERROR_NONE          = 0;
+  int ERROR_NONE          = 0;
   /**
    * And error reading the entry occurred.
    */
-  public static final int ERROR_READING_ENTRY     = 1;
+  int ERROR_READING_ENTRY     = 1;
   /**
    * An error following referrals occurred.
    */
-  public static final int ERROR_SOLVING_REFERRAL    = 2;
+  int ERROR_SOLVING_REFERRAL    = 2;
   /**
    * An error occurred searching the children of the entry.
    */
-  public static final int ERROR_SEARCHING_CHILDREN  = 3;
-
-
+  int ERROR_SEARCHING_CHILDREN  = 3;
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
index d0a02d0..9531284 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -44,7 +45,7 @@
   /**
    * The data flavor managed by this transferable.
    */
-  final public static DataFlavor INFO_FLAVOR =
+  public static final DataFlavor INFO_FLAVOR =
     new DataFlavor(BrowserNodeInfo.class, "Browse Node Information");
 
   static DataFlavor[] FLAVORS = {INFO_FLAVOR };
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
index 695b826..3ad53c1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -51,11 +52,11 @@
   private static final long serialVersionUID = -4645902129785751854L;
   private DateFormat formatter = DateFormat.getDateInstance(DateFormat.FULL);
   private File backupParentPath;
-  private final static Border fullBorder = BorderFactory.createCompoundBorder(
+  private static final Border fullBorder = BorderFactory.createCompoundBorder(
       BorderFactory.createMatteBorder(1, 0, 0, 0,
           ColorAndFontConstants.gridColor),
           BorderFactory.createEmptyBorder(4, 4, 4, 4));
-  private final static Border incrementalBorder =
+  private static final Border incrementalBorder =
     BorderFactory.createEmptyBorder(4, 4, 4, 4);
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
index 1392da9..65b9dc9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -51,7 +51,7 @@
   /**
    * The border of the first column.
    */
-  protected final static Border column0Border =
+  protected static final Border column0Border =
     BorderFactory.createCompoundBorder(
       BorderFactory.createMatteBorder(0, 1, 0, 0,
           ColorAndFontConstants.gridColor),
@@ -59,7 +59,7 @@
   /**
    * The default border.
    */
-  public final static Border defaultBorder =
+  public static final Border defaultBorder =
     BorderFactory.createEmptyBorder(4, 4, 4, 4);
   private static Border defaultFocusBorder;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
index cfa326e..3eca817 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -45,7 +46,7 @@
    * The border of the first column.
    * TODO: modify CustomCellRenderer to make this public.
    */
-  protected final static Border column0Border =
+  protected static final Border column0Border =
     BorderFactory.createCompoundBorder(
       BorderFactory.createMatteBorder(0, 1, 0, 0,
           ColorAndFontConstants.gridColor),
@@ -53,7 +54,7 @@
   /**
    * The default border.
    */
-  public final static Border defaultBorder = CustomCellRenderer.defaultBorder;
+  public static final Border defaultBorder = CustomCellRenderer.defaultBorder;
 
   /**
    * Default constructor.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
index 96e0cf5..3f74cf2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -43,8 +43,8 @@
   private static String[] packages = {
     "org.opends"
   };
-  static private File logFile;
-  static private FileHandler fileHandler;
+  private static File logFile;
+  private static FileHandler fileHandler;
 
   /**
    * Creates a new file handler for writing log messages to the file indicated
@@ -52,7 +52,7 @@
    * @param file log file to which log messages will be written
    * @throws IOException if something goes wrong
    */
-  static public void initLogFileHandler(File file) throws IOException {
+  public static void initLogFileHandler(File file) throws IOException {
     if (!isInitialized())
     {
       logFile = file;
@@ -82,7 +82,7 @@
    * @param packageName the package name.
    * @throws IOException if something goes wrong
    */
-  static public void initPackage(String packageName) throws IOException {
+  public static void initPackage(String packageName) throws IOException {
     Logger logger = Logger.getLogger(packageName);
     if (disableLoggingToConsole())
     {
@@ -96,7 +96,7 @@
    * Gets the name of the log file.
    * @return File representing the log file
    */
-  static public File getLogFile() {
+  public static File getLogFile() {
     return logFile;
   }
 
@@ -104,11 +104,11 @@
    * Indicates whether or not the log file has been initialized.
    * @return true when the log file has been initialized
    */
-  static public boolean isInitialized() {
+  public static boolean isInitialized() {
     return logFile != null;
   }
 
-  static private String getInitialLogRecord() {
+  private static String getInitialLogRecord() {
     StringBuilder sb = new StringBuilder()
             .append("Application launched " +
                     DateFormat.getDateTimeInstance(DateFormat.LONG,
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
index 1fdf8b9..eddc537 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -56,10 +56,10 @@
 public class UninstallLauncher extends Launcher {
 
   /** Prefix for log files. */
-  static public final String LOG_FILE_PREFIX = "opendj-uninstall-";
+  public static final String LOG_FILE_PREFIX = "opendj-uninstall-";
 
   /** Suffix for log files. */
-  static public final String LOG_FILE_SUFFIX = ".log";
+  public static final String LOG_FILE_SUFFIX = ".log";
 
   /**
    * The main method which is called by the uninstall command lines.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
index 2bfe4ca..dfef502 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
@@ -61,7 +61,7 @@
    * @throws ApplicationException if all or some important information could
    * not be determined
    */
-  static public BuildInformation create(Installation installation)
+  public static BuildInformation create(Installation installation)
           throws ApplicationException {
     BuildInformation bi = new BuildInformation();
     List<String> args = new ArrayList<String>();
@@ -193,7 +193,7 @@
    * @throws IllegalArgumentException if <code>bn</code> is not a build
    * number
    */
-  static public BuildInformation fromBuildString(String bn) throws
+  public static BuildInformation fromBuildString(String bn) throws
     IllegalArgumentException
   {
     // -------------------------------------------------------
@@ -387,7 +387,7 @@
     return hc;
   }
 
-  static private void checkNotNull(Map<?, ?> values, String... props)
+  private static void checkNotNull(Map<?, ?> values, String... props)
           throws ApplicationException {
     for (String prop : props) {
       if (null == values.get(prop)) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
index 072538b..0c72513 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.quicksetup;
 
@@ -34,7 +34,7 @@
 public class Constants {
 
   /** Platform appropriate line separator. */
-  static public final String LINE_SEPARATOR =
+  public static final String LINE_SEPARATOR =
           System.getProperty("line.separator");
 
   /** HTML line break tag. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
index bf16a2a..f8fb188 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.quicksetup;
 
@@ -316,7 +316,7 @@
    *           indicating the reason why <code>rootDirectory</code> is not a
    *           valid OpenDJ install root.
    */
-  static public void validateRootDirectory(File rootDirectory)
+  public static void validateRootDirectory(File rootDirectory)
       throws IllegalArgumentException
   {
     LocalizableMessage failureReason = null;
@@ -363,7 +363,7 @@
 
 
 
-  static private Installation local;
+  private static Installation local;
 
 
 
@@ -373,7 +373,7 @@
    *
    * @return Installation obtained by reading the classpath
    */
-  static public Installation getLocal()
+  public static Installation getLocal()
   {
     if (local == null)
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
index 05f4d38..e2b45c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java
@@ -256,7 +256,7 @@
    * in some operating systems.
    * @return internationalized String representing the frame title
    */
-  abstract protected LocalizableMessage getFrameTitle();
+  protected abstract LocalizableMessage getFrameTitle();
 
   /**
    * Launches the command line based uninstall.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
index ace98b5..5d0b124 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
@@ -51,17 +51,17 @@
   /**
    * The license file name in Legal directory.
    */
-  private final static String LICENSE_FILE_NAME = "license_to_accept.txt";
+  private static final String LICENSE_FILE_NAME = "license_to_accept.txt";
 
   /**
    * The Legal folder which contains license file.
    */
-  private final static String LEGAL_FOLDER_NAME = "Legal";
+  private static final String LEGAL_FOLDER_NAME = "Legal";
 
   /**
    * The accepted license file name.
    */
-  private final static String ACCEPTED_LICENSE_FILE_NAME = "licenseAccepted";
+  private static final String ACCEPTED_LICENSE_FILE_NAME = "licenseAccepted";
 
   /**
    * Get the directory in which legal files are stored.
@@ -95,17 +95,17 @@
   /**
    * The File object related to the license file.
    */
-  static private File licFile;
+  private static File licFile;
 
   /**
    * The license file approval state.
    */
-  static private boolean approved;
+  private static boolean approved;
 
   /**
    * Returns the license file name.
    */
-  static private String getName()
+  private static String getName()
   {
     return getInstanceLegalDirectory() + File.separatorChar
         + LICENSE_FILE_NAME;
@@ -114,20 +114,19 @@
   /**
    * Returns the license file object.
    */
-  static private File getFile()
+  private static File getFile()
   {
     if (licFile == null)
     {
       licFile = new File(getName());
     }
-
     return licFile;
   }
 
   /**
    * Returns the URL to the license file when using jnlp / java web start.
    */
-  static private URL getWebStartLicenseFile()
+  private static URL getWebStartLicenseFile()
   {
     final String licenseResource =
         LEGAL_FOLDER_NAME + File.separatorChar + LICENSE_FILE_NAME;
@@ -142,11 +141,11 @@
    *         in the top level installation directory <CODE>false</CODE>
    *         otherwise.
    */
-  static public boolean exists()
+  public static boolean exists()
   {
     if (Utils.isWebStart())
     {
-      return (getWebStartLicenseFile() != null);
+      return getWebStartLicenseFile() != null;
     }
     else
     {
@@ -159,7 +158,7 @@
    *
    * @return the textual contents of the license file.
    */
-  static public String getText()
+  public static String getText()
   {
     InputStream input = null;
     // Gets the inputstream of the license
@@ -227,7 +226,7 @@
    * @return <CODE>true</CODE> if the license has been accepted by the user
    *         <CODE>false</CODE> otherwise.
    */
-  static public boolean getApproval()
+  public static boolean getApproval()
   {
     return approved;
   }
@@ -238,7 +237,7 @@
    * @param p_approved
    *          the license approval status
    */
-  static public void setApproval(boolean p_approved)
+  public static void setApproval(boolean p_approved)
   {
     approved = p_approved;
   }
@@ -250,7 +249,7 @@
    * @param installationPath
    *          The server installation's path.
    */
-  static public void createFileLicenseApproved(final String installationPath)
+  public static void createFileLicenseApproved(final String installationPath)
   {
     if (getApproval() && installationPath != null)
     {
@@ -272,7 +271,7 @@
    * @return <CODE>true</CODE> if the license had already been approved by the
    *         user <CODE>false</CODE> otherwise.
    */
-  static public boolean isAlreadyApproved()
+  public static boolean isAlreadyApproved()
   {
     final File f =
         new File(getInstanceLegalDirectory() + File.separatorChar
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
index fcdfcbe..20e5cac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupLog.java
@@ -41,8 +41,8 @@
  */
 public class QuickSetupLog {
 
-  static private File logFile;
-  static private FileHandler fileHandler;
+  private static File logFile;
+  private static FileHandler fileHandler;
 
   /**
    * Creates a new file handler for writing log messages to the file indicated
@@ -50,7 +50,7 @@
    * @param file log file to which log messages will be written
    * @throws IOException if something goes wrong
    */
-  static public void initLogFileHandler(File file) throws IOException {
+  public static void initLogFileHandler(File file) throws IOException {
     if (!isInitialized()) {
       logFile = file;
       fileHandler = new FileHandler(logFile.getCanonicalPath());
@@ -71,7 +71,7 @@
    * log messages.
    * @throws IOException if something goes wrong
    */
-  static public void initLogFileHandler(File file, String packageName)
+  public static void initLogFileHandler(File file, String packageName)
   throws IOException {
     initLogFileHandler(file);
     Logger logger = Logger.getLogger(packageName);
@@ -86,7 +86,7 @@
    * Prevents messages written to loggers from appearing in the console
    * output.
    */
-  static public void disableConsoleLogging() {
+  public static void disableConsoleLogging() {
     if (disableLoggingToConsole())
     {
       Logger logger = Logger.getLogger("org.opends");
@@ -98,7 +98,7 @@
    * Gets the name of the log file.
    * @return File representing the log file
    */
-  static public File getLogFile() {
+  public static File getLogFile() {
     return logFile;
   }
 
@@ -106,11 +106,11 @@
    * Indicates whether or not the log file has been initialized.
    * @return true when the log file has been initialized
    */
-  static public boolean isInitialized() {
+  public static boolean isInitialized() {
     return logFile != null;
   }
 
-  static private String getInitialLogRecord() {
+  private static String getInitialLogRecord() {
     // Note; currently the logs are not internationalized.
     return "QuickSetup application launched " +
         DateFormat.getDateTimeInstance(DateFormat.LONG,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
index fcefd14..053e9cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.quicksetup;
 
@@ -576,7 +576,7 @@
    * @return the free port of type x389 if it is available and we can use and -1
    * if not.
    */
-  static public int getDefaultPort()
+  public static int getDefaultPort()
   {
     return getDefaultPort(389);
   }
@@ -589,7 +589,7 @@
    * @return the free port of type x444 if it is available and we can use and -1
    * if not.
    */
-  static public int getDefaultAdminConnectorPort()
+  public static int getDefaultAdminConnectorPort()
   {
     return getDefaultPort(4444);
   }
@@ -634,7 +634,7 @@
    * @param forbiddenPorts an array of ports that we cannot use.
    * @return the port X689 if it is available and we can use and -1 if not.
    */
-  static public int getDefaultJMXPort(int[] forbiddenPorts)
+  public static int getDefaultJMXPort(int[] forbiddenPorts)
   {
     int defaultJMXPort = -1;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java
index ef4c7e5..a8ea70c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ButtonActionListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.event;
@@ -29,14 +30,13 @@
 /**
  * Interface used for the actions that are done in the wizard buttons (those
  * specified in org.opends.quicksetup.ButtonName).
- *
  */
 public interface ButtonActionListener
 {
   /**
-   * Method called when the user clicks on one of the buttons specifid in
+   * Method called when the user clicks on one of the buttons specified in
    * org.opends.quicksetup.ButtonName.
    * @param event the button event
    */
-  public void buttonActionPerformed(ButtonEvent event);
+  void buttonActionPerformed(ButtonEvent event);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java
index 80b9143..f7ead0f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/ProgressUpdateListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.event;
@@ -39,6 +40,6 @@
    * @param ev the ProgressUpdateEvent describing the update that
    * occurred in the installation progress.
    */
-  public void progressUpdate(ProgressUpdateEvent ev);
+  void progressUpdate(ProgressUpdateEvent ev);
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index 6b61247..41988ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.installer.ui;
@@ -745,7 +745,7 @@
     }
   }
 
-  private final static String INSTALL_PATH =
+  private static final String INSTALL_PATH =
     Utils.getInstallPathFromClasspath();
 
   private void checkOptions(String options, Collection<LocalizableMessage> errorMsgs,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
index b0a6fa7..ff50bb0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -80,7 +80,7 @@
    * in some operating systems.
    * @return internationalized String representing the frame title
    */
-  abstract public LocalizableMessage getFrameTitle();
+  public abstract LocalizableMessage getFrameTitle();
 
   /**
    * Returns the initial wizard step.
@@ -134,7 +134,7 @@
    * @param dlg QuickSetupDialog that will be closing
    * @param evt The event from the Window indicating closing
    */
-  abstract public void windowClosing(QuickSetupDialog dlg, WindowEvent evt);
+  public abstract void windowClosing(QuickSetupDialog dlg, WindowEvent evt);
 
   /**
    * This method is called when we detected that there is something installed
@@ -166,7 +166,7 @@
    * Get the name of the button that will receive initial focus.
    * @return ButtonName of the button to receive initial focus
    */
-  abstract public ButtonName getInitialFocusButtonName();
+  public abstract ButtonName getInitialFocusButtonName();
 
   /**
    * Creates the main panel for the wizard dialog.
@@ -183,34 +183,34 @@
    * Returns the set of wizard steps used in this application's wizard.
    * @return Set of Step objects representing wizard steps
    */
-  abstract public Set<? extends WizardStep> getWizardSteps();
+  public abstract Set<? extends WizardStep> getWizardSteps();
 
   /**
    * Creates a wizard panel given a specific step.
    * @param step for which a panel representation should be created
    * @return QuickSetupStepPanel for representing the <code>step</code>
    */
-  abstract public QuickSetupStepPanel createWizardStepPanel(WizardStep step);
+  public abstract QuickSetupStepPanel createWizardStepPanel(WizardStep step);
 
   /**
    * Gets the next step in the wizard given a current step.
    * @param step Step the current step
    * @return Step the next step
    */
-  abstract public WizardStep getNextWizardStep(WizardStep step);
+  public abstract WizardStep getNextWizardStep(WizardStep step);
 
   /**
    * Gets the previous step in the wizard given a current step.
    * @param step Step the current step
    * @return Step the previous step
    */
-  abstract public WizardStep getPreviousWizardStep(WizardStep step);
+  public abstract WizardStep getPreviousWizardStep(WizardStep step);
 
   /**
    * Gets the finished step in the wizard.
    * @return Step the finished step
    */
-  abstract public WizardStep getFinishedStep();
+  public abstract WizardStep getFinishedStep();
 
   /**
    * Gets the currently displayed wizard step.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java
index 564c2eb..7310766 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/SortableTableModel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.ui;
@@ -38,29 +39,29 @@
    * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
    * otherwise.
    */
-  public boolean isSortAscending();
+  boolean isSortAscending();
 
   /**
    * Sets whether to sort ascending of descending.
    * @param sortAscending whether to sort ascending or descending.
    */
-  public void setSortAscending(boolean sortAscending);
+  void setSortAscending(boolean sortAscending);
 
   /**
    * Returns the column index used to sort.
    * @return the column index used to sort.
    */
-  public int getSortColumn();
+  int getSortColumn();
 
   /**
    * Sets the column index used to sort.
    * @param sortColumn column index used to sort..
    */
-  public void setSortColumn(int sortColumn);
+  void setSortColumn(int sortColumn);
 
   /**
    * Updates the table model contents and sorts its contents depending on the
    * sort options set by the user.
    */
-  public void forceResort();
+  void forceResort();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
index 8221aed..8f7497a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java
@@ -807,7 +807,7 @@
    * @param desc the LabelFieldDescriptor describing the JLabel.
    * @return a JLabel based on a LabelFieldDescriptor.
    */
-  static public JLabel makeJLabel(LabelFieldDescriptor desc)
+  public static JLabel makeJLabel(LabelFieldDescriptor desc)
   {
     UIFactory.TextStyle style;
     if (desc.getLabelType() == LabelFieldDescriptor.LabelType.PRIMARY)
@@ -859,7 +859,7 @@
    * @return a JTextComponent based on a
    * LabelFieldDescriptor.
    */
-  static public JTextComponent makeJTextComponent(LabelFieldDescriptor desc,
+  public static JTextComponent makeJTextComponent(LabelFieldDescriptor desc,
       String defaultValue)
   {
     if (defaultValue == null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
index 3c37a9f..3babf4d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
@@ -46,7 +46,7 @@
    * @param but JButton for invoking browse action
    * @return the created panel.
    */
-  static public JPanel createBrowseButtonPanel(JLabel lbl,
+  public static JPanel createBrowseButtonPanel(JLabel lbl,
                                          JTextComponent tf,
                                          JButton but)
   {
@@ -83,7 +83,7 @@
    *
    * @param frame for which the icon will be set
    */
-  static public void setFrameIcon(JFrame frame)
+  public static void setFrameIcon(JFrame frame)
   {
     UIFactory.IconType ic;
     if (isMacOS()) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
index d970e94..0b2f923 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
@@ -417,13 +417,13 @@
      * @param child to act as the new file object
      * @return FileOperation as the same type as this class
      */
-    abstract public FileOperation copyForChild(File child);
+    public abstract FileOperation copyForChild(File child);
 
     /**
      * Execute this operation.
      * @throws ApplicationException if there is a problem.
      */
-    abstract public void apply() throws ApplicationException;
+    public abstract void apply() throws ApplicationException;
 
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java
index 7409008..42c0000 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.util;
@@ -35,7 +35,7 @@
 /**
    * This class is used to read an input stream and process ouput.
  */
-abstract public class OutputReader {
+public abstract class OutputReader {
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java
index d830800..f63327f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ProgressMessageFormatter.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.util;
@@ -48,7 +48,7 @@
    * representation
    * @return the formatted representation for the given text.
    */
-  public LocalizableMessage getFormattedText(LocalizableMessage text);
+  LocalizableMessage getFormattedText(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of the text that is the summary of the
@@ -58,7 +58,7 @@
    * representation
    * @return the formatted representation of a summary for the given text.
    */
-  public LocalizableMessage getFormattedSummary(LocalizableMessage text);
+  LocalizableMessage getFormattedSummary(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of an error for a given text.
@@ -68,7 +68,7 @@
    * resulting formatted text.
    * @return the formatted representation of an error for the given text.
    */
-  public LocalizableMessage getFormattedError(LocalizableMessage text, boolean applyMargin);
+  LocalizableMessage getFormattedError(LocalizableMessage text, boolean applyMargin);
 
   /**
    * Returns the formatted representation of a warning for a given text.
@@ -78,7 +78,7 @@
    * resulting formatted text.
    * @return the formatted representation of a warning for the given text.
    */
-  public LocalizableMessage getFormattedWarning(LocalizableMessage text, boolean applyMargin);
+  LocalizableMessage getFormattedWarning(LocalizableMessage text, boolean applyMargin);
 
   /**
    * Returns the formatted representation of a success message for a given text.
@@ -87,7 +87,7 @@
    * @return the formatted representation of a success message for the given
    * text.
    */
-  public LocalizableMessage getFormattedSuccess(LocalizableMessage text);
+  LocalizableMessage getFormattedSuccess(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of a log error message for a given
@@ -97,7 +97,7 @@
    * @return the formatted representation of a log error message for the given
    * text.
    */
-  public LocalizableMessage getFormattedLogError(LocalizableMessage text);
+  LocalizableMessage getFormattedLogError(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of a log message for a given text.
@@ -105,19 +105,19 @@
    * representation
    * @return the formatted representation of a log message for the given text.
    */
-  public LocalizableMessage getFormattedLog(LocalizableMessage text);
+  LocalizableMessage getFormattedLog(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of the 'Done' text string.
    * @return the formatted representation of the 'Done' text string.
    */
-  public LocalizableMessage getFormattedDone();
+  LocalizableMessage getFormattedDone();
 
   /**
    * Returns the formatted representation of the 'Error' text string.
    * @return the formatted representation of the 'Error' text string.
    */
-  public LocalizableMessage getFormattedError();
+  LocalizableMessage getFormattedError();
 
   /**
    * Returns the formatted representation of the argument text to which we add
@@ -126,20 +126,19 @@
    * @param text the String to which add points.
    * @return the formatted representation of the '.....' text string.
    */
-  public LocalizableMessage getFormattedWithPoints(LocalizableMessage text);
-
+  LocalizableMessage getFormattedWithPoints(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of a point.
    * @return the formatted representation of the '.' text string.
    */
-  public LocalizableMessage getFormattedPoint();
+  LocalizableMessage getFormattedPoint();
 
   /**
    * Returns the formatted representation of a space.
    * @return the formatted representation of the ' ' text string.
    */
-  public LocalizableMessage getSpace();
+  LocalizableMessage getSpace();
 
   /**
    * Returns the formatted representation of a progress message for a given
@@ -149,7 +148,7 @@
    * @return the formatted representation of a progress message for the given
    * text.
    */
-  public LocalizableMessage getFormattedProgress(LocalizableMessage text);
+  LocalizableMessage getFormattedProgress(LocalizableMessage text);
 
   /**
    * Returns the formatted representation of an error message for a given
@@ -162,25 +161,25 @@
    * @return the formatted representation of an error message for the given
    * exception.
    */
-  public LocalizableMessage getFormattedError(Throwable t, boolean applyMargin);
+  LocalizableMessage getFormattedError(Throwable t, boolean applyMargin);
 
   /**
    * Returns the line break formatted.
    * @return the line break formatted.
    */
-  public LocalizableMessage getLineBreak();
+  LocalizableMessage getLineBreak();
 
   /**
    * Returns the tab formatted.
    * @return the tab formatted.
    */
-  public LocalizableMessage getTab();
+  LocalizableMessage getTab();
 
   /**
    * Returns the task separator formatted.
    * @return the task separator formatted.
    */
-  public LocalizableMessage getTaskSeparator();
+  LocalizableMessage getTaskSeparator();
 
   /**
    * Returns the log formatted representation after the user has clicked on a
@@ -192,5 +191,5 @@
    * @return the formatted progress log representation after the user has
    * clicked on a url.
    */
-  public LocalizableMessage getFormattedAfterUrlClick(String url, LocalizableMessage lastText);
+  LocalizableMessage getFormattedAfterUrlClick(String url, LocalizableMessage lastText);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
index 8d1ae84..e13e9e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
@@ -37,16 +37,16 @@
  */
 public class StandardOutputSuppressor {
 
-  static private Token token;
+  private static Token token;
 
   /** Object to return to this class for unsuppressing output. */
-  static private class Token {
+  private static class Token {
     PrintStream out;
     PrintStream err;
   }
 
   /** Suppresses output to the standard output streams. */
-  static synchronized public void suppress() {
+  public static synchronized void suppress() {
     if (token == null) {
       token = new Token();
       token.out = System.out;
@@ -65,7 +65,7 @@
    * method System.out and System.err will point to the descriptor prior
    * to calling <code>suppress()</code>.
    */
-  static synchronized public void unsuppress() {
+  public static synchronized void unsuppress() {
     if (token != null) {
       System.setOut(token.out);
       System.setErr(token.err);
@@ -80,23 +80,18 @@
    * Checks whether or not this class has suppressed standard out streams.
    * @return boolean where true indicates output is suppressed
    */
-  static public boolean isSuppressed() {
+  public static boolean isSuppressed() {
     return token != null;
   }
 
   /**
    * PrintWriter for suppressing stream.
    */
-  static private class NullOutputStream extends OutputStream {
+  private static class NullOutputStream extends OutputStream {
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void write(int b) throws IOException {
       // do nothing;
     }
-
   }
-
-
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index f368c0a..c148538 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.quicksetup.util;
 
@@ -92,7 +92,7 @@
 
 
   /** The service name required by the JNLP downloader. */
-  public final static String JNLP_SERVICE_NAME = "javax.jnlp.DownloadService";
+  public static final String JNLP_SERVICE_NAME = "javax.jnlp.DownloadService";
 
   /**
    * Returns <CODE>true</CODE> if the provided port is free and we can use it,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java
index 8268efe..cd7a8aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ZipExtractor.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2007-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 
 package org.opends.quicksetup.util;
@@ -57,7 +57,7 @@
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
   /** Path separator for zip file entry names on Windows and *nix. */
-  static private final char ZIP_ENTRY_NAME_SEP = '/';
+  private static final char ZIP_ENTRY_NAME_SEP = '/';
 
   private InputStream is;
   private int minRatio;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
index 840a776..2d39172 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.server.admin;
@@ -83,10 +83,9 @@
 
 
   // Get a resource instance creating it if necessary.
-  private synchronized static ManagedObjectDefinitionI18NResource getInstance(
+  private static synchronized ManagedObjectDefinitionI18NResource getInstance(
       String prefix) {
-    ManagedObjectDefinitionI18NResource instance = INSTANCES
-        .get(prefix);
+    ManagedObjectDefinitionI18NResource instance = INSTANCES.get(prefix);
 
     if (instance == null) {
       instance = new ManagedObjectDefinitionI18NResource(prefix);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
index b95d4aa..46ddeb5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/ManagedObjectPath.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.admin;
 
@@ -306,7 +306,7 @@
       extends Element<C, S> {
 
     // Factory method.
-    private static final <C extends ConfigurationClient,
+    private static <C extends ConfigurationClient,
         S extends Configuration>
         InstantiableElement<C, S> create(
         InstantiableRelationDefinition<? super C, ? super S> r,
@@ -374,7 +374,7 @@
       extends Element<C, S> {
 
     // Factory method.
-    private static final <C extends ConfigurationClient,
+    private static <C extends ConfigurationClient,
         S extends Configuration> OptionalElement<C, S> create(
         OptionalRelationDefinition<? super C, ? super S> r,
         AbstractManagedObjectDefinition<C, S> d) {
@@ -426,7 +426,7 @@
       extends Element<C, S> {
 
     // Factory method.
-    private static final <C extends ConfigurationClient,
+    private static <C extends ConfigurationClient,
         S extends Configuration>
         SetElement<C, S> create(
         SetRelationDefinition<? super C, ? super S> r,
@@ -480,7 +480,7 @@
       extends Element<C, S> {
 
     // Factory method.
-    private static final <C extends ConfigurationClient,
+    private static <C extends ConfigurationClient,
         S extends Configuration> SingletonElement<C, S> create(
         SingletonRelationDefinition<? super C, ? super S> r,
         AbstractManagedObjectDefinition<C, S> d) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
index 75222a4..1af4afc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyDefinition.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.server.admin;
@@ -66,7 +66,7 @@
    *          The type of property definition constructed by this
    *          builder.
    */
-  protected abstract static class AbstractBuilder
+  protected static abstract class AbstractBuilder
       <T, D extends PropertyDefinition<T>> {
 
     // The administrator action.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java
index 9194ddc..db65b7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/PropertyProvider.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.server.admin;
@@ -43,7 +44,7 @@
    * A property provider which always returns empty property values, indicating
    * default behavior.
    */
-  public static final PropertyProvider DEFAULT_PROVIDER =
+  PropertyProvider DEFAULT_PROVIDER =
     new PropertyProvider() {
 
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
index 5617e63..a4343a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/RelationDefinition.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.server.admin;
@@ -101,7 +101,7 @@
    *          The type of relation definition constructed by this
    *          builder.
    */
-  protected abstract static class AbstractBuilder
+  protected static abstract class AbstractBuilder
       <C extends ConfigurationClient, S extends Configuration,
        D extends RelationDefinition<C, S>> {
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index b4ed6c6..46bac69 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -55,9 +55,9 @@
   // Note : still to be done :
   // I18n support. Today all the strings are hardcoded in this file
 
-  private final static String ACI_SYNTAX_REL_URL =
+  private static final String ACI_SYNTAX_REL_URL =
     "/doc/admin-guide/#about-acis";
-  private final static String DURATION_SYNTAX_REL_URL =
+  private static final String DURATION_SYNTAX_REL_URL =
     "duration-syntax.html";
   private final String CSS_FILE = "opendj-config.css";
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
index 41879e3..a5ab3df 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java
@@ -55,7 +55,7 @@
    * @return Returns <code>true</code> if the proposed addition is
    *         acceptable, or <code>false</code> if it is not.
    */
-  public boolean isConfigurationAddAcceptable(T configuration,
+  boolean isConfigurationAddAcceptable(T configuration,
       List<LocalizableMessage> unacceptableReasons);
 
 
@@ -68,5 +68,5 @@
    * @return Returns information about the result of adding the
    *         configuration.
    */
-  public ConfigChangeResult applyConfigurationAdd(T configuration);
+  ConfigChangeResult applyConfigurationAdd(T configuration);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
index 72b88f8..3f40cbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java
@@ -56,7 +56,7 @@
    * @return Returns <code>true</code> if the proposed change is
    *         acceptable, or <code>false</code> if it is not.
    */
-  public boolean isConfigurationChangeAcceptable(T configuration,
+  boolean isConfigurationChangeAcceptable(T configuration,
       List<LocalizableMessage> unacceptableReasons);
 
   /**
@@ -67,5 +67,5 @@
    * @return Returns information about the result of changing the
    *         configuration.
    */
-  public ConfigChangeResult applyConfigurationChange(T configuration);
+  ConfigChangeResult applyConfigurationChange(T configuration);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
index 30ff9f3..7e01899 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java
@@ -55,7 +55,7 @@
    * @return Returns <code>true</code> if the proposed deletion is
    *         acceptable, or <code>false</code> if it is not.
    */
-  public boolean isConfigurationDeleteAcceptable(T configuration,
+  boolean isConfigurationDeleteAcceptable(T configuration,
       List<LocalizableMessage> unacceptableReasons);
 
 
@@ -68,5 +68,5 @@
    * @return Returns information about the result of deleting the
    *         configuration.
    */
-  public ConfigChangeResult applyConfigurationDelete(T configuration);
+  ConfigChangeResult applyConfigurationDelete(T configuration);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
index 5de281c..b50d6d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java
@@ -55,7 +55,7 @@
    * @return Returns <code>true</code> if the proposed addition is
    *         acceptable, or <code>false</code> if it is not.
    */
-  public boolean isConfigurationAddAcceptable(
+  boolean isConfigurationAddAcceptable(
       ServerManagedObject<? extends T> mo, List<LocalizableMessage> unacceptableReasons);
 
 
@@ -68,6 +68,6 @@
    * @return Returns information about the result of adding the server
    *         managed object.
    */
-  public ConfigChangeResult applyConfigurationAdd(
+  ConfigChangeResult applyConfigurationAdd(
       ServerManagedObject<? extends T> mo);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
index 5df988d..f167bf4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java
@@ -56,7 +56,7 @@
    * @return Returns <code>true</code> if the proposed change is
    *         acceptable, or <code>false</code> if it is not.
    */
-  public boolean isConfigurationChangeAcceptable(
+  boolean isConfigurationChangeAcceptable(
       ServerManagedObject<? extends T> mo, List<LocalizableMessage> unacceptableReasons);
 
 
@@ -70,5 +70,5 @@
    * @return Returns information about the result of changing the
    *         server managed object.
    */
-  public ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo);
+  ConfigChangeResult applyConfigurationChange(ServerManagedObject<? extends T> mo);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
index 914c7f3..4ae9c92 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java
@@ -56,7 +56,7 @@
    * @return Returns <code>true</code> if the proposed deletion is
    *         acceptable, or <code>false</code> if it is not.
    */
-  public boolean isConfigurationDeleteAcceptable(
+  boolean isConfigurationDeleteAcceptable(
       ServerManagedObject<? extends T> mo, List<LocalizableMessage> unacceptableReasons);
 
 
@@ -70,6 +70,6 @@
    * @return Returns information about the result of deleting the
    *         server managed object.
    */
-  public ConfigChangeResult applyConfigurationDelete(
+  ConfigChangeResult applyConfigurationDelete(
       ServerManagedObject<? extends T> mo);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
index 83e921e..c61abe1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/server/ServerManagementContext.java
@@ -388,7 +388,7 @@
 
 
   // Singleton instance.
-  private final static ServerManagementContext INSTANCE =
+  private static final ServerManagementContext INSTANCE =
     new ServerManagementContext();
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java
index 7964e72..0a02419 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertGenerator.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -54,7 +54,7 @@
    * @return  The DN of the configuration entry with which this alert
    *          generator is associated.
    */
-  public DN getComponentEntryDN();
+  DN getComponentEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    * @return  The fully-qualified name of the Java class for this
    *          alert generator implementation.
    */
-  public String getClassName();
+  String getClassName();
 
 
 
@@ -80,6 +80,6 @@
    * @return  Information about the set of alerts that this generator
    *          may produce.
    */
-  public Map<String, String> getAlerts();
+  Map<String, String> getAlerts();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
index b712aff..05a7b71 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AlertHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.api;
 import org.forgerock.i18n.LocalizableMessage;
@@ -68,7 +68,7 @@
    *                                   related to the server
    *                                   configuration.
    */
-  public void initializeAlertHandler(T configuration)
+  void initializeAlertHandler(T configuration)
        throws ConfigException, InitializationException;
 
 
@@ -78,7 +78,7 @@
    *
    * @return  The current configuration for this alert handler.
    */
-  public AlertHandlerCfg getAlertHandlerConfiguration();
+  AlertHandlerCfg getAlertHandlerConfiguration();
 
 
 
@@ -95,7 +95,7 @@
    * @return  {@code true} if the provided configuration is
    *          acceptable, or {@code false} if it is not.
    */
-  public boolean isConfigurationAcceptable(
+  boolean isConfigurationAcceptable(
                       AlertHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons);
 
@@ -105,7 +105,7 @@
    * Performs any necessary cleanup that may be necessary when this
    * alert handler is finalized.
    */
-  public void finalizeAlertHandler();
+  void finalizeAlertHandler();
 
 
 
@@ -117,7 +117,7 @@
    * @param  alertMessage  A message (possibly {@code null}) that can
    *                       provide more information about this alert.
    */
-  public void sendAlertNotification(AlertGenerator generator,
+  void sendAlertNotification(AlertGenerator generator,
                                     String alertType,
                                     LocalizableMessage alertMessage);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java
index 94dc34a..c1f600e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  *      Portions Copyright 2014 ForgeRock AS
  */
 package org.opends.server.api;
@@ -69,7 +69,7 @@
    *           If a problem occurs while attempting to determine the password
    *           policy for the user.
    */
-  public final static AuthenticationPolicy forUser(Entry userEntry,
+  public static AuthenticationPolicy forUser(Entry userEntry,
       boolean useDefaultOnError) throws DirectoryException
   {
     // First check to see if the ds-pwp-password-policy-dn is present.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
index 7bb917a..21d6d03 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyFactory.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 
 package org.opends.server.api;
@@ -91,6 +91,6 @@
    * @param serverContext
    *            The server context.
    */
-  void setServerContext(final ServerContext serverContext);
+  void setServerContext(ServerContext serverContext);
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
index d2e7597..7869abf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  *      Portions Copyright 2014 ForgeRock AS
  */
 package org.opends.server.api;
@@ -78,7 +78,7 @@
    *           policy for the user.
    * @see AuthenticationPolicy#forUser(Entry, boolean)
    */
-  public final static AuthenticationPolicyState forUser(final Entry userEntry,
+  public static AuthenticationPolicyState forUser(final Entry userEntry,
       final boolean useDefaultOnError) throws DirectoryException
   {
     final AuthenticationPolicy policy = AuthenticationPolicy.forUser(userEntry,
@@ -102,7 +102,7 @@
    * @throws DirectoryException
    *           If the value cannot be decoded as a boolean.
    */
-  protected static final ConditionResult getBoolean(final Entry entry,
+  protected static ConditionResult getBoolean(final Entry entry,
       final AttributeType attributeType) throws DirectoryException
   {
     final List<Attribute> attrList = entry.getAttribute(attributeType);
@@ -182,7 +182,7 @@
    *           If a problem occurs while attempting to decode the value as a
    *           generalized time.
    */
-  protected static final long getGeneralizedTime(final Entry entry,
+  protected static long getGeneralizedTime(final Entry entry,
       final AttributeType attributeType) throws DirectoryException
   {
     long timeValue = -1;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index 7de701e..77f40b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -1029,7 +1029,7 @@
    * @return  {@code true} if the backend should handle operations for
    *          the provided entry, or {@code false} if it does not.
    */
-  public static final boolean handlesEntry(DN entryDN, Collection<DN> baseDNs, Collection<DN> excludeDNs)
+  public static boolean handlesEntry(DN entryDN, Collection<DN> baseDNs, Collection<DN> excludeDNs)
   {
     for (DN baseDN : baseDNs)
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java
index 6a4da8f..d22b8c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/BackendInitializationListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -48,7 +49,7 @@
    * @param  backend  The backend that has been initialized and is
    *                  about to be put into service.
    */
-  public void performBackendInitializationProcessing(Backend backend);
+  void performBackendInitializationProcessing(Backend backend);
 
 
 
@@ -60,6 +61,6 @@
    * @param  backend  The backend that has been taken out of service
    *                  and is about to be finalized.
    */
-  public void performBackendFinalizationProcessing(Backend backend);
+  void performBackendFinalizationProcessing(Backend backend);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java
index ccf301a..5893224 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/BackupTaskListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -56,7 +57,7 @@
    * @param  config   Configuration information about the backup to be
    *                  performed.
    */
-  public void processBackupBegin(Backend backend,
+  void processBackupBegin(Backend backend,
                                  BackupConfig config);
 
 
@@ -73,7 +74,7 @@
    * @param  successful  Indicates whether the backup operation
    *                     completed successfully.
    */
-  public void processBackupEnd(Backend backend, BackupConfig config,
+  void processBackupEnd(Backend backend, BackupConfig config,
                                boolean successful);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java
index 4810904..fe26183 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigAddListener.java
@@ -57,7 +57,7 @@
    *          acceptable configuration, or {@code false} if it does
    *          not.
    */
-  public boolean configAddIsAcceptable(ConfigEntry configEntry,
+  boolean configAddIsAcceptable(ConfigEntry configEntry,
                       LocalizableMessageBuilder unacceptableReason);
 
   /**
@@ -70,5 +70,5 @@
    * @return  Information about the result of processing the
    *          configuration change.
    */
-  public ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry);
+  ConfigChangeResult applyConfigurationAdd(ConfigEntry configEntry);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java
index 719fa75..53bc5bc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigChangeListener.java
@@ -57,7 +57,7 @@
    *          acceptable configuration, or {@code false} if it does
    *          not.
    */
-  public boolean configChangeIsAcceptable(ConfigEntry configEntry,
+  boolean configChangeIsAcceptable(ConfigEntry configEntry,
                       LocalizableMessageBuilder unacceptableReason);
 
 
@@ -72,7 +72,7 @@
    * @return  Information about the result of processing the
    *          configuration change.
    */
-  public ConfigChangeResult applyConfigurationChange(
+  ConfigChangeResult applyConfigurationChange(
                                  ConfigEntry configEntry);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java
index 84a09d7..47caa4b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ConfigDeleteListener.java
@@ -56,7 +56,7 @@
    * @return  {@code true} if the proposed entry may be removed from
    *          the configuration, or {@code false} if not.
    */
-  public boolean configDeleteIsAcceptable(ConfigEntry configEntry,
+  boolean configDeleteIsAcceptable(ConfigEntry configEntry,
                       LocalizableMessageBuilder unacceptableReason);
 
 
@@ -71,7 +71,6 @@
    * @return  Information about the result of processing the
    *          configuration change.
    */
-  public ConfigChangeResult applyConfigurationDelete(
-                                 ConfigEntry configEntry);
+  ConfigChangeResult applyConfigurationDelete(ConfigEntry configEntry);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java
index da7613b..3dfa445 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/DirectoryServerMBean.java
@@ -22,15 +22,12 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
-
-
 import javax.management.ObjectName;
 
-
-
 /**
  * This interface must be implemented by all Directory Server
  * components that interact with JMX in any way.
@@ -47,6 +44,6 @@
    *
    * @return  The JMX object name for this MBean.
    */
-  public ObjectName getObjectName();
+  ObjectName getObjectName();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java
index 6c2d972..637879d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/DiskSpaceMonitorHandler.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 
 package org.opends.server.api;
@@ -41,14 +42,14 @@
    *
    * @param monitor The DiskSpaceMonitor that detected this event.
    */
-  public void diskLowThresholdReached(DiskSpaceMonitor monitor);
+  void diskLowThresholdReached(DiskSpaceMonitor monitor);
 
   /**
    * Notifies that the registered "full" threshold have been reached.
    *
    * @param monitor The DiskSpaceMonitor that detected this event.
    */
-  public void diskFullThresholdReached(DiskSpaceMonitor monitor);
+  void diskFullThresholdReached(DiskSpaceMonitor monitor);
 
   /**
    * Notifies that the free disk space is now above both "low" and
@@ -56,5 +57,5 @@
    *
    * @param monitor The DiskSpaceMonitor that detected this event.
    */
-  public void diskSpaceRestored(DiskSpaceMonitor monitor);
+  void diskSpaceRestored(DiskSpaceMonitor monitor);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java
index 831606d..7a1008c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ExportTaskListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -56,7 +57,7 @@
    * @param  config   Configuration information about the LDIF export
    *                  to be performed.
    */
-  public void processExportBegin(Backend backend,
+  void processExportBegin(Backend backend,
                                  LDIFExportConfig config);
 
 
@@ -73,7 +74,7 @@
    * @param  successful  Indicates whether the export operation
    *                     completed successfully.
    */
-  public void processExportEnd(Backend backend,
+  void processExportEnd(Backend backend,
                                LDIFExportConfig config,
                                boolean successful);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java
index 8ac2946..19e6815 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ImportTaskListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -55,7 +56,7 @@
    * @param  config   Configuration information about the LDIF import
    *                  to be performed.
    */
-  public void processImportBegin(Backend backend,
+  void processImportBegin(Backend backend,
                                  LDIFImportConfig config);
 
 
@@ -72,7 +73,7 @@
    * @param  successful  Indicates whether the import operation
    *                     completed successfully.
    */
-  public void processImportEnd(Backend backend,
+  void processImportEnd(Backend backend,
                                LDIFImportConfig config,
                                boolean successful);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java
index 699bc35..3f8488a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/InitializationCompletedListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -42,6 +43,6 @@
    * Callback that is executed once the server
    * initialization is complete.
    */
-  public void initializationCompleted();
+  void initializationCompleted();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java b/opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java
index 23e0d9c..7aa9a35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/InvokableComponent.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -54,7 +55,7 @@
    * @return  The DN of the configuration entry with which this
    *          component is associated.
    */
-  public DN getInvokableComponentEntryDN();
+  DN getInvokableComponentEntryDN();
 
 
 
@@ -65,7 +66,7 @@
    * @return  A list of the methods that may be invoked for this
    *          component.
    */
-  public InvokableMethod[] getOperationSignatures();
+  InvokableMethod[] getOperationSignatures();
 
 
 
@@ -83,8 +84,7 @@
    *                              an error occurred while attempting
    *                              to invoke it.
    */
-  public Object invokeMethod(String methodName,
-                             ConfigAttribute[] arguments)
+  Object invokeMethod(String methodName, ConfigAttribute[] arguments)
          throws DirectoryException;
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
index 03edc0a..87a65da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ProtocolElement.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -46,7 +47,7 @@
    * @return  The name of the protocol associated with this protocol
    *          element.
    */
-  public String getProtocolElementName();
+  String getProtocolElementName();
 
 
 
@@ -55,7 +56,7 @@
    *
    * @return  A string representation of this protocol element.
    */
-  public String toString();
+  String toString();
 
 
 
@@ -66,7 +67,7 @@
    * @param  buffer  The buffer into which the string representation
    *                 should be written.
    */
-  public void toString(StringBuilder buffer);
+  void toString(StringBuilder buffer);
 
 
 
@@ -79,6 +80,6 @@
    * @param  indent  The number of spaces that should be used to
    *                 indent the resulting string representation.
    */
-  public void toString(StringBuilder buffer, int indent);
+  void toString(StringBuilder buffer, int indent);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java
index 51e8a70..b4f3c1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/RestoreTaskListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -55,7 +56,7 @@
    * @param  config   Configuration information about the restore to
    *                  be performed.
    */
-  public void processRestoreBegin(Backend backend,
+  void processRestoreBegin(Backend backend,
                                   RestoreConfig config);
 
 
@@ -72,7 +73,7 @@
    * @param  successful  Indicates whether the restore operation
    *                     completed successfully.
    */
-  public void processRestoreEnd(Backend backend, RestoreConfig config,
+  void processRestoreEnd(Backend backend, RestoreConfig config,
                                 boolean successful);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java
index 4a97ed7..a1200c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/ServerShutdownListener.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.api;
 import org.forgerock.i18n.LocalizableMessage;
@@ -46,7 +46,7 @@
    *
    * @return  The human-readable name for this shutdown listener.
    */
-  public String getShutdownListenerName();
+  String getShutdownListenerName();
 
 
 
@@ -57,6 +57,6 @@
    *
    * @param  reason  The human-readable reason for the shutdown.
    */
-  public void processServerShutdown(LocalizableMessage reason);
+  void processServerShutdown(LocalizableMessage reason);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
index 449559a..eb15f62 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.api;
 
@@ -73,7 +74,7 @@
    * @throws DirectoryException if operation is not
    *         acceptable for this subentry.
    */
-  public void checkSubentryAddAcceptable(Entry entry)
+  void checkSubentryAddAcceptable(Entry entry)
           throws DirectoryException;
 
   /**
@@ -83,7 +84,7 @@
    * @throws DirectoryException if operation is not
    *         acceptable for this subentry.
    */
-  public void checkSubentryDeleteAcceptable(Entry entry)
+  void checkSubentryDeleteAcceptable(Entry entry)
           throws DirectoryException;
 
   /**
@@ -94,7 +95,7 @@
    * @throws DirectoryException if operation is not
    *         acceptable for this subentry.
    */
-  public void checkSubentryModifyAcceptable(Entry oldEntry,
+  void checkSubentryModifyAcceptable(Entry oldEntry,
           Entry newEntry) throws DirectoryException;
 
   /**
@@ -105,7 +106,7 @@
    * @throws DirectoryException if operation is not
    *         acceptable for this subentry.
    */
-  public void checkSubentryModifyDNAcceptable(Entry oldEntry,
+  void checkSubentryModifyDNAcceptable(Entry oldEntry,
           Entry newEntry) throws DirectoryException;
 
   /**
@@ -115,7 +116,7 @@
    * @param entry The subentry that was added to the
    *              server.
    */
-  public void handleSubentryAdd(Entry entry);
+  void handleSubentryAdd(Entry entry);
 
   /**
    * Performs any processing that may be required after a
@@ -124,7 +125,7 @@
    * @param entry The subentry that was removed from the
    *              server.
    */
-  public void handleSubentryDelete(Entry entry);
+  void handleSubentryDelete(Entry entry);
 
   /**
    * Performs any processing that may be required after a
@@ -133,7 +134,7 @@
    * @param oldEntry The subentry before it was updated.
    * @param newEntry The subentry after it was updated.
    */
-  public void handleSubentryModify(Entry oldEntry, Entry newEntry);
+  void handleSubentryModify(Entry oldEntry, Entry newEntry);
 
   /**
    * Performs any processing that may be required after a
@@ -142,5 +143,5 @@
    * @param oldEntry The subentry before it was updated.
    * @param newEntry The subentry after it was updated.
    */
-  public void handleSubentryModifyDN(Entry oldEntry, Entry newEntry);
+  void handleSubentryModifyDN(Entry oldEntry, Entry newEntry);
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java
index c12a829..25d179e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciEvalContext.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -44,64 +44,64 @@
      * Get client DN. The client DN is the authorization DN.
      * @return   The client DN.
      */
-    public DN getClientDN();
+    DN getClientDN();
 
     /**
      * Get the client entry. The client entry is the entry that corresponds
      * to the client DN.
      * @return The client entry corresponding to the client DN.
      */
-    public Entry getClientEntry();
+    Entry getClientEntry();
 
     /**
      * Get the resource DN. The resource DN is the DN of the entry being
      * evaluated.
      * @return   The resource DN.
      */
-    public DN getResourceDN();
+    DN getResourceDN();
 
     /**
      * Get the list of deny ACIs.
      * @return The deny ACI list.
      */
-    public List<Aci> getDenyList();
+    List<Aci> getDenyList();
 
     /**
      * Get the list allow ACIs.
      * @return The allow ACI list.
      */
-    public List<Aci> getAllowList();
+    List<Aci> getAllowList();
 
     /**
      * Returns true if the deny list is being evaluated.
      * @return True if the deny list is being evaluated.
      */
-    public boolean isDenyEval();
+    boolean isDenyEval();
 
     /**
      * Check if the remote client is bound anonymously.
      * @return {@code true} if client is bound anonymously.
      */
-    public boolean isAnonymousUser();
+    boolean isAnonymousUser();
 
     /**
      * Return the rights set for this container's LDAP operation.
      * @return  The rights set for the container's LDAP operation.
      */
-    public int getRights();
+    int getRights();
 
     /**
      * Return the entry being evaluated
      * .
      * @return The evaluation entry.
      */
-    public Entry getResourceEntry();
+    Entry getResourceEntry();
 
     /**
      * Get the hostname of the bound connection.
      * @return The hostname of the connection.
      */
-    public String getHostName();
+    String getHostName();
 
     /**
      * Determine whether the client connection has been authenticated using
@@ -115,14 +115,14 @@
      * @return An evaluation result indicating whether the client connection
      * has been authenticated using the required authentication method.
      */
-    public EnumEvalResult hasAuthenticationMethod(EnumAuthMethod authMethod,
+    EnumEvalResult hasAuthenticationMethod(EnumAuthMethod authMethod,
                                                   String saslMech);
 
     /**
      * Get the  address of the bound connection.
      * @return The address of the bound connection.
      */
-    public InetAddress getRemoteAddress();
+    InetAddress getRemoteAddress();
 
     /**
      * Return true if this is an add operation needed by the userattr
@@ -130,7 +130,7 @@
      *
      * @return {@code true} if this is an add operation.
      */
-    public boolean isAddOperation();
+    boolean isAddOperation();
 
     /**
      * Return true if the operation associated with this evaluation
@@ -141,7 +141,7 @@
      * @return {@code true} if the authorization DN of the operation is a
      * member of the specified group.
      */
-    public boolean isMemberOf(Group<?> group);
+    boolean isMemberOf(Group<?> group);
 
   /**
    * Returns true if the hashtable of ACIs that matched the targattrfilters
@@ -152,7 +152,7 @@
    * @return {@code true} if there were not any ACIs that matched
    *         targattrfilters keyword evaluation.
    */
-    public boolean isTargAttrFilterMatchAciEmpty();
+    boolean isTargAttrFilterMatchAciEmpty();
 
   /**
    * The context maintains a hashtable of ACIs that matched the targattrfilters
@@ -166,7 +166,7 @@
    *
    * @return {@code true} if a specified ACI matched targattrfilters evaluation.
    */
-    public boolean hasTargAttrFiltersMatchAci(Aci aci);
+    boolean hasTargAttrFiltersMatchAci(Aci aci);
 
   /**
    * Return true if an ACI that evaluated to deny or allow has an
@@ -179,7 +179,7 @@
    *
    * @return  {@code true} if the ACI has an targattrfilters keyword.
    */
-    public boolean hasTargAttrFiltersMatchOp(int flag);
+    boolean hasTargAttrFiltersMatchOp(int flag);
 
   /**
    * Returns {@code true} if the evaluation context is being used in a
@@ -188,7 +188,7 @@
    * @return  {@code true} if the evaluation context is being used in a
    * geteffectiverights control evaluation.
    */
-    public boolean isGetEffectiveRightsEval();
+    boolean isGetEffectiveRightsEval();
 
   /**
    * Set the name of the ACI that last matched a targattrfilters rule. Used
@@ -196,7 +196,7 @@
    *
    * @param name The ACI name string matching the targattrfilters rule.
    */
-    public void setTargAttrFiltersAciName(String name);
+    void setTargAttrFiltersAciName(String name);
 
   /**
    * Set a flag that specifies that a ACI that evaluated to either deny or
@@ -207,7 +207,7 @@
    * @param flag Either the integer value representing an allow or a deny,
    *             but not both.
    */
-    public void setTargAttrFiltersMatchOp(int flag);
+    void setTargAttrFiltersMatchOp(int flag);
 
   /**
    * Set the reason and the ACI that decided why the last access evaluation was
@@ -230,7 +230,7 @@
    * @return The enumeration representing the reason of the last access
    * evaluation.
    */
-    public EnumEvalReason getEvalReason();
+    EnumEvalReason getEvalReason();
 
   /**
    * Check if an evaluation context contains a set of access rights.
@@ -239,7 +239,7 @@
    *
    * @return {@code true} if the evaluation context contains a access right set.
    */
-    public boolean hasRights(int rights);
+    boolean hasRights(int rights);
 
   /**
    * Return the name of the ACI that decided the last access evaluation. Used
@@ -247,7 +247,7 @@
    *
    * @return The name of the ACI that decided the last access evaluation.
    */
-    public String getDecidingAciName();
+    String getDecidingAciName();
 
   /**
    * Return true if a evaluation context is being used in proxied authorization
@@ -256,14 +256,14 @@
    * @return  {@code true} if evaluation context is being used in proxied
    *          authorization control evaluation.
    */
-    public boolean isProxiedAuthorization();
+    boolean isProxiedAuthorization();
 
     /**
      * Get the current attribute type being evaluated.
      *
      * @return  The attribute type currently being evaluated.
      */
-    public AttributeType getCurrentAttributeType();
+    AttributeType getCurrentAttributeType();
 
   /**
    * Set the value of the summary string to the specified string.
@@ -271,7 +271,7 @@
    *
    * @param summary The string to set the summary string to
    */
-    public void setEvalSummary(String summary);
+    void setEvalSummary(String summary);
 
   /**
    * Return the access evaluation summary string. Used in a geteffectiverights
@@ -280,7 +280,7 @@
    *
    * @return   The string describing the access evaluation.
    */
-    public String getEvalSummary();
+    String getEvalSummary();
 
   /**
    * Return a string representation of the current right being evaluated.
@@ -288,7 +288,7 @@
    *
    * @return  String representation of the current right being evaluated.
    */
-    public String rightToString();
+    String rightToString();
 
     /**
      * Return the name of the ACI that last matched a targattrfilters rule. Used
@@ -296,7 +296,7 @@
      *
      * @return The name of the ACI that last matched a targattrfilters rule.
      */
-    public String getTargAttrFiltersAciName();
+    String getTargAttrFiltersAciName();
 
 
     /**
@@ -305,5 +305,5 @@
      *
      * @return The current SSF of the connection.
      */
-    public int getCurrentSSF();
+    int getCurrentSSF();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
index 374038a..22995f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargetMatchContext.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -45,38 +45,38 @@
      * Set the deny ACI list.
      * @param denyList The deny ACI list.
      */
-    public void setDenyList(List<Aci> denyList);
+    void setDenyList(List<Aci> denyList);
 
     /**
      * Set the allow ACI list.
      * @param allowList The list of allow ACIs.
      */
-    public void setAllowList(List<Aci> allowList);
+    void setAllowList(List<Aci> allowList);
 
     /**
      * Get the entry being evaluated. This is known as the
      * resource entry.
      * @return The entry being evaluated.
      */
-    public Entry getResourceEntry();
+    Entry getResourceEntry();
 
     /**
      * Get the current attribute type being evaluated.
      * @return  The attribute type being evaluated.
      */
-    public AttributeType getCurrentAttributeType();
+    AttributeType getCurrentAttributeType();
 
     /**
      * The current attribute type value being evaluated.
      * @return The current attribute type value being evaluated.
      */
-    public ByteString getCurrentAttributeValue();
+    ByteString getCurrentAttributeValue();
 
     /**
      * True if the first attribute of the resource entry is being evaluated.
      * @return True if this is the first attribute.
      */
-    public boolean isFirstAttribute();
+    boolean isFirstAttribute();
 
     /**
      * Set to true if the first attribute of the resource entry is
@@ -84,45 +84,45 @@
      * @param isFirst  True if this is the first attribute of the
      * resource entry being evaluated.
      */
-    public void setIsFirstAttribute(boolean isFirst);
+    void setIsFirstAttribute(boolean isFirst);
 
     /**
      * Set the attribute type to be evaluated.
      * @param type  The attribute type to set to.
      */
-    public void setCurrentAttributeType(AttributeType type);
+    void setCurrentAttributeType(AttributeType type);
 
     /**
      * Set the attribute value to be evaluated.
      * @param v The current attribute value to set to.
      */
-    public void setCurrentAttributeValue(ByteString v);
+    void setCurrentAttributeValue(ByteString v);
 
     /**
      * True if the target matching code found an entry test rule. An
      * entry test rule is an ACI without a targetattr target rule.
      * @param val True if an entry test rule was found.
      */
-    public void setEntryTestRule(boolean val);
+    void setEntryTestRule(boolean val);
 
     /**
      * True if an entry test rule was found.
      * @return True if an entry test rule was found.
      */
-    public boolean hasEntryTestRule();
+    boolean hasEntryTestRule();
 
     /**
      * Return the rights for this container's LDAP operation.
      * @return  The rights for the container's LDAP operation.
      */
-    public int getRights();
+    int getRights();
 
     /**
      * Return the OID (Object Identifier) string of the control being evaluated.
      *
      * @return The OID string of the control being evaluated.
      */
-      public String getControlOID();
+    String getControlOID();
 
 
    /**
@@ -131,33 +131,33 @@
     *
     * @return The OID string of the extended operation being evaluated.
     */
-    public String getExtOpOID();
+    String getExtOpOID();
 
     /**
      * Checks if the container's rights has the specified rights.
      * @param  rights The rights to check for.
      * @return True if the container's rights has the specified rights.
      */
-    public boolean hasRights(int rights);
+    boolean hasRights(int rights);
 
     /**
      * Set the rights of the container to the specified rights.
      * @param rights The rights to set the container's rights to.
      */
-    public void setRights(int rights);
+    void setRights(int rights);
 
     /**
      * Set to true  if the ACI had a targattrfilter rule that matched.
      * @param v  The value to use.
      */
-    public void setTargAttrFiltersMatch(boolean v);
+    void setTargAttrFiltersMatch(boolean v);
 
     /**
      * Return the value of the targAttrFiltersMatch variable. This is set to
      * true if the ACI had a targattrfilter rule that matched.
      * @return  True if the ACI had a targattrfilter rule that matched.
      */
-    public boolean getTargAttrFiltersMatch();
+    boolean getTargAttrFiltersMatch();
 
     /**
      * Add the specified ACI to a list of ACIs that have a targattrfilters rule
@@ -165,7 +165,7 @@
      * of an attribute that possibly might evaluate to true.
      * @param aci The ACI to save.
      */
-    public void addTargAttrFiltersMatchAci(Aci aci);
+    void addTargAttrFiltersMatchAci(Aci aci);
 
     /**
      * Save the name of the last ACI that matched a targattrfilters rule. This
@@ -214,7 +214,7 @@
   /**
    * Return true if the evaluating ACI either contained an explicitly defined
    * user attribute type in a targeattr target rule or both a targetattr all
-   * user attributes rule matched and a explictly defined targetattr target rule
+   * user attributes rule matched and a explicitly defined targetattr target rule
    * matched.
    *
    * @return  True if the above condition was seen.
@@ -223,8 +223,8 @@
 
   /**
    * Return true if the evaluating ACI either contained an explicitly defined
-   * operational attribute type in a targeattr target rule or both a targetattr
-   * all operational attributes rule matched and a explictly defined targetattr
+   * operational attribute type in a targetattr target rule or both a targetattr
+   * all operational attributes rule matched and a explicitly defined targetattr
    * target rule matched.
    *
    * @return  True if the above condition was seen.
@@ -240,7 +240,7 @@
    *
    * @param v  The flag to clear or 0 to set the mask to 0.
    */
-    public void clearEvalAttributes(int v);
+    void clearEvalAttributes(int v);
 }
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java
index 88b349f..7a489f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/KeywordBindRule.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.authorization.dseecompat;
 
@@ -39,7 +39,7 @@
      * @param evalCtx An evaluation context to use in the evaluation.
      * @return An enumeration evaluation result.
      */
-    public EnumEvalResult evaluate(AciEvalContext evalCtx);
+    EnumEvalResult evaluate(AciEvalContext evalCtx);
 
     /**
      * Appends a string representation of this object to the provided buffer.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
index 9d47a93..581f776 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -1088,7 +1088,7 @@
    *                              valid attribute value pattern from the
    *                              provided DN string.
    */
-  static private int parseValuePattern(String dnString, int pos,
+  private static int parseValuePattern(String dnString, int pos,
                                        ArrayList<ByteString> attributeValues)
           throws DirectoryException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java
index d5a44b5..76b1366 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/DbPreloadComparator.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.backends.jeb;
 
@@ -46,7 +46,7 @@
    * @param database A handle to the database.
    * @return 1 for id2entry database, 2 for dn2id database, 3 for all others.
    */
-  static private int priority(DatabaseContainer database)
+  private static int priority(DatabaseContainer database)
   {
     String name = database.getName();
     if (name.endsWith(EntryContainer.ID2ENTRY_DATABASE_NAME))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java
index 744e28e..75c8ff4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DbPreloadComparator.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.backends.pluggable;
 
@@ -42,7 +42,7 @@
    * @param database A handle to the database.
    * @return 1 for id2entry database, 2 for dn2id database, 3 for all others.
    */
-  static private int priority(DatabaseContainer database)
+  private static int priority(DatabaseContainer database)
   {
     String indexName = database.getName().getIndexId();
     if (indexName.endsWith(SuffixContainer.ID2ENTRY_INDEX_NAME))
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java
index 7bd700d..8a4a427 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/Cursor.java
@@ -98,5 +98,5 @@
 
   /** {@inheritDoc} */
   @Override
-  public void close();
+  void close();
 }
\ No newline at end of file
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
index 8862cd8..fede05e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -65,7 +65,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<AccountUsableResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index b7daeb9..ed5938e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -51,7 +51,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<AuthorizationIdentityResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
index b467788..96eb261 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -52,7 +52,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<EntryChangeNotificationControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
index f00c1e5..5e2bbf2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
@@ -60,7 +60,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
   implements ControlDecoder<EntryChangelogNotificationControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
index f926cc7..d25322d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -53,7 +53,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<ExternalChangelogRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
index cdbda2e..4f25be0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -52,7 +52,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<LDAPAssertionRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
index 0bbf9e7..395ce0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.controls;
 
@@ -59,7 +59,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder implements
+  private static final class Decoder implements
       ControlDecoder<LDAPPostReadRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
index 01776ad..041d846 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -52,7 +52,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<LDAPPostReadResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
index 57a1600..2960e81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.controls;
 
@@ -59,7 +59,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder implements
+  private static final class Decoder implements
       ControlDecoder<LDAPPreReadRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
index 9faeb37..2596c5f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -52,7 +52,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<LDAPPreReadResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
index 704bf60..39820b2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -55,7 +55,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<MatchedValuesControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
index 60ab2fa..d89cf3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -59,7 +59,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<PagedResultsControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
index c4046b7..7bf2680 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -52,7 +52,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<PasswordExpiredControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
index c7187e9..3654c81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -53,7 +53,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<PasswordExpiringControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
index bfa9e60..bc403cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -51,7 +51,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<PasswordPolicyRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
index d7cb8d2..04a8076 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -53,7 +53,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<PasswordPolicyResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
index 57831b0..731ed31 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -53,7 +53,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<PersistentSearchControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
index 7ef0d4f..93044d5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.controls;
 
@@ -59,7 +59,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<ProxiedAuthV1Control>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
index 2e5a655..4f51126 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -76,7 +76,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<ServerSideSortRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
index 4ade3e4..9bf4e54 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -78,7 +78,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<ServerSideSortResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
index 5fff713..9a0c055 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
@@ -53,7 +53,7 @@
    * ControlDecoder implementation to decode this control from a
    * ByteString.
    */
-  private final static class Decoder implements
+  private static final class Decoder implements
       ControlDecoder<SubtreeDeleteControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
index 6a8a24c..f16d0a1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -65,7 +65,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<VLVRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
index de20a4e..75fa727 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
@@ -71,7 +71,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<VLVResponseControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java
index 8bb7862..566ff1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperation.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -39,7 +40,6 @@
    *
    * @return  The message ID of the operation that should be abandoned.
    */
-  public int getIDToAbandon();
+  int getIDToAbandon();
 
 }
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java
index 3fc6f68..d8cd6f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.core;
 import org.forgerock.i18n.LocalizableMessage;
@@ -49,7 +49,7 @@
    *
    * @return  The authentication type for this bind operation.
    */
-  public abstract AuthenticationType getAuthenticationType();
+  AuthenticationType getAuthenticationType();
 
   /**
    * Retrieves the raw, unprocessed bind DN for this bind operation as contained
@@ -59,7 +59,7 @@
    * @return  The raw, unprocessed bind DN for this bind operation as contained
    *          in the client request.
    */
-  public abstract ByteString getRawBindDN();
+  ByteString getRawBindDN();
 
   /**
    * Specifies the raw, unprocessed bind DN for this bind operation.  This
@@ -67,7 +67,7 @@
    *
    * @param  rawBindDN  The raw, unprocessed bind DN for this bind operation.
    */
-  public abstract void setRawBindDN(ByteString rawBindDN);
+  void setRawBindDN(ByteString rawBindDN);
 
   /**
    * Retrieves a string representation of the protocol version associated with
@@ -76,7 +76,7 @@
    * @return  A string representation of the protocol version associated with
    *          this bind request.
    */
-  public String getProtocolVersion();
+  String getProtocolVersion();
 
   /**
    * Specifies the string representation of the protocol version associated with
@@ -85,7 +85,7 @@
    * @param  protocolVersion  The string representation of the protocol version
    *                          associated with this bind request.
    */
-  public void setProtocolVersion(String protocolVersion);
+  void setProtocolVersion(String protocolVersion);
 
   /**
    * Retrieves the bind DN for this bind operation.  This method should not be
@@ -96,14 +96,14 @@
    * @return  The bind DN for this bind operation, or <CODE>null</CODE> if the
    *          raw DN has not yet been processed.
    */
-  public abstract DN getBindDN();
+  DN getBindDN();
 
   /**
    * Retrieves the simple authentication password for this bind operation.
    *
    * @return  The simple authentication password for this bind operation.
    */
-  public abstract ByteString getSimplePassword();
+  ByteString getSimplePassword();
 
   /**
    * Specifies the simple authentication password for this bind operation.
@@ -111,7 +111,7 @@
    * @param  simplePassword  The simple authentication password for this bind
    *                         operation.
    */
-  public abstract void setSimplePassword(ByteString simplePassword);
+  void setSimplePassword(ByteString simplePassword);
 
   /**
    * Retrieves the SASL mechanism for this bind operation.
@@ -119,7 +119,7 @@
    * @return  The SASL mechanism for this bind operation, or <CODE>null</CODE>
    *          if the bind does not use SASL authentication.
    */
-  public abstract String getSASLMechanism();
+  String getSASLMechanism();
 
   /**
    * Retrieves the SASL credentials for this bind operation.
@@ -127,7 +127,7 @@
    * @return  The SASL credentials for this bind operation, or <CODE>null</CODE>
    *          if there are none or if the bind does not use SASL authentication.
    */
-  public abstract ByteString getSASLCredentials();
+  ByteString getSASLCredentials();
 
   /**
    * Specifies the SASL credentials for this bind operation.
@@ -136,8 +136,7 @@
    * @param  saslCredentials  The SASL credentials for this bind operation, or
    *                          <CODE>null</CODE> if there are none.
    */
-  public abstract void setSASLCredentials(String saslMechanism,
-      ByteString saslCredentials);
+  void setSASLCredentials(String saslMechanism, ByteString saslCredentials);
 
   /**
    * Retrieves the set of server SASL credentials to include in the bind
@@ -146,7 +145,7 @@
    * @return  The set of server SASL credentials to include in the bind
    *          response, or <CODE>null</CODE> if there are none.
    */
-  public abstract ByteString getServerSASLCredentials();
+  ByteString getServerSASLCredentials();
 
   /**
    * Specifies the set of server SASL credentials to include in the bind
@@ -155,8 +154,7 @@
    * @param  serverSASLCredentials  The set of server SASL credentials to
    *                                include in the bind response.
    */
-  public abstract void setServerSASLCredentials(
-      ByteString serverSASLCredentials);
+  void setServerSASLCredentials(ByteString serverSASLCredentials);
 
   /**
    * Retrieves the user entry associated with the SASL authentication attempt.
@@ -168,7 +166,7 @@
    *          <CODE>null</CODE> if it was not a SASL authentication or the SASL
    *          processing was not able to map the request to a user.
    */
-  public abstract Entry getSASLAuthUserEntry();
+  Entry getSASLAuthUserEntry();
 
   /**
    * Specifies the user entry associated with the SASL authentication attempt.
@@ -179,7 +177,7 @@
    * @param  saslAuthUserEntry  The user entry associated with the SASL
    *                            authentication attempt.
    */
-  public abstract void setSASLAuthUserEntry(Entry saslAuthUserEntry);
+  void setSASLAuthUserEntry(Entry saslAuthUserEntry);
 
   /**
    * Retrieves a human-readable message providing the reason that the
@@ -188,7 +186,7 @@
    * @return  A human-readable message providing the reason that the
    *          authentication failed, or <CODE>null</CODE> if none is available.
    */
-  public abstract LocalizableMessage getAuthFailureReason();
+  LocalizableMessage getAuthFailureReason();
 
   /**
    * Specifies the reason that the authentication failed.
@@ -196,7 +194,7 @@
    * @param  message providing the reason that the
    *                 authentication failed.
    */
-  public abstract void setAuthFailureReason(LocalizableMessage message);
+  void setAuthFailureReason(LocalizableMessage message);
 
   /**
    * Retrieves the user entry DN for this bind operation.  It will only be
@@ -207,7 +205,7 @@
    *          the bind processing has not progressed far enough to identify the
    *          user or if the user DN could not be determined.
    */
-  public abstract DN getUserEntryDN();
+  DN getUserEntryDN();
 
   /**
    * Retrieves the authentication info that resulted from processing this bind
@@ -216,7 +214,7 @@
    * @return  The authentication info that resulted from processing this bind
    *          operation.
    */
-  public abstract AuthenticationInfo getAuthenticationInfo();
+  AuthenticationInfo getAuthenticationInfo();
 
   /**
    * Specifies the authentication info that resulted from processing this bind
@@ -226,7 +224,7 @@
    * @param  authInfo  The authentication info that resulted from processing
    *                   this bind operation.
    */
-  public abstract void setAuthenticationInfo(AuthenticationInfo authInfo);
+  void setAuthenticationInfo(AuthenticationInfo authInfo);
 
   /**
    * Set the user entry DN for this bind operation.
@@ -236,7 +234,7 @@
    *                      progressed far enough to identify the user or if
    *                      the user DN could not be determined.
    */
-  public abstract void setUserEntryDN(DN userEntryDN);
+  void setUserEntryDN(DN userEntryDN);
 
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java
index bf8cf92..1e7221f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -46,7 +46,7 @@
    *
    * @return  The raw, unprocessed entry DN as included in the client request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
   /**
@@ -56,7 +56,7 @@
    * @param  rawEntryDN  The raw, unprocessed entry DN as included in the client
    *                     request.
    */
-  public void setRawEntryDN(ByteString rawEntryDN);
+  void setRawEntryDN(ByteString rawEntryDN);
 
 
   /**
@@ -67,7 +67,7 @@
    * @return  The DN of the entry to compare, or <CODE>null</CODE> if the raw
    *          entry DN has not yet been processed.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
   /**
@@ -75,7 +75,7 @@
    *
    * @return  The raw attribute type for this compare operation.
    */
-  public String getRawAttributeType();
+  String getRawAttributeType();
 
 
   /**
@@ -85,7 +85,7 @@
    * @param  rawAttributeType  The raw attribute type for this compare
    *                           operation.
    */
-  public void setRawAttributeType(String rawAttributeType);
+  void setRawAttributeType(String rawAttributeType);
 
 
   /**
@@ -95,7 +95,7 @@
    *
    * @return  The attribute type for this compare operation.
    */
-  public AttributeType getAttributeType();
+  AttributeType getAttributeType();
 
 
   /**
@@ -103,7 +103,7 @@
    *
    * @param attributeType  The attribute type for this compare operation.
    */
-  public void setAttributeType(AttributeType attributeType);
+  void setAttributeType(AttributeType attributeType);
 
 
   /**
@@ -113,21 +113,21 @@
    *
    * @return  The attribute options for this compare operation.
    */
-  public Set<String> getAttributeOptions();
+  Set<String> getAttributeOptions();
 
   /**
    * Specifies the attribute options for this compare operation.
    *
    * @param attributeOptions The attribute options for this compare operation.
    */
-  public void setAttributeOptions(Set<String> attributeOptions);
+  void setAttributeOptions(Set<String> attributeOptions);
 
   /**
    * Retrieves the assertion value for this compare operation.
    *
    * @return  The assertion value for this compare operation.
    */
-  public ByteString getAssertionValue();
+  ByteString getAssertionValue();
 
 
   /**
@@ -136,7 +136,7 @@
    *
    * @param  assertionValue  The assertion value for this compare operation.
    */
-  public void setAssertionValue(ByteString assertionValue);
+  void setAssertionValue(ByteString assertionValue);
 
 
   /**
@@ -144,7 +144,7 @@
    *
    * @return  The proxied authorization target DN for this compare operation
    */
-  public DN getProxiedAuthorizationDN();
+  DN getProxiedAuthorizationDN();
 
 
   /**
@@ -153,6 +153,6 @@
    * @param proxiedAuthorizationDN  The proxied authorization target DN for
    *                                this compare operation
    */
-  public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
+  void setProxiedAuthorizationDN(DN proxiedAuthorizationDN);
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java
index 3ebff93..a49d802 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -44,7 +44,7 @@
    * @return  The OID for the request associated with this extended
    *          operation.
    */
-  public String getRequestOID();
+  String getRequestOID();
 
 
 
@@ -55,7 +55,7 @@
    * @return  The value for the request associated with this extended
    *          operation.
    */
-  public ByteString getRequestValue();
+  ByteString getRequestValue();
 
 
 
@@ -64,7 +64,7 @@
    *
    * @return  The OID to include in the response to the client.
    */
-  public String getResponseOID();
+  String getResponseOID();
 
 
 
@@ -74,7 +74,7 @@
    * @param  responseOID  The OID to include in the response to the
    *                      client.
    */
-  public void setResponseOID(String responseOID);
+  void setResponseOID(String responseOID);
 
 
 
@@ -83,7 +83,7 @@
    *
    * @return  The value to include in the response to the client.
    */
-  public ByteString getResponseValue();
+  ByteString getResponseValue();
 
 
 
@@ -93,6 +93,6 @@
    * @param  responseValue  The value to include in the response to
    *                        the client.
    */
-  public void setResponseValue(ByteString responseValue);
+  void setResponseValue(ByteString responseValue);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
index 0d40c88..37faadf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/OperationWrapper.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -493,7 +493,7 @@
 
   /** {@inheritDoc} */
   @Override
-  public synchronized final void checkIfCanceled(boolean signalTooLate)
+  final synchronized public void checkIfCanceled(boolean signalTooLate)
       throws CanceledOperationException {
     operation.checkIfCanceled(signalTooLate);
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java
index 65bef42..05eec07 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/QueueingStrategy.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -41,6 +41,6 @@
    * @throws org.opends.server.types.DirectoryException
    *          If a problem occurs in the Directory Server.
    */
-  public void enqueueRequest(Operation operation) throws DirectoryException;
+  void enqueueRequest(Operation operation) throws DirectoryException;
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
index 4461cce..956bdf2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ServerContext.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2014 ForgeRock AS.
+ *      Copyright 2014-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -41,21 +41,21 @@
    *
    * @return the instance root directory
    */
-  public String getInstanceRoot();
+  String getInstanceRoot();
 
   /**
    * Returns the root directory of server.
    *
    * @return the server root directory
    */
-  public String getServerRoot();
+  String getServerRoot();
 
   /**
    * Returns the schema of the server.
    *
    * @return the schema
    */
-  public Schema getSchema();
+  Schema getSchema();
 
   /**
    * Returns the schema updater, which provides
@@ -63,14 +63,14 @@
    *
    * @return the schema updater
    */
-  public SchemaUpdater getSchemaUpdater();
+  SchemaUpdater getSchemaUpdater();
 
   /**
    * Returns the environment of the server.
    *
    * @return the environment
    */
-  public DirectoryEnvironmentConfig getEnvironment();
+  DirectoryEnvironmentConfig getEnvironment();
 
   /**
    * Returns the server management context, which gives
@@ -78,6 +78,6 @@
    *
    * @return the server management context
    */
-  public ServerManagementContext getServerManagementContext();
+  ServerManagementContext getServerManagementContext();
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java
index cb800a7..43cf757 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSCapableConnection.java
@@ -22,13 +22,12 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
+
 import org.forgerock.i18n.LocalizableMessageBuilder;
 
-
-
 /**
  * This interface defines a set of methods that must be implemented by a class
  * (expected to be a client connection) that can dynamically enable and disable
@@ -51,6 +50,6 @@
    * @return  <CODE>true</CODE> if TLS is available on the underlying client
    *          connection, or <CODE>false</CODE> if it is not.
    */
-  public boolean prepareTLS(LocalizableMessageBuilder unavailableReason);
+  boolean prepareTLS(LocalizableMessageBuilder unavailableReason);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
index 7b23dd1..4063be3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugStackTraceFormatter.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS.
+ *      Portions Copyright 2014-2015 ForgeRock AS.
  */
 package org.opends.server.loggers;
 
@@ -57,7 +57,7 @@
      *          the frames to filter
      * @return an array of StackTraceElements to be used in formatting.
      */
-    public StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames);
+    StackTraceElement[] getFilteredStackTrace(StackTraceElement[] frames);
   }
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java
index 6d44a30..f58c927 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNamingPolicy.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -40,14 +40,14 @@
    *
    * @return the initial file.
    */
-  public File getInitialName();
+  File getInitialName();
 
   /**
    * Gets the next name to use.
    *
    * @return the next file.
    */
-  public File getNextName();
+  File getNextName();
 
   /**
    * Gets the filename filter that can be used to filter files named by this
@@ -55,17 +55,17 @@
    *
    * @return The FilenameFilter that can filter files named by this policy.
    */
-  public FilenameFilter getFilenameFilter();
+  FilenameFilter getFilenameFilter();
 
   /**
-   * Gets all the existing files named by this policy in the parent directoy
+   * Gets all the existing files named by this policy in the parent directory
    * of the initial file. The initial file is excluded from this list if it
    * exists.
    *
    * @return The files named by this policy or <code>null</code> if an
-   *         error occured.
+   *         error occurred.
    */
-  public File[] listFiles();
+  File[] listFiles();
 
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java
index 887a73b..0df8217 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/LoggerAlarmHandler.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -38,15 +38,13 @@
   /**
    * Flush the underlying stream.
    */
-
-  public void flush();
+  void flush();
 
   /**
    * Action to take when the logger thread generates an alarm based
    * on the rotation policy condition being met.
-   *
    */
-  public void rollover();
+  void rollover();
 
 
   /**
@@ -54,7 +52,6 @@
    *
    * @param actions An array of actions that need to be executed on rotation.
    */
-  public void setPostRotationActions(ArrayList<ActionType> actions);
-
+  void setPostRotationActions(ArrayList<ActionType> actions);
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java
index e1f2c5f..27c82c1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/PostRotationAction.java
@@ -22,12 +22,10 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
-
-
 /**
  * This interface describes the action that needs to be taken
  * at the time of a rotation.
@@ -41,7 +39,7 @@
    * @return  <CODE>true</CODE> if the rotation action was successful, or
    *          <CODE>false</CODE> if it was not.
    */
-  public boolean execute();
+  boolean execute();
 
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
index 9a94b31..e18c490 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RetentionPolicy.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -58,7 +58,7 @@
    *           If a problem occurs during initialization that is not
    *           related to the server configuration.
    */
-  public abstract void initializeLogRetentionPolicy(T config)
+  void initializeLogRetentionPolicy(T config)
       throws ConfigException, InitializationException;
 
   /**
@@ -68,12 +68,12 @@
    *                         names.
    *
    * @return An array of files that should be deleted according to the
-   *         policy or <code>null</code> if an error occured while
+   *         policy or <code>null</code> if an error occurred while
    *         obtaining the file list.
    * @throws DirectoryException If an error occurs while obtaining a list
    *                            of files to delete.
    */
-  public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
+  File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
       throws DirectoryException;
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
index b8df554..2592c45 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/RotationPolicy.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -56,7 +56,7 @@
    *           If a problem occurs during initialization that is not
    *           related to the server configuration.
    */
-  public abstract void initializeLogRotationPolicy(T config)
+  void initializeLogRotationPolicy(T config)
       throws ConfigException, InitializationException;
 
 
@@ -67,7 +67,7 @@
    *          the file writer to be checked.
    * @return true if the log file should be rotated, false otherwise.
    */
-  public boolean rotateFile(RotatableLogFile writer);
+  boolean rotateFile(RotatableLogFile writer);
 
 
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
index 5881384..7286118 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -39,27 +40,27 @@
    *
    * @param record - the record to write.
    */
-  public void writeRecord(String record);
+  void writeRecord(String record);
 
   /**
    * Flushes any buffered contents of the output stream.
    */
-  public void flush();
+  void flush();
 
   /**
    * Releases any resources held by the writer.
    */
-  public void shutdown();
+  void shutdown();
 
   /**
    * Retrieves the number of bytes written by this writer.
    *
    * @return the number of bytes written by this writer.
    */
-  public long getBytesWritten();
+  long getBytesWritten();
 
   /**
-   * A TextWriter implementationwhich writes to standard out.
+   * A TextWriter implementation which writes to standard out.
    */
   public static class STDOUT implements TextWriter
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java
index 5d6f3df..943b424 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalSearchListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.protocols.internal;
 
@@ -61,7 +62,7 @@
    *                              the search operation will result
    *                              will be set based on this exception.
    */
-  public void handleInternalSearchEntry(
+  void handleInternalSearchEntry(
                    InternalSearchOperation searchOperation,
                    SearchResultEntry searchEntry)
          throws DirectoryException;
@@ -83,7 +84,7 @@
    *                              the search operation will result
    *                              will be set based on this exception.
    */
-  public void handleInternalSearchReference(
+  void handleInternalSearchReference(
                    InternalSearchOperation searchOperation,
                    SearchResultReference searchReference)
          throws DirectoryException;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java
index d8c68ac..054b7b3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions copyright 2013 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -68,5 +68,5 @@
    * @return A ReplicationMsg that can be used to send information
    *         about this operation to remote servers.
    */
-  abstract public ReplicationMsg generateMessage();
+  public abstract ReplicationMsg generateMessage();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
index 34b949f..c6f7494 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.plugin;
 
@@ -49,7 +49,7 @@
   /**
    * ControlDecoder implementation to decode this control from a ByteString.
    */
-  private final static class Decoder
+  private static final class Decoder
       implements ControlDecoder<ReplicationRepairRequestControl>
   {
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
index 0d0c600..8f61a3d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2013-2014 ForgeRock AS
+ *      Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.replication.server.changelog.api;
 
@@ -114,7 +114,7 @@
    *           If a database problem happened
    * @see #getCursorFrom(DN, ServerState, KeyMatchingStrategy, PositionStrategy)
    */
-  public MultiDomainDBCursor getCursorFrom(MultiDomainServerState startState, KeyMatchingStrategy matchingStrategy,
+  MultiDomainDBCursor getCursorFrom(MultiDomainServerState startState, KeyMatchingStrategy matchingStrategy,
       PositionStrategy positionStrategy) throws ChangelogException;
 
   /**
@@ -141,7 +141,7 @@
    *           If a database problem happened
    * @see #getCursorFrom(DN, ServerState, KeyMatchingStrategy, PositionStrategy)
    */
-  public MultiDomainDBCursor getCursorFrom(MultiDomainServerState startState, KeyMatchingStrategy matchingStrategy,
+  MultiDomainDBCursor getCursorFrom(MultiDomainServerState startState, KeyMatchingStrategy matchingStrategy,
       PositionStrategy positionStrategy, Set<DN> excludedDomainDns) throws ChangelogException;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
index 5788e21..405847d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
@@ -109,7 +109,7 @@
    * Contains all the attributes included for the ECL (External Changelog).
    */
   // @Immutable
-  private final static class ECLIncludes
+  private static final class ECLIncludes
   {
 
     final Map<Integer, Set<String>> includedAttrsByServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
index 92b5761..7768159 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/BackupTask.java
@@ -81,7 +81,7 @@
   /**
    * Stores mapping between configuration attribute name and its label.
    */
-  static private Map<String,LocalizableMessage> argDisplayMap =
+  private static Map<String,LocalizableMessage> argDisplayMap =
           new HashMap<String,LocalizableMessage>();
   static {
     argDisplayMap.put(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
index b43b6d5..38eeedb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ExportTask.java
@@ -75,7 +75,7 @@
   /**
    * Stores mapping between configuration attribute name and its label.
    */
-  static private Map<String,LocalizableMessage> argDisplayMap =
+  private static Map<String,LocalizableMessage> argDisplayMap =
           new HashMap<String,LocalizableMessage>();
   static {
     argDisplayMap.put(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
index 8283276..cb34979 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/RestoreTask.java
@@ -74,7 +74,7 @@
   /**
    * Stores mapping between configuration attribute name and its label.
    */
-  static private Map<String,LocalizableMessage> argDisplayMap =
+  private static Map<String,LocalizableMessage> argDisplayMap =
           new HashMap<String,LocalizableMessage>();
   static {
     argDisplayMap.put(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
index 5ed2b46..6fab083 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
@@ -115,11 +115,11 @@
     }
   }
 
-  final private static String DEFAULT_JAVA_HOME_PROP_NAME = "default.java-home";
-  final private static String DEFAULT_JAVA_ARGS_PROP_NAME = "default.java-args";
-  final private static String OVERWRITE_ENV_JAVA_HOME_PROP_NAME =
+  private static final String DEFAULT_JAVA_HOME_PROP_NAME = "default.java-home";
+  private static final String DEFAULT_JAVA_ARGS_PROP_NAME = "default.java-args";
+  private static final String OVERWRITE_ENV_JAVA_HOME_PROP_NAME =
     "overwrite-env-java-home";
-  final private static String OVERWRITE_ENV_JAVA_ARGS_PROP_NAME =
+  private static final String OVERWRITE_ENV_JAVA_ARGS_PROP_NAME =
     "overwrite-env-java-args";
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
index f209e6d..b821774 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
@@ -517,7 +517,7 @@
   /**
    * Base for callbacks that implement top level menu items.
    */
-  static abstract private class TopMenuCallback
+  private static abstract class TopMenuCallback
           implements MenuCallback<Void> {
 
     /**
@@ -543,7 +543,7 @@
   /**
    * Base for callbacks that manage task entries.
    */
-  static abstract private class TaskOperationCallback
+  private static abstract class TaskOperationCallback
           implements MenuCallback<TaskEntry> {
 
     /** ID of the task to manage. */
@@ -585,7 +585,7 @@
   /**
    * Executable for printing a task summary table.
    */
-  static private class PrintSummaryTop extends TopMenuCallback {
+  private static class PrintSummaryTop extends TopMenuCallback {
 
     @Override
     public MenuResult<Void> invoke(ManageTasks app)
@@ -599,9 +599,9 @@
   }
 
   /**
-   * Exectutable for printing a particular task's details.
+   * Executable for printing a particular task's details.
    */
-  static private class TaskDrilldownMenu extends TopMenuCallback {
+  private static class TaskDrilldownMenu extends TopMenuCallback {
 
     private String taskId;
 
@@ -668,9 +668,9 @@
   }
 
   /**
-   * Exectutable for printing a particular task's details.
+   * Executable for printing a particular task's details.
    */
-  static private class PrintTaskInfo extends TaskOperationCallback {
+  private static class PrintTaskInfo extends TaskOperationCallback {
 
     /**
      * Constructs a parameterized instance.
@@ -862,7 +862,7 @@
   /**
    * Executable for printing a particular task's details.
    */
-  static private class ViewTaskLogs extends TaskOperationCallback {
+  private static class ViewTaskLogs extends TaskOperationCallback {
 
     /**
      * Constructs a parameterized instance.
@@ -916,7 +916,7 @@
   /**
    * Executable for canceling a particular task.
    */
-  static private class CancelTaskTop extends TopMenuCallback {
+  private static class CancelTaskTop extends TopMenuCallback {
 
     private List<String> taskIds;
     private List<Integer> cancelableIndices;
@@ -996,7 +996,7 @@
   /**
    * Executable for canceling a particular task.
    */
-  static private class CancelTask extends TaskOperationCallback {
+  private static class CancelTask extends TaskOperationCallback {
 
     /**
      * Constructs a parameterized instance.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java
index 8aa9d2a..86f5fe7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/EntryWriter.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.tools.makeldif;
 
@@ -51,7 +52,7 @@
    *
    * @throws  MakeLDIFException  If some other problem occurs.
    */
-  public boolean writeEntry(TemplateEntry entry)
+  boolean writeEntry(TemplateEntry entry)
          throws IOException, MakeLDIFException;
 
 
@@ -60,6 +61,6 @@
    * Notifies the entry writer that no more entries will be provided and that
    * any associated cleanup may be performed.
    */
-  public void closeEntryWriter();
+  void closeEntryWriter();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
index 8d49bfc..1faa763 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
@@ -111,7 +111,7 @@
    * @param err stream to write messages; may be null
    * @return int indicating the result of this action
    */
-  abstract protected int processLocal(boolean initializeServer,
+  protected abstract int processLocal(boolean initializeServer,
                                       PrintStream out,
                                       PrintStream err);
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
index 5064639..4d2f282 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
@@ -275,7 +275,7 @@
      *          to act as the new file object
      * @return FileOperation as the same type as this class
      */
-    abstract public FileOperation copyForChild(File child);
+    public abstract FileOperation copyForChild(File child);
 
 
 
@@ -285,7 +285,7 @@
      * @throws IOException
      *           if there is a problem.
      */
-    abstract public void apply() throws IOException;
+    public abstract void apply() throws IOException;
 
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
index 09f70de..a3d29cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/LicenseFile.java
@@ -95,17 +95,17 @@
   /**
    * The File object related to the license file.
    */
-  static private File licFile;
+  private static File licFile;
 
   /**
    * The license file approval state.
    */
-  static private boolean approved;
+  private static boolean approved;
 
   /**
    * Returns the license file name.
    */
-  static private String getName()
+  private static String getName()
   {
     return getLegalDirectory() + File.separatorChar + "license_to_accept.txt";
   }
@@ -113,7 +113,7 @@
   /**
    * Returns the license file object.
    */
-  static private File getFile()
+  private static File getFile()
   {
     if (licFile == null)
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
index 0cea734..6e97f9c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeLog.java
@@ -52,9 +52,9 @@
  */
 class UpgradeLog
 {
-  static private File logFile;
-  static private FileHandler fileHandler;
-  final static String UPGRADELOGNAME = "upgrade.log";
+  private static File logFile;
+  private static FileHandler fileHandler;
+  static final String UPGRADELOGNAME = "upgrade.log";
 
   /**
    * Creates a new file handler for writing log messages into
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
index f992c79..fbef0cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.tools.upgrade;
 
@@ -824,7 +824,7 @@
    *
    * @return A schema which may used in the upgrade context.
    */
-  final static Schema getUpgradeSchema() {
+  static Schema getUpgradeSchema() {
     final SchemaBuilder sb = new SchemaBuilder(Schema.getCoreSchema())
         .setOption(DEFAULT_MATCHING_RULE_OID, getCaseExactMatchingRule().getOID())
         .setOption(DEFAULT_SYNTAX_OID, getDirectoryStringSyntax().getOID());
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
index a0a8b7e..d512163 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
@@ -453,7 +453,7 @@
    *                {@code null}, then any existing definition will be
    *                removed.
    */
-  public static final void setExtraProperty(SchemaFileElement elem,
+  public static void setExtraProperty(SchemaFileElement elem,
       String name, String value)
   {
     ifNull(name);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
index af334d7..bad3e35 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
@@ -111,7 +111,7 @@
    * case that the Directory Server is in the process of an in-core
    * restart because it will destroy the existing lock table.
    */
-  public synchronized static void reinitializeLockTable()
+  public static synchronized void reinitializeLockTable()
   {
     ConcurrentHashMap<DN,ReentrantReadWriteLock> oldTable = lockTable;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
index 170eaf8..7da77b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SynchronizationProviderResult.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types;
 
@@ -51,7 +51,7 @@
    *          operation should continue, or <CODE>false</CODE> if it
    *          should stop.
    */
-  public boolean continueProcessing();
+  boolean continueProcessing();
 
   /**
    * Retrieves the error message if <code>continueProcessing</code>
@@ -60,7 +60,7 @@
    * @return An error message explaining why processing should
    * stop or <code>null</code> if none is provided.
    */
-  public LocalizableMessage getErrorMessage();
+  LocalizableMessage getErrorMessage();
 
   /**
    * Retrieves the result code for the operation
@@ -69,7 +69,7 @@
    * @return the result code for the operation or <code>null</code>
    * if none is provided.
    */
-  public ResultCode getResultCode();
+  ResultCode getResultCode();
 
   /**
    * Retrieves the matched DN for the operation
@@ -78,16 +78,16 @@
    * @return the matched DN for the operation or <code>null</code>
    * if none is provided.
    */
-  public DN getMatchedDN();
+  DN getMatchedDN();
 
   /**
    * Retrieves the referral URLs for the operation
    * if <code>continueProcessing</code> returned <code>false</code>.
    *
-   * @return the refferal URLs for the operation or
+   * @return the referral URLs for the operation or
    * <code>null</code> if none is provided.
    */
-  public List<String> getReferralURLs();
+  List<String> getReferralURLs();
 
   /**
    * Defines a continue processing synchronization provider result.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java
index 639d8ca..3cfc0ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/InProgressOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessage;
@@ -59,7 +59,7 @@
    * @param  control  The control to add to the set of controls to
    *                  include in the response to the client.
    */
-  public void addResponseControl(Control control);
+  void addResponseControl(Control control);
 
 
 
@@ -70,7 +70,7 @@
    * @param  control  The control to remove from the set of controls
    *                  to include in the response to the client.
    */
-  public void removeResponseControl(Control control);
+  void removeResponseControl(Control control);
 
 
 
@@ -81,7 +81,7 @@
    *          <CODE>UNDEFINED</CODE> if the operation has not yet
    *          completed.
    */
-  public ResultCode getResultCode();
+  ResultCode getResultCode();
 
 
 
@@ -90,7 +90,7 @@
    *
    * @param  resultCode  The result code for this operation.
    */
-  public void setResultCode(ResultCode resultCode);
+  void setResultCode(ResultCode resultCode);
 
 
 
@@ -100,7 +100,7 @@
    *
    * @return  The error message for this operation.
    */
-  public LocalizableMessageBuilder getErrorMessage();
+  LocalizableMessageBuilder getErrorMessage();
 
 
 
@@ -109,7 +109,7 @@
    *
    * @param  errorMessage  The error message for this operation.
    */
-  public void setErrorMessage(LocalizableMessageBuilder errorMessage);
+  void setErrorMessage(LocalizableMessageBuilder errorMessage);
 
 
 
@@ -120,7 +120,7 @@
    *
    * @param  message  The message to append to the error message
    */
-  public void appendErrorMessage(LocalizableMessage message);
+  void appendErrorMessage(LocalizableMessage message);
 
 
 
@@ -131,7 +131,7 @@
    *          if the operation has not yet completed or does not have
    *          a matched DN.
    */
-  public DN getMatchedDN();
+  DN getMatchedDN();
 
 
 
@@ -140,7 +140,7 @@
    *
    * @param  matchedDN  The matched DN for this operation.
    */
-  public void setMatchedDN(DN matchedDN);
+  void setMatchedDN(DN matchedDN);
 
 
 
@@ -152,7 +152,7 @@
    *          <CODE>null</CODE> if the operation is not yet complete
    *          or does not have a set of referral URLs.
    */
-  public List<String> getReferralURLs();
+  List<String> getReferralURLs();
 
 
 
@@ -162,7 +162,7 @@
    * @param  referralURLs  The set of referral URLs for this
    *                       operation.
    */
-  public void setReferralURLs(List<String> referralURLs);
+  void setReferralURLs(List<String> referralURLs);
 
 
 
@@ -175,7 +175,7 @@
    *                             information to use for the response
    *                             elements.
    */
-  public void setResponseData(DirectoryException directoryException);
+  void setResponseData(DirectoryException directoryException);
 
 
 
@@ -190,7 +190,7 @@
    *
    * @return  The authorization DN for this operation.
    */
-  public DN getAuthorizationDN();
+  DN getAuthorizationDN();
 
 
 
@@ -202,7 +202,7 @@
    * @return An unmodifiable list containing the additional log items for this
    *         operation.
    */
-  public List<AdditionalLogItem> getAdditionalLogItems();
+  List<AdditionalLogItem> getAdditionalLogItems();
 
 
 
@@ -214,6 +214,6 @@
    * @param item
    *          The additional log item for this operation.
    */
-  public void addAdditionalLogItem(AdditionalLogItem item);
+  void addAdditionalLogItem(AdditionalLogItem item);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java
index a4bffaf..a0e9c9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAbandonOperation.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -48,6 +49,6 @@
    * @return  The message ID of the operation that should be
    *          abandoned.
    */
-  public int getIDToAbandon();
+  int getIDToAbandon();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java
index 116a2d5..00872e7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationAddOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -63,7 +63,7 @@
    *
    * @return  The DN of the entry in a raw, unparsed form.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -76,7 +76,7 @@
    * @return  The set of attributes in their raw, unparsed form as
    *          read from the client request.
    */
-  public List<RawAttribute> getRawAttributes();
+  List<RawAttribute> getRawAttributes();
 
 
 
@@ -85,30 +85,27 @@
    *
    * @return  The DN of the entry to add.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
   /**
    * Retrieves the set of processed objectclasses for the entry to
-   * add.  The contents of the returned map must not be altered by the
-   * caller.
+   * add.  The contents of the returned map must not be altered by the caller.
    *
    * @return  The set of processed objectclasses for the entry to add.
    */
-  public Map<ObjectClass,String> getObjectClasses();
+  Map<ObjectClass,String> getObjectClasses();
 
 
 
   /**
    * Retrieves the set of processed user attributes for the entry to
-   * add.  The contents of the returned map must not be altered by the
-   * caller.
+   * add.  The contents of the returned map must not be altered by the caller.
    *
-   * @return  The set of processed user attributes for the entry to
-   *          add.
+   * @return  The set of processed user attributes for the entry to add.
    */
-  public Map<AttributeType,List<Attribute>> getUserAttributes();
+  Map<AttributeType,List<Attribute>> getUserAttributes();
 
 
 
@@ -117,10 +114,9 @@
    * entry to add.  The contents of the returned map must not be
    * altered by the caller.
    *
-   * @return  The set of processed operational attributes for the
-   *          entry to add.
+   * @return  The set of processed operational attributes for the entry to add.
    */
-  public Map<AttributeType,List<Attribute>>
+  Map<AttributeType,List<Attribute>>
               getOperationalAttributes();
 
 
@@ -131,6 +127,6 @@
    *
    * @return  The entry to be added to the server.
    */
-  public Entry getEntryToAdd();
+  Entry getEntryToAdd();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java
index 55cc4e6..454cc8e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationBindOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessage;
@@ -55,7 +55,7 @@
    *
    * @return  The authentication type for this bind operation.
    */
-  public AuthenticationType getAuthenticationType();
+  AuthenticationType getAuthenticationType();
 
 
 
@@ -66,7 +66,7 @@
    * @return  A string representation of the protocol version
    *          associated with this bind request.
    */
-  public String getProtocolVersion();
+  String getProtocolVersion();
 
 
 
@@ -78,7 +78,7 @@
    * @return  The raw, unprocessed bind DN for this bind operation as
    *          contained in the client request.
    */
-  public ByteString getRawBindDN();
+  ByteString getRawBindDN();
 
 
 
@@ -87,18 +87,17 @@
    *
    * @return  The bind DN for this bind operation.
    */
-  public DN getBindDN();
+  DN getBindDN();
 
 
 
   /**
-   * Retrieves the simple authentication password for this bind
-   * operation.
+   * Retrieves the simple authentication password for this bind operation.
    *
    * @return  The simple authentication password for this bind
    *          operation.
    */
-  public ByteString getSimplePassword();
+  ByteString getSimplePassword();
 
 
 
@@ -109,7 +108,7 @@
    *          <CODE>null</CODE> if the bind does not use SASL
    *          authentication.
    */
-  public String getSASLMechanism();
+  String getSASLMechanism();
 
 
 
@@ -120,7 +119,7 @@
    *          <CODE>null</CODE> if there are none or if the bind does
    *          not use SASL authentication.
    */
-  public ByteString getSASLCredentials();
+  ByteString getSASLCredentials();
 
 
 
@@ -131,7 +130,7 @@
    * @return  The set of server SASL credentials to include in the
    *          bind response, or <CODE>null</CODE> if there are none.
    */
-  public ByteString getServerSASLCredentials();
+  ByteString getServerSASLCredentials();
 
 
 
@@ -142,8 +141,7 @@
    * @param  serverSASLCredentials  The set of server SASL credentials
    *                                to include in the bind response.
    */
-  public void setServerSASLCredentials(ByteString
-                                            serverSASLCredentials);
+  void setServerSASLCredentials(ByteString serverSASLCredentials);
 
 
 
@@ -159,7 +157,7 @@
    *          authentication or the SASL processing was not able to
    *          map the request to a user.
    */
-  public Entry getSASLAuthUserEntry();
+  Entry getSASLAuthUserEntry();
 
 
 
@@ -171,7 +169,7 @@
    *          authentication failed, or <CODE>null</CODE> if none is
    *          available.
    */
-  public LocalizableMessage getAuthFailureReason();
+  LocalizableMessage getAuthFailureReason();
 
 
 
@@ -181,7 +179,7 @@
    * @param  reason  A human-readable message providing the reason
    *                 that the authentication failed.
    */
-  public void setAuthFailureReason(LocalizableMessage reason);
+  void setAuthFailureReason(LocalizableMessage reason);
 
 
 
@@ -195,6 +193,6 @@
    *          progressed far enough to identify the user or if the
    *          user DN could not be determined.
    */
-  public DN getUserEntryDN();
+  DN getUserEntryDN();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java
index 6f29eff..985e24e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationCompareOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    *
    * @return  The DN of the entry to compare.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -74,7 +74,7 @@
    *
    * @return  The raw attribute type for this compare operation.
    */
-  public String getRawAttributeType();
+  String getRawAttributeType();
 
 
 
@@ -83,7 +83,7 @@
    *
    * @return  The attribute type for this compare operation.
    */
-  public AttributeType getAttributeType();
+  AttributeType getAttributeType();
 
 
 
@@ -92,7 +92,7 @@
    *
    * @return  The assertion value for this compare operation.
    */
-  public ByteString getAssertionValue();
+  ByteString getAssertionValue();
 
 
 
@@ -101,6 +101,6 @@
    *
    * @return  The entry to target with the compare operation.
    */
-  public Entry getEntryToCompare();
+  Entry getEntryToCompare();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java
index 33cd499..56ee38a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationDeleteOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -55,7 +55,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -64,7 +64,7 @@
    *
    * @return  The DN of the entry to delete.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -73,6 +73,6 @@
    *
    * @return  The entry to be deleted.
    */
-  public Entry getEntryToDelete();
+  Entry getEntryToDelete();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java
index d28d44c..6ae873e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -52,7 +52,7 @@
    * @return  The OID for the request associated with this extended
    *          operation.
    */
-  public String getRequestOID();
+  String getRequestOID();
 
 
 
@@ -63,7 +63,7 @@
    * @return  The value for the request associated with this extended
    *          operation.
    */
-  public ByteString getRequestValue();
+  ByteString getRequestValue();
 
 
 
@@ -72,7 +72,7 @@
    *
    * @return  The OID to include in the response to the client.
    */
-  public String getResponseOID();
+  String getResponseOID();
 
 
 
@@ -82,7 +82,7 @@
    * @param  responseOID  The OID to include in the response to the
    *                      client.
    */
-  public void setResponseOID(String responseOID);
+  void setResponseOID(String responseOID);
 
 
 
@@ -91,7 +91,7 @@
    *
    * @return  The value to include in the response to the client.
    */
-  public ByteString getResponseValue();
+  ByteString getResponseValue();
 
 
 
@@ -101,6 +101,6 @@
    * @param  responseValue  The value to include in the response to
    *                        the client.
    */
-  public void setResponseValue(ByteString responseValue);
+  void setResponseValue(ByteString responseValue);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java
index 997bc8d..d079d8d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -60,7 +60,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -73,7 +73,7 @@
    * @return  The DN of the entry to rename, or <CODE>null</CODE> if
    *          the raw entry DN has not yet been processed.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -85,7 +85,7 @@
    * @return  The raw, unprocessed newRDN as included in the request
    *          from the client.
    */
-  public ByteString getRawNewRDN();
+  ByteString getRawNewRDN();
 
 
 
@@ -98,7 +98,7 @@
    * @return  The new RDN to use for the entry, or <CODE>null</CODE>
    *          if the raw newRDN has not yet been processed.
    */
-  public RDN getNewRDN();
+  RDN getNewRDN();
 
 
 
@@ -109,7 +109,7 @@
    * @return  <CODE>true</CODE> if the current RDN value should be
    *          removed from the entry, or <CODE>false</CODE> if not.
    */
-  public boolean deleteOldRDN();
+  boolean deleteOldRDN();
 
 
 
@@ -121,7 +121,7 @@
    * @return  The raw, unprocessed newSuperior from the client
    *          request, or <CODE>null</CODE> if there is none.
    */
-  public ByteString getRawNewSuperior();
+  ByteString getRawNewSuperior();
 
 
 
@@ -135,7 +135,7 @@
    *          if there is no newSuperior DN for this request or if the
    *          raw newSuperior has not yet been processed.
    */
-  public DN getNewSuperior();
+  DN getNewSuperior();
 
 
 
@@ -160,7 +160,7 @@
    *          <CODE>null</CODE> if that information is not yet
    *          available (e.g., during pre-parse plugins).
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -172,7 +172,7 @@
    * @return  The current entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getOriginalEntry();
+  Entry getOriginalEntry();
 
 
 
@@ -184,6 +184,6 @@
    * @return  The updated entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getUpdatedEntry();
+  Entry getUpdatedEntry();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java
index 2dd1bf1..2252ddb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationModifyOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    *
    * @return  The DN of the entry to modify.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -79,7 +79,7 @@
    * @return  The set of raw, unprocessed modifications as included
    *          in the client request.
    */
-  public List<RawModification> getRawModifications();
+  List<RawModification> getRawModifications();
 
 
 
@@ -89,7 +89,7 @@
    *
    * @return  The set of modifications for this modify operation.
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -99,7 +99,7 @@
    *
    * @return  The current entry before any modifications are applied.
    */
-  public Entry getCurrentEntry();
+  Entry getCurrentEntry();
 
 
 
@@ -109,7 +109,7 @@
    *
    * @return  The modified entry that is to be written to the backend.
    */
-  public Entry getModifiedEntry();
+  Entry getModifiedEntry();
 
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java
index e9a0fae..07465ca 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessage;
@@ -57,7 +57,7 @@
    * @param  control  The control to add to the set of controls to
    *                  include in the response to the client.
    */
-  public void addResponseControl(Control control);
+  void addResponseControl(Control control);
 
 
 
@@ -68,7 +68,7 @@
    * @param  control  The control to remove from the set of controls
    *                  to include in the response to the client.
    */
-  public void removeResponseControl(Control control);
+  void removeResponseControl(Control control);
 
 
 
@@ -79,7 +79,7 @@
    *          <CODE>UNDEFINED</CODE> if the operation has not yet
    *          completed.
    */
-  public ResultCode getResultCode();
+  ResultCode getResultCode();
 
 
 
@@ -88,7 +88,7 @@
    *
    * @param  resultCode  The result code for this operation.
    */
-  public void setResultCode(ResultCode resultCode);
+  void setResultCode(ResultCode resultCode);
 
 
 
@@ -98,7 +98,7 @@
    *
    * @return  The error message for this operation.
    */
-  public LocalizableMessageBuilder getErrorMessage();
+  LocalizableMessageBuilder getErrorMessage();
 
 
 
@@ -107,7 +107,7 @@
    *
    * @param  errorMessage  The error message for this operation.
    */
-  public void setErrorMessage(LocalizableMessageBuilder errorMessage);
+  void setErrorMessage(LocalizableMessageBuilder errorMessage);
 
 
 
@@ -118,7 +118,7 @@
    *
    * @param  message  The message to append to the error message
    */
-  public void appendErrorMessage(LocalizableMessage message);
+  void appendErrorMessage(LocalizableMessage message);
 
 
 
@@ -129,7 +129,7 @@
    *          if the operation has not yet completed or does not have
    *          a matched DN.
    */
-  public DN getMatchedDN();
+  DN getMatchedDN();
 
 
 
@@ -138,7 +138,7 @@
    *
    * @param  matchedDN  The matched DN for this operation.
    */
-  public void setMatchedDN(DN matchedDN);
+  void setMatchedDN(DN matchedDN);
 
 
 
@@ -150,17 +150,16 @@
    *          <CODE>null</CODE> if the operation is not yet complete
    *          or does not have a set of referral URLs.
    */
-  public List<String> getReferralURLs();
+  List<String> getReferralURLs();
 
 
 
   /**
    * Specifies the set of referral URLs for this operation.
    *
-   * @param  referralURLs  The set of referral URLs for this
-   *                       operation.
+   * @param  referralURLs  The set of referral URLs for this operation.
    */
-  public void setReferralURLs(List<String> referralURLs);
+  void setReferralURLs(List<String> referralURLs);
 
 
 
@@ -170,10 +169,9 @@
    * <CODE>DirectoryException</CODE> object.
    *
    * @param  directoryException  The exception containing the
-   *                             information to use for the response
-   *                             elements.
+   *                             information to use for the response elements.
    */
-  public void setResponseData(DirectoryException directoryException);
+  void setResponseData(DirectoryException directoryException);
 
 
 
@@ -188,7 +186,7 @@
    *
    * @return  The authorization DN for this operation.
    */
-  public DN getAuthorizationDN();
+  DN getAuthorizationDN();
 
 
 
@@ -200,7 +198,7 @@
    * @return An unmodifiable list containing the additional log items for this
    *         operation.
    */
-  public List<AdditionalLogItem> getAdditionalLogItems();
+  List<AdditionalLogItem> getAdditionalLogItems();
 
 
 
@@ -212,6 +210,6 @@
    * @param item
    *          The additional log item for this operation.
    */
-  public void addAdditionalLogItem(AdditionalLogItem item);
+  void addAdditionalLogItem(AdditionalLogItem item);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java
index a1cffcb..99984ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostOperationSearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -61,7 +61,7 @@
    * @return  The raw, unprocessed base DN as included in the request
    *          from the client.
    */
-  public ByteString getRawBaseDN();
+  ByteString getRawBaseDN();
 
 
 
@@ -70,7 +70,7 @@
    *
    * @return  The base DN for this search operation.
    */
-  public DN getBaseDN();
+  DN getBaseDN();
 
 
 
@@ -79,7 +79,7 @@
    *
    * @return  The scope for this search operation.
    */
-  public SearchScope getScope();
+  SearchScope getScope();
 
 
 
@@ -90,7 +90,7 @@
    * @return  The alias dereferencing policy for this search
    *          operation.
    */
-  public DereferenceAliasesPolicy getDerefPolicy();
+  DereferenceAliasesPolicy getDerefPolicy();
 
 
 
@@ -99,7 +99,7 @@
    *
    * @return  The size limit for this search operation.
    */
-  public int getSizeLimit();
+  int getSizeLimit();
 
 
 
@@ -108,7 +108,7 @@
    *
    * @return  The time limit for this search operation.
    */
-  public int getTimeLimit();
+  int getTimeLimit();
 
 
 
@@ -117,7 +117,7 @@
    *
    * @return  The typesOnly flag for this search operation.
    */
-  public boolean getTypesOnly();
+  boolean getTypesOnly();
 
 
 
@@ -131,7 +131,7 @@
    * @return  The raw, unprocessed search filter as included in the
    *          request from the client.
    */
-  public RawFilter getRawFilter();
+  RawFilter getRawFilter();
 
 
 
@@ -140,7 +140,7 @@
    *
    * @return  The filter for this search operation.
    */
-  public SearchFilter getFilter();
+  SearchFilter getFilter();
 
 
 
@@ -151,7 +151,7 @@
    * @return  The set of requested attributes for this search
    *          operation.
    */
-  public Set<String> getAttributes();
+  Set<String> getAttributes();
 
 
 
@@ -162,7 +162,7 @@
    * @return  The number of entries sent to the client for this search
    *          operation.
    */
-  public int getEntriesSent();
+  int getEntriesSent();
 
 
 
@@ -173,6 +173,6 @@
    * @return  The number of search references sent to the client for
    *          this search operation.
    */
-  public int getReferencesSent();
+  int getReferencesSent();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java
index 876a2ca..e8340de 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseAddOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -57,7 +57,7 @@
    *
    * @return  The DN of the entry in a raw, unparsed form.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -70,7 +70,7 @@
    * @return  The set of attributes in their raw, unparsed form as
    *          read from the client request.
    */
-  public List<RawAttribute> getRawAttributes();
+  List<RawAttribute> getRawAttributes();
 
 
 
@@ -79,7 +79,7 @@
    *
    * @return  The DN of the entry to add.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -90,7 +90,7 @@
    *
    * @return  The set of processed objectclasses for the entry to add.
    */
-  public Map<ObjectClass,String> getObjectClasses();
+  Map<ObjectClass,String> getObjectClasses();
 
 
 
@@ -102,7 +102,7 @@
    * @return  The set of processed user attributes for the entry to
    *          add.
    */
-  public Map<AttributeType,List<Attribute>> getUserAttributes();
+  Map<AttributeType,List<Attribute>> getUserAttributes();
 
 
 
@@ -114,10 +114,7 @@
    * @return  The set of processed operational attributes for the
    *          entry to add.
    */
-  public Map<AttributeType,List<Attribute>>
-              getOperationalAttributes();
-
-
+  Map<AttributeType, List<Attribute>> getOperationalAttributes();
 
   /**
    * Retrieves the entry to be added to the server.  The contents of
@@ -125,6 +122,6 @@
    *
    * @return  The entry to be added to the server.
    */
-  public Entry getEntryToAdd();
+  Entry getEntryToAdd();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java
index e83f969..e979bf9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseBindOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessage;
@@ -55,7 +55,7 @@
    *
    * @return  The authentication type for this bind operation.
    */
-  public AuthenticationType getAuthenticationType();
+  AuthenticationType getAuthenticationType();
 
 
 
@@ -66,7 +66,7 @@
    * @return  A string representation of the protocol version
    *          associated with this bind request.
    */
-  public String getProtocolVersion();
+  String getProtocolVersion();
 
 
 
@@ -78,7 +78,7 @@
    * @return  The raw, unprocessed bind DN for this bind operation as
    *          contained in the client request.
    */
-  public ByteString getRawBindDN();
+  ByteString getRawBindDN();
 
 
 
@@ -87,7 +87,7 @@
    *
    * @return  The bind DN for this bind operation.
    */
-  public DN getBindDN();
+  DN getBindDN();
 
 
 
@@ -98,7 +98,7 @@
    * @return  The simple authentication password for this bind
    *          operation.
    */
-  public ByteString getSimplePassword();
+  ByteString getSimplePassword();
 
 
 
@@ -109,7 +109,7 @@
    *          <CODE>null</CODE> if the bind does not use SASL
    *          authentication.
    */
-  public String getSASLMechanism();
+  String getSASLMechanism();
 
 
 
@@ -120,7 +120,7 @@
    *          <CODE>null</CODE> if there are none or if the bind does
    *          not use SASL authentication.
    */
-  public ByteString getSASLCredentials();
+  ByteString getSASLCredentials();
 
 
 
@@ -131,7 +131,7 @@
    * @return  The set of server SASL credentials to include in the
    *          bind response, or <CODE>null</CODE> if there are none.
    */
-  public ByteString getServerSASLCredentials();
+  ByteString getServerSASLCredentials();
 
 
 
@@ -147,7 +147,7 @@
    *          authentication or the SASL processing was not able to
    *          map the request to a user.
    */
-  public Entry getSASLAuthUserEntry();
+  Entry getSASLAuthUserEntry();
 
 
 
@@ -159,7 +159,7 @@
    *          authentication failed, or <CODE>null</CODE> if none is
    *          available.
    */
-  public LocalizableMessage getAuthFailureReason();
+  LocalizableMessage getAuthFailureReason();
 
 
 
@@ -173,6 +173,6 @@
    *          progressed far enough to identify the user or if the
    *          user DN could not be determined.
    */
-  public DN getUserEntryDN();
+  DN getUserEntryDN();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java
index 6d7f0c5..7400708 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseCompareOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -53,7 +53,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -62,7 +62,7 @@
    *
    * @return  The DN of the entry to compare.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -71,7 +71,7 @@
    *
    * @return  The raw attribute type for this compare operation.
    */
-  public String getRawAttributeType();
+  String getRawAttributeType();
 
 
 
@@ -80,7 +80,7 @@
    *
    * @return  The attribute type for this compare operation.
    */
-  public AttributeType getAttributeType();
+  AttributeType getAttributeType();
 
 
 
@@ -89,7 +89,7 @@
    *
    * @return  The assertion value for this compare operation.
    */
-  public ByteString getAssertionValue();
+  ByteString getAssertionValue();
 
 
 
@@ -98,6 +98,6 @@
    *
    * @return  The entry to target with the compare operation.
    */
-  public Entry getEntryToCompare();
+  Entry getEntryToCompare();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java
index fa400a8..1ef1225 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseDeleteOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -54,7 +54,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -63,7 +63,7 @@
    *
    * @return  The DN of the entry to delete.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -72,6 +72,6 @@
    *
    * @return  The entry to be deleted.
    */
-  public Entry getEntryToDelete();
+  Entry getEntryToDelete();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java
index 812623c..b865a0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -52,7 +52,7 @@
    * @return  The OID for the request associated with this extended
    *          operation.
    */
-  public String getRequestOID();
+  String getRequestOID();
 
 
 
@@ -63,7 +63,7 @@
    * @return  The value for the request associated with this extended
    *          operation.
    */
-  public ByteString getRequestValue();
+  ByteString getRequestValue();
 
 
 
@@ -72,7 +72,7 @@
    *
    * @return  The OID to include in the response to the client.
    */
-  public String getResponseOID();
+  String getResponseOID();
 
 
 
@@ -81,6 +81,6 @@
    *
    * @return  The value to include in the response to the client.
    */
-  public ByteString getResponseValue();
+  ByteString getResponseValue();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java
index f7205b3..0ebf555 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -69,7 +69,7 @@
    * @return  The DN of the entry to rename, or <CODE>null</CODE> if
    *          the raw entry DN has not yet been processed.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -81,7 +81,7 @@
    * @return  The raw, unprocessed newRDN as included in the request
    *          from the client.
    */
-  public ByteString getRawNewRDN();
+  ByteString getRawNewRDN();
 
 
 
@@ -94,7 +94,7 @@
    * @return  The new RDN to use for the entry, or <CODE>null</CODE>
    *          if the raw newRDN has not yet been processed.
    */
-  public RDN getNewRDN();
+  RDN getNewRDN();
 
 
 
@@ -105,7 +105,7 @@
    * @return  <CODE>true</CODE> if the current RDN value should be
    *          removed from the entry, or <CODE>false</CODE> if not.
    */
-  public boolean deleteOldRDN();
+  boolean deleteOldRDN();
 
 
 
@@ -117,7 +117,7 @@
    * @return  The raw, unprocessed newSuperior from the client
    *          request, or <CODE>null</CODE> if there is none.
    */
-  public ByteString getRawNewSuperior();
+  ByteString getRawNewSuperior();
 
 
 
@@ -131,7 +131,7 @@
    *          if there is no newSuperior DN for this request or if the
    *          raw newSuperior has not yet been processed.
    */
-  public DN getNewSuperior();
+  DN getNewSuperior();
 
 
 
@@ -156,7 +156,7 @@
    *          <CODE>null</CODE> if that information is not yet
    *          available (e.g., during pre-parse plugins).
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -168,7 +168,7 @@
    * @return  The current entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getOriginalEntry();
+  Entry getOriginalEntry();
 
 
 
@@ -180,6 +180,6 @@
    * @return  The updated entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getUpdatedEntry();
+  Entry getUpdatedEntry();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java
index 439ee1a..f0ab318 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseModifyOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    *
    * @return  The DN of the entry to modify.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -79,7 +79,7 @@
    * @return  The set of raw, unprocessed modifications as included
    *          in the client request.
    */
-  public List<RawModification> getRawModifications();
+  List<RawModification> getRawModifications();
 
 
 
@@ -89,7 +89,7 @@
    *
    * @return  The set of modifications for this modify operation.
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -99,7 +99,7 @@
    *
    * @return  The current entry before any modifications are applied.
    */
-  public Entry getCurrentEntry();
+  Entry getCurrentEntry();
 
 
 
@@ -109,7 +109,7 @@
    *
    * @return  The modified entry that is to be written to the backend.
    */
-  public Entry getModifiedEntry();
+  Entry getModifiedEntry();
 
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java
index 7d5a1d0..9ed51c3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -57,7 +57,7 @@
    *          <CODE>UNDEFINED</CODE> if the operation has not yet
    *          completed.
    */
-  public ResultCode getResultCode();
+  ResultCode getResultCode();
 
 
 
@@ -67,7 +67,7 @@
    *
    * @return  The error message for this operation.
    */
-  public LocalizableMessageBuilder getErrorMessage();
+  LocalizableMessageBuilder getErrorMessage();
 
 
 
@@ -78,7 +78,7 @@
    *          if the operation has not yet completed or does not have
    *          a matched DN.
    */
-  public DN getMatchedDN();
+  DN getMatchedDN();
 
 
 
@@ -90,7 +90,7 @@
    *          <CODE>null</CODE> if the operation is not yet complete
    *          or does not have a set of referral URLs.
    */
-  public List<String> getReferralURLs();
+  List<String> getReferralURLs();
 
 
 
@@ -105,7 +105,7 @@
    *
    * @return  The authorization DN for this operation.
    */
-  public DN getAuthorizationDN();
+  DN getAuthorizationDN();
 
 
 
@@ -116,7 +116,7 @@
    *
    * @return  The time that processing stopped for this operation.
    */
-  public long getProcessingStopTime();
+  long getProcessingStopTime();
 
 
 
@@ -127,7 +127,7 @@
    * @return  The length of time in milliseconds that the server spent
    *          processing this operation.
    */
-  public long getProcessingTime();
+  long getProcessingTime();
 
 
 
@@ -139,6 +139,6 @@
    * @return An unmodifiable list containing the additional log items for this
    *         operation.
    */
-  public List<AdditionalLogItem> getAdditionalLogItems();
+  List<AdditionalLogItem> getAdditionalLogItems();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java
index d4cde42..5ddd315 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostResponseSearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -57,7 +57,7 @@
    * @return  The raw, unprocessed base DN as included in the request
    *          from the client.
    */
-  public ByteString getRawBaseDN();
+  ByteString getRawBaseDN();
 
 
 
@@ -66,7 +66,7 @@
    *
    * @return  The base DN for this search operation.
    */
-  public DN getBaseDN();
+  DN getBaseDN();
 
 
 
@@ -75,7 +75,7 @@
    *
    * @return  The scope for this search operation.
    */
-  public SearchScope getScope();
+  SearchScope getScope();
 
 
 
@@ -86,7 +86,7 @@
    * @return  The alias dereferencing policy for this search
    *          operation.
    */
-  public DereferenceAliasesPolicy getDerefPolicy();
+  DereferenceAliasesPolicy getDerefPolicy();
 
 
 
@@ -95,7 +95,7 @@
    *
    * @return  The size limit for this search operation.
    */
-  public int getSizeLimit();
+  int getSizeLimit();
 
 
 
@@ -104,7 +104,7 @@
    *
    * @return  The time limit for this search operation.
    */
-  public int getTimeLimit();
+  int getTimeLimit();
 
 
 
@@ -113,7 +113,7 @@
    *
    * @return  The typesOnly flag for this search operation.
    */
-  public boolean getTypesOnly();
+  boolean getTypesOnly();
 
 
 
@@ -127,7 +127,7 @@
    * @return  The raw, unprocessed search filter as included in the
    *          request from the client.
    */
-  public RawFilter getRawFilter();
+  RawFilter getRawFilter();
 
 
 
@@ -136,7 +136,7 @@
    *
    * @return  The filter for this search operation.
    */
-  public SearchFilter getFilter();
+  SearchFilter getFilter();
 
 
 
@@ -147,7 +147,7 @@
    * @return  The set of requested attributes for this search
    *          operation.
    */
-  public Set<String> getAttributes();
+  Set<String> getAttributes();
 
 
 
@@ -158,7 +158,7 @@
    * @return  The number of entries sent to the client for this search
    *          operation.
    */
-  public int getEntriesSent();
+  int getEntriesSent();
 
 
 
@@ -169,6 +169,6 @@
    * @return  The number of search references sent to the client for
    *          this search operation.
    */
-  public int getReferencesSent();
+  int getReferencesSent();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java
index 65dd328..3c0eefd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationAddOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -63,7 +63,7 @@
    *
    * @return  The DN of the entry in a raw, unparsed form.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -76,7 +76,7 @@
    * @return  The set of attributes in their raw, unparsed form as
    *          read from the client request.
    */
-  public List<RawAttribute> getRawAttributes();
+  List<RawAttribute> getRawAttributes();
 
 
 
@@ -85,7 +85,7 @@
    *
    * @return  The DN of the entry to add.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -96,7 +96,7 @@
    *
    * @return  The set of processed objectclasses for the entry to add.
    */
-  public Map<ObjectClass,String> getObjectClasses();
+  Map<ObjectClass,String> getObjectClasses();
 
 
 
@@ -108,7 +108,7 @@
    * @return  The set of processed user attributes for the entry to
    *          add.
    */
-  public Map<AttributeType,List<Attribute>> getUserAttributes();
+  Map<AttributeType,List<Attribute>> getUserAttributes();
 
 
 
@@ -120,7 +120,7 @@
    * @return  The set of processed operational attributes for the
    *          entry to add.
    */
-  public Map<AttributeType,List<Attribute>>
+  Map<AttributeType,List<Attribute>>
               getOperationalAttributes();
 
 
@@ -131,6 +131,6 @@
    *
    * @return  The entry to be added to the server.
    */
-  public Entry getEntryToAdd();
+  Entry getEntryToAdd();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
index 522e309..9ef6b98 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationDeleteOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -55,7 +55,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -64,7 +64,7 @@
    *
    * @return  The DN of the entry to delete.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -73,6 +73,6 @@
    *
    * @return  The entry to be deleted.
    */
-  public Entry getEntryToDelete();
+  Entry getEntryToDelete();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
index 8ef71ce..bece650 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -60,7 +60,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -73,7 +73,7 @@
    * @return  The DN of the entry to rename, or <CODE>null</CODE> if
    *          the raw entry DN has not yet been processed.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -85,7 +85,7 @@
    * @return  The raw, unprocessed newRDN as included in the request
    *          from the client.
    */
-  public ByteString getRawNewRDN();
+  ByteString getRawNewRDN();
 
 
 
@@ -98,7 +98,7 @@
    * @return  The new RDN to use for the entry, or <CODE>null</CODE>
    *          if the raw newRDN has not yet been processed.
    */
-  public RDN getNewRDN();
+  RDN getNewRDN();
 
 
 
@@ -109,7 +109,7 @@
    * @return  <CODE>true</CODE> if the current RDN value should be
    *          removed from the entry, or <CODE>false</CODE> if not.
    */
-  public boolean deleteOldRDN();
+  boolean deleteOldRDN();
 
 
 
@@ -121,7 +121,7 @@
    * @return  The raw, unprocessed newSuperior from the client
    *          request, or <CODE>null</CODE> if there is none.
    */
-  public ByteString getRawNewSuperior();
+  ByteString getRawNewSuperior();
 
 
 
@@ -135,7 +135,7 @@
    *          if there is no newSuperior DN for this request or if the
    *          raw newSuperior has not yet been processed.
    */
-  public DN getNewSuperior();
+  DN getNewSuperior();
 
 
 
@@ -160,7 +160,7 @@
    *          <CODE>null</CODE> if that information is not yet
    *          available (e.g., during pre-parse plugins).
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -172,7 +172,7 @@
    * @return  The current entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getOriginalEntry();
+  Entry getOriginalEntry();
 
 
 
@@ -184,6 +184,6 @@
    * @return  The updated entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getUpdatedEntry();
+  Entry getUpdatedEntry();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
index 159e80c..cd90991 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationModifyOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    *
    * @return  The DN of the entry to modify.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -79,7 +79,7 @@
    * @return  The set of raw, unprocessed modifications as included
    *          in the client request.
    */
-  public List<RawModification> getRawModifications();
+  List<RawModification> getRawModifications();
 
 
 
@@ -89,7 +89,7 @@
    *
    * @return  The set of modifications for this modify operation.
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -99,7 +99,7 @@
    *
    * @return  The current entry before any modifications are applied.
    */
-  public Entry getCurrentEntry();
+  Entry getCurrentEntry();
 
 
 
@@ -109,7 +109,7 @@
    *
    * @return  The modified entry that is to be written to the backend.
    */
-  public Entry getModifiedEntry();
+  Entry getModifiedEntry();
 
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java
index 62e1b4d..6c16400 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PostSynchronizationOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessageBuilder;
@@ -58,7 +58,7 @@
    *          <CODE>UNDEFINED</CODE> if the operation has not yet
    *          completed.
    */
-  public ResultCode getResultCode();
+  ResultCode getResultCode();
 
 
 
@@ -68,7 +68,7 @@
    *
    * @return  The error message for this operation.
    */
-  public LocalizableMessageBuilder getErrorMessage();
+  LocalizableMessageBuilder getErrorMessage();
 
 
 
@@ -79,7 +79,7 @@
    *          if the operation has not yet completed or does not have
    *          a matched DN.
    */
-  public DN getMatchedDN();
+  DN getMatchedDN();
 
 
 
@@ -91,7 +91,7 @@
    *          <CODE>null</CODE> if the operation is not yet complete
    *          or does not have a set of referral URLs.
    */
-  public List<String> getReferralURLs();
+  List<String> getReferralURLs();
 
 
 
@@ -106,7 +106,7 @@
    *
    * @return  The authorization DN for this operation.
    */
-  public DN getAuthorizationDN();
+  DN getAuthorizationDN();
 
 
 
@@ -117,7 +117,7 @@
    *
    * @return  The time that processing stopped for this operation.
    */
-  public long getProcessingStopTime();
+  long getProcessingStopTime();
 
 
 
@@ -128,7 +128,7 @@
    * @return  The length of time in milliseconds that the server spent
    *          processing this operation.
    */
-  public long getProcessingTime();
+  long getProcessingTime();
 
 
 
@@ -140,6 +140,6 @@
    * @return An unmodifiable list containing the additional log items for this
    *         operation.
    */
-  public List<AdditionalLogItem> getAdditionalLogItems();
+  List<AdditionalLogItem> getAdditionalLogItems();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java
index fcb29c4..10b68de 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationAddOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -63,7 +63,7 @@
    *
    * @return  The DN of the entry in a raw, unparsed form.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -76,7 +76,7 @@
    * @return  The set of attributes in their raw, unparsed form as
    *          read from the client request.
    */
-  public List<RawAttribute> getRawAttributes();
+  List<RawAttribute> getRawAttributes();
 
 
 
@@ -85,7 +85,7 @@
    *
    * @return  The DN of the entry to add.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -96,7 +96,7 @@
    *
    * @return  The set of processed objectclasses for the entry to add.
    */
-  public Map<ObjectClass,String> getObjectClasses();
+  Map<ObjectClass,String> getObjectClasses();
 
 
 
@@ -110,7 +110,7 @@
    * @param  objectClass  The objectclass to add to the entry.
    * @param  name         The name to use for the objectclass.
    */
-  public void addObjectClass(ObjectClass objectClass, String name);
+  void addObjectClass(ObjectClass objectClass, String name);
 
 
 
@@ -123,7 +123,7 @@
    *
    * @param  objectClass  The objectclass to remove from the entry.
    */
-  public void removeObjectClass(ObjectClass objectClass);
+  void removeObjectClass(ObjectClass objectClass);
 
 
 
@@ -135,7 +135,7 @@
    * @return  The set of processed user attributes for the entry to
    *          add.
    */
-  public Map<AttributeType,List<Attribute>> getUserAttributes();
+  Map<AttributeType,List<Attribute>> getUserAttributes();
 
 
 
@@ -147,8 +147,7 @@
    * @return  The set of processed operational attributes for the
    *          entry to add.
    */
-  public Map<AttributeType,List<Attribute>>
-              getOperationalAttributes();
+  Map<AttributeType, List<Attribute>> getOperationalAttributes();
 
 
 
@@ -164,8 +163,7 @@
    * @param  attributeList  The attribute list for the provided
    *                        attribute type.
    */
-  public void setAttribute(AttributeType attributeType,
-                           List<Attribute> attributeList);
+  void setAttribute(AttributeType attributeType, List<Attribute> attributeList);
 
 
 
@@ -179,7 +177,7 @@
    * @param  attributeType  The attribute tyep for the attribute to
    *                        remove.
    */
-  public void removeAttribute(AttributeType attributeType);
+  void removeAttribute(AttributeType attributeType);
 
 
 
@@ -189,6 +187,6 @@
    *
    * @return  The entry to be added to the server.
    */
-  public Entry getEntryToAdd();
+  Entry getEntryToAdd();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java
index b096d50..3f1997b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationBindOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessage;
@@ -54,7 +54,7 @@
    *
    * @return  The authentication type for this bind operation.
    */
-  public AuthenticationType getAuthenticationType();
+  AuthenticationType getAuthenticationType();
 
 
 
@@ -65,7 +65,7 @@
    * @return  A string representation of the protocol version
    *          associated with this bind request.
    */
-  public String getProtocolVersion();
+  String getProtocolVersion();
 
 
 
@@ -77,7 +77,7 @@
    * @return  The raw, unprocessed bind DN for this bind operation as
    *          contained in the client request.
    */
-  public ByteString getRawBindDN();
+  ByteString getRawBindDN();
 
 
 
@@ -86,7 +86,7 @@
    *
    * @return  The bind DN for this bind operation.
    */
-  public DN getBindDN();
+  DN getBindDN();
 
 
 
@@ -97,7 +97,7 @@
    * @return  The simple authentication password for this bind
    *          operation.
    */
-  public ByteString getSimplePassword();
+  ByteString getSimplePassword();
 
 
 
@@ -108,7 +108,7 @@
    *          <CODE>null</CODE> if the bind does not use SASL
    *          authentication.
    */
-  public String getSASLMechanism();
+  String getSASLMechanism();
 
 
 
@@ -119,7 +119,7 @@
    *          <CODE>null</CODE> if there are none or if the bind does
    *          not use SASL authentication.
    */
-  public ByteString getSASLCredentials();
+  ByteString getSASLCredentials();
 
 
 
@@ -130,8 +130,7 @@
    * @param  serverSASLCredentials  The set of server SASL credentials
    *                                to include in the bind response.
    */
-  public void setServerSASLCredentials(ByteString
-                                            serverSASLCredentials);
+  void setServerSASLCredentials(ByteString serverSASLCredentials);
 
 
 
@@ -141,7 +140,7 @@
    * @param  reason  A human-readable message providing the reason
    *                 that the authentication failed.
    */
-  public void setAuthFailureReason(LocalizableMessage reason);
+  void setAuthFailureReason(LocalizableMessage reason);
 
 
 
@@ -155,6 +154,6 @@
    *          progressed far enough to identify the user or if the
    *          user DN could not be determined.
    */
-  public DN getUserEntryDN();
+  DN getUserEntryDN();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java
index b101929..94fa900 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationCompareOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    *
    * @return  The DN of the entry to compare.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -74,7 +74,7 @@
    *
    * @return  The raw attribute type for this compare operation.
    */
-  public String getRawAttributeType();
+  String getRawAttributeType();
 
 
 
@@ -83,7 +83,7 @@
    *
    * @return  The attribute type for this compare operation.
    */
-  public AttributeType getAttributeType();
+  AttributeType getAttributeType();
 
 
 
@@ -92,7 +92,7 @@
    *
    * @return  The assertion value for this compare operation.
    */
-  public ByteString getAssertionValue();
+  ByteString getAssertionValue();
 
 
 
@@ -102,7 +102,7 @@
    * @param  assertionValue  The assertion value for this compare
    *                         operation.
    */
-  public void setAssertionValue(ByteString assertionValue);
+  void setAssertionValue(ByteString assertionValue);
 
 
 
@@ -111,6 +111,6 @@
    *
    * @return  The entry to target with the compare operation.
    */
-  public Entry getEntryToCompare();
+  Entry getEntryToCompare();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java
index 805c753..4bb6bbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationDeleteOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -55,7 +55,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -64,7 +64,7 @@
    *
    * @return  The DN of the entry to delete.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -73,6 +73,6 @@
    *
    * @return  The entry to be deleted.
    */
-  public Entry getEntryToDelete();
+  Entry getEntryToDelete();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java
index efce4db..3d59559 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -52,7 +52,7 @@
    * @return  The OID for the request associated with this extended
    *          operation.
    */
-  public String getRequestOID();
+  String getRequestOID();
 
 
 
@@ -63,7 +63,7 @@
    * @return  The value for the request associated with this extended
    *          operation.
    */
-  public ByteString getRequestValue();
+  ByteString getRequestValue();
 
 
 
@@ -73,7 +73,7 @@
    * @param  responseOID  The OID to include in the response to the
    *                      client.
    */
-  public void setResponseOID(String responseOID);
+  void setResponseOID(String responseOID);
 
 
 
@@ -83,6 +83,6 @@
    * @param  responseValue  The value to include in the response to
    *                        the client.
    */
-  public void setResponseValue(ByteString responseValue);
+  void setResponseValue(ByteString responseValue);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java
index 269e81e..bce4e6f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -60,7 +60,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -73,7 +73,7 @@
    * @return  The DN of the entry to rename, or <CODE>null</CODE> if
    *          the raw entry DN has not yet been processed.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -85,7 +85,7 @@
    * @return  The raw, unprocessed newRDN as included in the request
    *          from the client.
    */
-  public ByteString getRawNewRDN();
+  ByteString getRawNewRDN();
 
 
 
@@ -98,7 +98,7 @@
    * @return  The new RDN to use for the entry, or <CODE>null</CODE>
    *          if the raw newRDN has not yet been processed.
    */
-  public RDN getNewRDN();
+  RDN getNewRDN();
 
 
 
@@ -109,7 +109,7 @@
    * @return  <CODE>true</CODE> if the current RDN value should be
    *          removed from the entry, or <CODE>false</CODE> if not.
    */
-  public boolean deleteOldRDN();
+  boolean deleteOldRDN();
 
 
 
@@ -121,7 +121,7 @@
    * @return  The raw, unprocessed newSuperior from the client
    *          request, or <CODE>null</CODE> if there is none.
    */
-  public ByteString getRawNewSuperior();
+  ByteString getRawNewSuperior();
 
 
 
@@ -135,7 +135,7 @@
    *          if there is no newSuperior DN for this request or if the
    *          raw newSuperior has not yet been processed.
    */
-  public DN getNewSuperior();
+  DN getNewSuperior();
 
 
 
@@ -160,7 +160,7 @@
    *          <CODE>null</CODE> if that information is not yet
    *          available (e.g., during pre-parse plugins).
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -172,7 +172,7 @@
    * @param  modification  The modification to add to the set of
    *                       modifications to apply to the entry.
    */
-  public void addModification(Modification modification);
+  void addModification(Modification modification);
 
 
 
@@ -184,7 +184,7 @@
    * @return  The current entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getOriginalEntry();
+  Entry getOriginalEntry();
 
 
 
@@ -196,6 +196,6 @@
    * @return  The updated entry, or <CODE>null</CODE> if it is not yet
    *           available.
    */
-  public Entry getUpdatedEntry();
+  Entry getUpdatedEntry();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java
index 56497ae..7242114 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationModifyOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -57,7 +57,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -66,7 +66,7 @@
    *
    * @return  The DN of the entry to modify.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -80,7 +80,7 @@
    * @return  The set of raw, unprocessed modifications as included
    *          in the client request.
    */
-  public List<RawModification> getRawModifications();
+  List<RawModification> getRawModifications();
 
 
 
@@ -90,7 +90,7 @@
    *
    * @return  The set of modifications for this modify operation.
    */
-  public List<Modification> getModifications();
+  List<Modification> getModifications();
 
 
 
@@ -108,8 +108,7 @@
    *                              while applying the modification to
    *                              the entry.
    */
-  public void addModification(Modification modification)
-         throws DirectoryException;
+  void addModification(Modification modification) throws DirectoryException;
 
 
 
@@ -119,7 +118,7 @@
    *
    * @return  The current entry before any modifications are applied.
    */
-  public Entry getCurrentEntry();
+  Entry getCurrentEntry();
 
 
 
@@ -130,7 +129,7 @@
    *
    * @return  The modified entry that is to be written to the backend.
    */
-  public Entry getModifiedEntry();
+  Entry getModifiedEntry();
 
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java
index 8dd6451..afac136 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 import java.util.List;
@@ -58,7 +58,7 @@
    * @param  control  The control to add to the set of controls to
    *                  include in the response to the client.
    */
-  public void addResponseControl(Control control);
+  void addResponseControl(Control control);
 
 
 
@@ -69,7 +69,7 @@
    * @param  control  The control to remove from the set of controls
    *                  to include in the response to the client.
    */
-  public void removeResponseControl(Control control);
+  void removeResponseControl(Control control);
 
 
 
@@ -79,7 +79,7 @@
    *
    * @return  The error message for this operation.
    */
-  public LocalizableMessageBuilder getErrorMessage();
+  LocalizableMessageBuilder getErrorMessage();
 
 
 
@@ -88,7 +88,7 @@
    *
    * @param  errorMessage  The error message for this operation.
    */
-  public void setErrorMessage(LocalizableMessageBuilder errorMessage);
+  void setErrorMessage(LocalizableMessageBuilder errorMessage);
 
 
 
@@ -100,7 +100,7 @@
    * @param  message  The message to append to the error message
    *                  buffer.
    */
-  public void appendErrorMessage(LocalizableMessage message);
+  void appendErrorMessage(LocalizableMessage message);
 
 
 
@@ -115,7 +115,7 @@
    *
    * @return  The authorization DN for this operation.
    */
-  public DN getAuthorizationDN();
+  DN getAuthorizationDN();
 
 
 
@@ -127,7 +127,7 @@
    * @return An unmodifiable list containing the additional log items for this
    *         operation.
    */
-  public List<AdditionalLogItem> getAdditionalLogItems();
+  List<AdditionalLogItem> getAdditionalLogItems();
 
 
 
@@ -139,6 +139,6 @@
    * @param item
    *          The additional log item for this operation.
    */
-  public void addAdditionalLogItem(AdditionalLogItem item);
+  void addAdditionalLogItem(AdditionalLogItem item);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java
index 1b17f0b..b4af821 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreOperationSearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -61,7 +61,7 @@
    * @return  The raw, unprocessed base DN as included in the request
    *          from the client.
    */
-  public ByteString getRawBaseDN();
+  ByteString getRawBaseDN();
 
 
 
@@ -70,7 +70,7 @@
    *
    * @return  The base DN for this search operation.
    */
-  public DN getBaseDN();
+  DN getBaseDN();
 
 
 
@@ -79,7 +79,7 @@
    *
    * @return  The scope for this search operation.
    */
-  public SearchScope getScope();
+  SearchScope getScope();
 
 
 
@@ -90,7 +90,7 @@
    * @return  The alias dereferencing policy for this search
    *          operation.
    */
-  public DereferenceAliasesPolicy getDerefPolicy();
+  DereferenceAliasesPolicy getDerefPolicy();
 
 
 
@@ -99,7 +99,7 @@
    *
    * @return  The size limit for this search operation.
    */
-  public int getSizeLimit();
+  int getSizeLimit();
 
 
 
@@ -108,7 +108,7 @@
    *
    * @return  The time limit for this search operation.
    */
-  public int getTimeLimit();
+  int getTimeLimit();
 
 
 
@@ -117,7 +117,7 @@
    *
    * @return  The typesOnly flag for this search operation.
    */
-  public boolean getTypesOnly();
+  boolean getTypesOnly();
 
 
 
@@ -131,7 +131,7 @@
    * @return  The raw, unprocessed search filter as included in the
    *          request from the client.
    */
-  public RawFilter getRawFilter();
+  RawFilter getRawFilter();
 
 
 
@@ -140,7 +140,7 @@
    *
    * @return  The filter for this search operation.
    */
-  public SearchFilter getFilter();
+  SearchFilter getFilter();
 
 
 
@@ -151,7 +151,7 @@
    * @return  The set of requested attributes for this search
    *          operation.
    */
-  public Set<String> getAttributes();
+  Set<String> getAttributes();
 
 
 
@@ -169,7 +169,7 @@
    *          (e.g., the size limit has been reached or the search has
    *          been abandoned).
    */
-  public boolean returnEntry(Entry entry, List<Control> controls);
+  boolean returnEntry(Entry entry, List<Control> controls);
 
 
 
@@ -186,7 +186,6 @@
    *          (e.g., the size limit has been reached or the search has
    *          been abandoned).
    */
-  public boolean
-  returnReference(DN dn ,SearchResultReference reference);
+  boolean returnReference(DN dn ,SearchResultReference reference);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java
index 19bca14..d6d8d61 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAbandonOperation.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -48,6 +49,6 @@
    * @return  The message ID of the operation that should be
    *          abandoned.
    */
-  public int getIDToAbandon();
+  int getIDToAbandon();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java
index a9e61dc..a54c22b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseAddOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    *
    * @return  The DN of the entry in a raw, unparsed form.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -65,7 +65,7 @@
    *
    * @param  rawEntryDN  The raw entry DN for the entry to add.
    */
-  public void setRawEntryDN(ByteString rawEntryDN);
+  void setRawEntryDN(ByteString rawEntryDN);
 
 
 
@@ -78,7 +78,7 @@
    * @return  The set of attributes in their raw, unparsed form as
    *          read from the client request.
    */
-  public List<RawAttribute> getRawAttributes();
+  List<RawAttribute> getRawAttributes();
 
 
 
@@ -89,7 +89,7 @@
    * @param  rawAttribute  The attribute to add to the set of raw
    *                       attributes for this add operation.
    */
-  public void addRawAttribute(RawAttribute rawAttribute);
+  void addRawAttribute(RawAttribute rawAttribute);
 
 
 
@@ -99,6 +99,6 @@
    * @param  rawAttributes  The set of raw attributes for this add
    *                        operation.
    */
-  public void setRawAttributes(List<RawAttribute> rawAttributes);
+  void setRawAttributes(List<RawAttribute> rawAttributes);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java
index f3a9a7f..cd94c31 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseBindOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 import org.forgerock.i18n.LocalizableMessage;
@@ -52,7 +52,7 @@
    *
    * @return  The authentication type for this bind operation.
    */
-  public AuthenticationType getAuthenticationType();
+  AuthenticationType getAuthenticationType();
 
 
 
@@ -63,7 +63,7 @@
    * @return  A string representation of the protocol version
    *          associated with this bind request.
    */
-  public String getProtocolVersion();
+  String getProtocolVersion();
 
 
 
@@ -75,7 +75,7 @@
    *                          protocol version associated with this
    *                          bind request.
    */
-  public void setProtocolVersion(String protocolVersion);
+  void setProtocolVersion(String protocolVersion);
 
 
 
@@ -87,7 +87,7 @@
    * @return  The raw, unprocessed bind DN for this bind operation as
    *          contained in the client request.
    */
-  public ByteString getRawBindDN();
+  ByteString getRawBindDN();
 
 
 
@@ -96,7 +96,7 @@
    *
    * @param  rawBindDN  The raw, unprocessed bind DN for this bind
    */
-  public void setRawBindDN(ByteString rawBindDN);
+  void setRawBindDN(ByteString rawBindDN);
 
 
 
@@ -107,7 +107,7 @@
    * @return  The simple authentication password for this bind
    *          operation.
    */
-  public ByteString getSimplePassword();
+  ByteString getSimplePassword();
 
 
 
@@ -118,7 +118,7 @@
    * @param  simplePassword  The simple authentication password for
    *                         this bind operation.
    */
-  public void setSimplePassword(ByteString simplePassword);
+  void setSimplePassword(ByteString simplePassword);
 
 
 
@@ -129,7 +129,7 @@
    *          <CODE>null</CODE> if the bind does not use SASL
    *          authentication.
    */
-  public String getSASLMechanism();
+  String getSASLMechanism();
 
 
 
@@ -140,7 +140,7 @@
    *          <CODE>null</CODE> if there are none or if the bind does
    *          not use SASL authentication.
    */
-  public ByteString getSASLCredentials();
+  ByteString getSASLCredentials();
 
 
 
@@ -153,8 +153,7 @@
    *                          operation, or <CODE>null</CODE> if there
    *                          are none.
    */
-  public void setSASLCredentials(String saslMechanism,
-                                 ByteString saslCredentials);
+  void setSASLCredentials(String saslMechanism, ByteString saslCredentials);
 
 
 
@@ -165,8 +164,7 @@
    * @param  serverSASLCredentials  The set of server SASL credentials
    *                                to include in the bind response.
    */
-  public void setServerSASLCredentials(ByteString
-                                            serverSASLCredentials);
+  void setServerSASLCredentials(ByteString serverSASLCredentials);
 
 
 
@@ -176,6 +174,6 @@
    * @param  reason  A human-readable message providing the reason
    *                 that the authentication failed.
    */
-  public void setAuthFailureReason(LocalizableMessage reason);
+  void setAuthFailureReason(LocalizableMessage reason);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java
index a3dcefb..628df34 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseCompareOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -52,7 +52,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -62,7 +62,7 @@
    *
    * @param  rawEntryDN  The raw entry DN for this compare operation.
    */
-  public void setRawEntryDN(ByteString rawEntryDN);
+  void setRawEntryDN(ByteString rawEntryDN);
 
 
 
@@ -71,7 +71,7 @@
    *
    * @return  The raw attribute type for this compare operation.
    */
-  public String getRawAttributeType();
+  String getRawAttributeType();
 
 
 
@@ -81,7 +81,7 @@
    * @param  rawAttributeType  The raw attribute type for this compare
    *                           operation.
    */
-  public void setRawAttributeType(String rawAttributeType);
+  void setRawAttributeType(String rawAttributeType);
 
 
 
@@ -90,7 +90,7 @@
    *
    * @return  The assertion value for this compare operation.
    */
-  public ByteString getAssertionValue();
+  ByteString getAssertionValue();
 
 
 
@@ -100,6 +100,6 @@
    * @param  assertionValue  The assertion value for this compare
    *                         operation.
    */
-  public void setAssertionValue(ByteString assertionValue);
+  void setAssertionValue(ByteString assertionValue);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java
index d6879ad..874133a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseDeleteOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -52,7 +52,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -63,6 +63,6 @@
    * @param  rawEntryDN  The raw, unprocessed entry DN for this delete
    *                     operation.
    */
-  public void setRawEntryDN(ByteString rawEntryDN);
+  void setRawEntryDN(ByteString rawEntryDN);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java
index 11a6cce..0dcc788 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -52,7 +52,7 @@
    * @return  The OID for the request associated with this extended
    *          operation.
    */
-  public String getRequestOID();
+  String getRequestOID();
 
 
 
@@ -63,7 +63,7 @@
    * @param  requestOID  The OID for the request associated with this
    *                     extended operation.
    */
-  public void setRequestOID(String requestOID);
+  void setRequestOID(String requestOID);
 
 
 
@@ -74,7 +74,7 @@
    * @return  The value for the request associated with this extended
    *          operation.
    */
-  public ByteString getRequestValue();
+  ByteString getRequestValue();
 
 
 
@@ -85,7 +85,7 @@
    * @param  requestValue  The value for the request associated with
    *                       this extended operation.
    */
-  public void setRequestValue(ByteString requestValue);
+  void setRequestValue(ByteString requestValue);
 
 
 
@@ -95,7 +95,7 @@
    * @param  responseOID  The OID to include in the response to the
    *                      client.
    */
-  public void setResponseOID(String responseOID);
+  void setResponseOID(String responseOID);
 
 
 
@@ -105,6 +105,6 @@
    * @param  responseValue  The value to include in the response to
    *                        the client.
    */
-  public void setResponseValue(ByteString responseValue);
+  void setResponseValue(ByteString responseValue);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java
index 036d1d9..8b93d33 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -53,7 +53,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -64,7 +64,7 @@
    * @param  rawEntryDN  The raw, unprocessed entry DN as included in
    *                     the client request.
    */
-  public void setRawEntryDN(ByteString rawEntryDN);
+  void setRawEntryDN(ByteString rawEntryDN);
 
 
 
@@ -76,7 +76,7 @@
    * @return  The raw, unprocessed newRDN as included in the request
    *          from the client.
    */
-  public ByteString getRawNewRDN();
+  ByteString getRawNewRDN();
 
 
 
@@ -88,7 +88,7 @@
    * @param  rawNewRDN  The raw, unprocessed newRDN as included in the
    *                    request from the client.
    */
-  public void setRawNewRDN(ByteString rawNewRDN);
+  void setRawNewRDN(ByteString rawNewRDN);
 
 
 
@@ -99,7 +99,7 @@
    * @return  <CODE>true</CODE> if the current RDN value should be
    *          removed from the entry, or <CODE>false</CODE> if not.
    */
-  public boolean deleteOldRDN();
+  boolean deleteOldRDN();
 
 
 
@@ -110,7 +110,7 @@
    * @param  deleteOldRDN  Specifies whether the current RDN value
    *                       should be removed from the entry.
    */
-  public void setDeleteOldRDN(boolean deleteOldRDN);
+  void setDeleteOldRDN(boolean deleteOldRDN);
 
 
 
@@ -122,7 +122,7 @@
    * @return  The raw, unprocessed newSuperior from the client
    *          request, or <CODE>null</CODE> if there is none.
    */
-  public ByteString getRawNewSuperior();
+  ByteString getRawNewSuperior();
 
 
 
@@ -134,6 +134,6 @@
    * @param  rawNewSuperior  The raw, unprocessed newSuperior as
    *                         provided in the request from the client.
    */
-  public void setRawNewSuperior(ByteString rawNewSuperior);
+  void setRawNewSuperior(ByteString rawNewSuperior);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java
index fd4e5a1..1e2bab5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseModifyOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -67,7 +67,7 @@
    * @param  rawEntryDN  The raw, unprocessed entry DN as included in
    *                     the client request.
    */
-  public void setRawEntryDN(ByteString rawEntryDN);
+  void setRawEntryDN(ByteString rawEntryDN);
 
 
 
@@ -81,7 +81,7 @@
    * @return  The set of raw, unprocessed modifications as included
    *          in the client request.
    */
-  public List<RawModification> getRawModifications();
+  List<RawModification> getRawModifications();
 
 
 
@@ -93,7 +93,7 @@
    *                          raw modifications for this modify
    *                          operation.
    */
-  public void addRawModification(RawModification rawModification);
+  void addRawModification(RawModification rawModification);
 
 
 
@@ -103,7 +103,5 @@
    * @param  rawModifications  The raw modifications for this modify
    *                           operation.
    */
-  public void setRawModifications(
-                   List<RawModification> rawModifications);
+  void setRawModifications(List<RawModification> rawModifications);
 }
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java
index 7e3016a..4be66bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -54,7 +54,7 @@
    * @param  control  The control to add to the set of request
    *                  controls for this operation.
    */
-  public void addRequestControl(Control control);
+  void addRequestControl(Control control);
 
 
 
@@ -65,7 +65,7 @@
    * @param  control  The control to add to the set of controls to
    *                  include in the response to the client.
    */
-  public void addResponseControl(Control control);
+  void addResponseControl(Control control);
 
 
 
@@ -76,7 +76,7 @@
    * @param  control  The control to remove from the set of controls
    *                  to include in the response to the client.
    */
-  public void removeResponseControl(Control control);
+  void removeResponseControl(Control control);
 
 
 
@@ -86,7 +86,7 @@
    *
    * @return  The error message for this operation.
    */
-  public LocalizableMessageBuilder getErrorMessage();
+  LocalizableMessageBuilder getErrorMessage();
 
 
 
@@ -95,7 +95,7 @@
    *
    * @param  errorMessage  The error message for this operation.
    */
-  public void setErrorMessage(LocalizableMessageBuilder errorMessage);
+  void setErrorMessage(LocalizableMessageBuilder errorMessage);
 
 
 
@@ -107,7 +107,7 @@
    * @param  message  The message to append to the error message
    *                  buffer.
    */
-  public void appendErrorMessage(LocalizableMessage message);
+  void appendErrorMessage(LocalizableMessage message);
 
 
 
@@ -119,7 +119,7 @@
    * @return An unmodifiable list containing the additional log items for this
    *         operation.
    */
-  public List<AdditionalLogItem> getAdditionalLogItems();
+  List<AdditionalLogItem> getAdditionalLogItems();
 
 
 
@@ -131,6 +131,6 @@
    * @param item
    *          The additional log item for this operation.
    */
-  public void addAdditionalLogItem(AdditionalLogItem item);
+  void addAdditionalLogItem(AdditionalLogItem item);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java
index 4c5c56d..805c652 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/PreParseSearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -56,7 +56,7 @@
    * @return  The raw, unprocessed base DN as included in the request
    *          from the client.
    */
-  public ByteString getRawBaseDN();
+  ByteString getRawBaseDN();
 
 
 
@@ -66,7 +66,7 @@
    * @param  rawBaseDN  The raw, unprocessed base DN for this search
                         operation.
    */
-  public void setRawBaseDN(ByteString rawBaseDN);
+  void setRawBaseDN(ByteString rawBaseDN);
 
 
 
@@ -75,7 +75,7 @@
    *
    * @return  The scope for this search operation.
    */
-  public SearchScope getScope();
+  SearchScope getScope();
 
 
 
@@ -84,7 +84,7 @@
    *
    * @param  scope  The scope for this search operation.
    */
-  public void setScope(SearchScope scope);
+  void setScope(SearchScope scope);
 
 
 
@@ -95,7 +95,7 @@
    * @return  The alias dereferencing policy for this search
    *          operation.
    */
-  public DereferenceAliasesPolicy getDerefPolicy();
+  DereferenceAliasesPolicy getDerefPolicy();
 
 
 
@@ -106,7 +106,7 @@
    * @param  derefPolicy  The alias dereferencing policy for this
    *                      search operation.
    */
-  public void setDerefPolicy(DereferenceAliasesPolicy derefPolicy);
+  void setDerefPolicy(DereferenceAliasesPolicy derefPolicy);
 
 
 
@@ -115,7 +115,7 @@
    *
    * @return  The size limit for this search operation.
    */
-  public int getSizeLimit();
+  int getSizeLimit();
 
 
 
@@ -124,7 +124,7 @@
    *
    * @param  sizeLimit  The size limit for this search operation.
    */
-  public void setSizeLimit(int sizeLimit);
+  void setSizeLimit(int sizeLimit);
 
 
 
@@ -133,7 +133,7 @@
    *
    * @return  The time limit for this search operation.
    */
-  public int getTimeLimit();
+  int getTimeLimit();
 
 
 
@@ -142,7 +142,7 @@
    *
    * @param  timeLimit  The time limit for this search operation.
    */
-  public void setTimeLimit(int timeLimit);
+  void setTimeLimit(int timeLimit);
 
 
 
@@ -151,7 +151,7 @@
    *
    * @return  The typesOnly flag for this search operation.
    */
-  public boolean getTypesOnly();
+  boolean getTypesOnly();
 
 
 
@@ -160,7 +160,7 @@
    *
    * @param  typesOnly  The typesOnly flag for this search operation.
    */
-  public void setTypesOnly(boolean typesOnly);
+  void setTypesOnly(boolean typesOnly);
 
 
 
@@ -174,7 +174,7 @@
    * @return  The raw, unprocessed search filter as included in the
    *          request from the client.
    */
-  public RawFilter getRawFilter();
+  RawFilter getRawFilter();
 
 
 
@@ -184,7 +184,7 @@
    *
    * @param  rawFilter  The raw, unprocessed search filter.
    */
-  public void setRawFilter(RawFilter rawFilter);
+  void setRawFilter(RawFilter rawFilter);
 
 
 
@@ -195,7 +195,7 @@
    * @return  The set of requested attributes for this search
    *          operation.
    */
-  public Set<String> getAttributes();
+  Set<String> getAttributes();
 
 
 
@@ -206,7 +206,7 @@
    * @param  attributes  The set of requested attributes for this
    *                     search operation.
    */
-  public void setAttributes(Set<String> attributes);
+  void setAttributes(Set<String> attributes);
 
 
 
@@ -224,7 +224,7 @@
    *          (e.g., the size limit has been reached or the search has
    *          been abandoned).
    */
-  public boolean returnEntry(Entry entry, List<Control> controls);
+  boolean returnEntry(Entry entry, List<Control> controls);
 
 
 
@@ -232,16 +232,13 @@
    * Returns the provided search result reference to the client.
    *
    * @param  reference  The search reference that should be returned.
-   * @param  dn         A DN related to the specified search
-   *                    reference.
-   *
+   * @param  dn         A DN related to the specified search reference.
    * @return  {@code true} if the caller should continue processing
    *          the search request and sending additional entries and
    *          references, or {@code false} if not for some reason
    *          (e.g., the size limit has been reached or the search has
    *          been abandoned).
    */
-  public boolean
-  returnReference(DN dn, SearchResultReference reference);
+  boolean returnReference(DN dn, SearchResultReference reference);
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java
index 88d3904..2a916d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchEntrySearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -57,7 +57,7 @@
    * @return  The raw, unprocessed base DN as included in the request
    *          from the client.
    */
-  public ByteString getRawBaseDN();
+  ByteString getRawBaseDN();
 
 
 
@@ -66,7 +66,7 @@
    *
    * @return  The base DN for this search operation.
    */
-  public DN getBaseDN();
+  DN getBaseDN();
 
 
 
@@ -75,7 +75,7 @@
    *
    * @return  The scope for this search operation.
    */
-  public SearchScope getScope();
+  SearchScope getScope();
 
 
 
@@ -86,7 +86,7 @@
    * @return  The alias dereferencing policy for this search
    *          operation.
    */
-  public DereferenceAliasesPolicy getDerefPolicy();
+  DereferenceAliasesPolicy getDerefPolicy();
 
 
 
@@ -95,7 +95,7 @@
    *
    * @return  The size limit for this search operation.
    */
-  public int getSizeLimit();
+  int getSizeLimit();
 
 
 
@@ -104,7 +104,7 @@
    *
    * @return  The time limit for this search operation.
    */
-  public int getTimeLimit();
+  int getTimeLimit();
 
 
 
@@ -113,7 +113,7 @@
    *
    * @return  The typesOnly flag for this search operation.
    */
-  public boolean getTypesOnly();
+  boolean getTypesOnly();
 
 
 
@@ -127,7 +127,7 @@
    * @return  The raw, unprocessed search filter as included in the
    *          request from the client.
    */
-  public RawFilter getRawFilter();
+  RawFilter getRawFilter();
 
 
 
@@ -136,7 +136,7 @@
    *
    * @return  The filter for this search operation.
    */
-  public SearchFilter getFilter();
+  SearchFilter getFilter();
 
 
 
@@ -147,6 +147,6 @@
    * @return  The set of requested attributes for this search
    *          operation.
    */
-  public Set<String> getAttributes();
+  Set<String> getAttributes();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java
index ec8454a..6d846be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SearchReferenceSearchOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.types.operation;
 
@@ -57,7 +57,7 @@
    * @return  The raw, unprocessed base DN as included in the request
    *          from the client.
    */
-  public ByteString getRawBaseDN();
+  ByteString getRawBaseDN();
 
 
 
@@ -66,7 +66,7 @@
    *
    * @return  The base DN for this search operation.
    */
-  public DN getBaseDN();
+  DN getBaseDN();
 
 
 
@@ -75,7 +75,7 @@
    *
    * @return  The scope for this search operation.
    */
-  public SearchScope getScope();
+  SearchScope getScope();
 
 
 
@@ -86,7 +86,7 @@
    * @return  The alias dereferencing policy for this search
    *          operation.
    */
-  public DereferenceAliasesPolicy getDerefPolicy();
+  DereferenceAliasesPolicy getDerefPolicy();
 
 
 
@@ -95,7 +95,7 @@
    *
    * @return  The size limit for this search operation.
    */
-  public int getSizeLimit();
+  int getSizeLimit();
 
 
 
@@ -104,7 +104,7 @@
    *
    * @return  The time limit for this search operation.
    */
-  public int getTimeLimit();
+  int getTimeLimit();
 
 
 
@@ -113,7 +113,7 @@
    *
    * @return  The typesOnly flag for this search operation.
    */
-  public boolean getTypesOnly();
+  boolean getTypesOnly();
 
 
 
@@ -127,7 +127,7 @@
    * @return  The raw, unprocessed search filter as included in the
    *          request from the client.
    */
-  public RawFilter getRawFilter();
+  RawFilter getRawFilter();
 
 
 
@@ -136,7 +136,7 @@
    *
    * @return  The filter for this search operation.
    */
-  public SearchFilter getFilter();
+  SearchFilter getFilter();
 
 
 
@@ -147,6 +147,6 @@
    * @return  The set of requested attributes for this search
    *          operation.
    */
-  public Set<String> getAttributes();
+  Set<String> getAttributes();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java
index 48a4eb2..6853574 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/operation/SubordinateModifyDNOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.types.operation;
 
@@ -54,7 +54,7 @@
    * @return  The raw, unprocessed entry DN as included in the client
    *          request.
    */
-  public ByteString getRawEntryDN();
+  ByteString getRawEntryDN();
 
 
 
@@ -67,7 +67,7 @@
    * @return  The DN of the entry to rename, or {@code null} if the
    *          raw entry DN has not yet been processed.
    */
-  public DN getEntryDN();
+  DN getEntryDN();
 
 
 
@@ -79,7 +79,7 @@
    * @return  The raw, unprocessed newRDN as included in the request
    *          from the client.
    */
-  public ByteString getRawNewRDN();
+  ByteString getRawNewRDN();
 
 
 
@@ -92,7 +92,7 @@
    * @return  The new RDN to use for the entry, or {@code null} if the
    *          raw newRDN has not yet been processed.
    */
-  public RDN getNewRDN();
+  RDN getNewRDN();
 
 
 
@@ -103,7 +103,7 @@
    * @return  {@code true} if the current RDN value should be removed
    *          from the entry, or {@code false} if not.
    */
-  public boolean deleteOldRDN();
+  boolean deleteOldRDN();
 
 
 
@@ -115,7 +115,7 @@
    * @return  The raw, unprocessed newSuperior from the client
    *          request, or {@code null} if there is none.
    */
-  public ByteString getRawNewSuperior();
+  ByteString getRawNewSuperior();
 
 
 
@@ -129,7 +129,7 @@
    *          there is no newSuperior DN for this request or if the
    *          raw newSuperior has not yet been processed.
    */
-  public DN getNewSuperior();
+  DN getNewSuperior();
 
 
 
@@ -141,7 +141,7 @@
    * @return  The current entry, or {@code null} if it is not yet
    *           available.
    */
-  public Entry getOriginalEntry();
+  Entry getOriginalEntry();
 
 
 
@@ -153,6 +153,6 @@
    * @return  The updated entry, or {@code null} if it is not yet
    *           available.
    */
-  public Entry getUpdatedEntry();
+  Entry getUpdatedEntry();
 }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
index e48d8cd..aae0d05 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/BSDMD5Crypt.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- * Portions Copyright 2010-2014 ForgeRock AS
+ * Portions Copyright 2010-2015 ForgeRock AS
  *
  * BSD-compatible md5 password crypt
  * Ported to Java from C based on crypt-md5.c by Poul-Henning Kamp,
@@ -50,9 +50,9 @@
  */
 public final class BSDMD5Crypt {
 
-  private final static String magic = "$1$";
-  private final static int saltLength = 8;
-  private final static String itoa64 =
+  private static final String magic = "$1$";
+  private static final int saltLength = 8;
+  private static final String itoa64 =
           "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 
   private static String intTo64(int value, int length)
@@ -79,7 +79,7 @@
    * @throws NoSuchAlgorithmException If the MD5 algorithm is not supported.
    *
    */
-  static public String crypt(ByteSequence password)
+  public static String crypt(ByteSequence password)
           throws NoSuchAlgorithmException
   {
     SecureRandom randomGenerator = new SecureRandom();
@@ -109,7 +109,7 @@
    * @throws NoSuchAlgorithmException If the MD5 algorithm is not supported.
    *
    */
-  static public String crypt(ByteSequence password, String salt)
+  public static String crypt(ByteSequence password, String salt)
           throws NoSuchAlgorithmException
   {
     MessageDigest ctx, ctx1;
@@ -250,7 +250,7 @@
    *
    * @return the magic string for this crypt algorithm
    */
-  static public String getMagicString()
+  public static String getMagicString()
   {
     return magic;
   }
@@ -261,7 +261,7 @@
    * @param argv The array of test arguments
    *
    */
-  static public void main(String argv[])
+  public static void main(String argv[])
   {
     if ((argv.length < 1) || (argv.length > 2))
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
index b45c154..c7cab58 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 
 package org.opends.server.util;
@@ -85,7 +85,7 @@
   /**
    * Platform base class. Performs all of the certificate management functions.
    */
-  private abstract static class PlatformIMPL
+  private static abstract class PlatformIMPL
   {
 
     // Key size, key algorithm and signature algorithms used.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index be251d6..f9de846 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -3474,7 +3474,7 @@
    *                     indicates that the file is in use by this or another
    *                     application.
    */
-  static public void renameFile(File fileToRename, File target)
+  public static void renameFile(File fileToRename, File target)
           throws IOException {
     if (fileToRename != null && target != null)
     {
@@ -3792,7 +3792,7 @@
    * @throws ParseException if there was a problem converting the string to
    *         a <code>Date</code>.
    */
-  static public Date parseDateTimeString(String timeStr) throws ParseException
+  public static Date parseDateTimeString(String timeStr) throws ParseException
   {
     Date dateTime = null;
     if (timeStr != null)
@@ -3834,7 +3834,7 @@
    * @param date to format; null if <code>date</code> is null
    * @return string representation of the date
    */
-  static public String formatDateTimeString(Date date)
+  public static String formatDateTimeString(Date date)
   {
     String timeStr = null;
     if (date != null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java b/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
index c1d26b7..d63090b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
@@ -477,7 +477,7 @@
   /**
    * Container for registered issues.
    */
-  static private final Set<VersionCompatibilityIssue>
+  private static final Set<VersionCompatibilityIssue>
           VERSION_COMPATIBILITY_ISSUES =
           new HashSet<VersionCompatibilityIssue>();
 
@@ -511,7 +511,7 @@
     register(Cause.BERKLEY_UPGRADE_1, new BuildVersion(0, 1, 0, 890));
   }
 
-  static private void register(Cause cause,
+  private static void register(Cause cause,
                                BuildVersion version) {
     VERSION_COMPATIBILITY_ISSUES.add(new VersionCompatibilityIssue(cause,
             version));
@@ -523,7 +523,7 @@
    * @return list of issues sorted by build version in which
    *         they appear
    */
-  static public List<VersionCompatibilityIssue> getAllEvents() {
+  public static List<VersionCompatibilityIssue> getAllEvents() {
     List<VersionCompatibilityIssue> issueList =
             new ArrayList<VersionCompatibilityIssue>
                     (VERSION_COMPATIBILITY_ISSUES);
@@ -543,7 +543,7 @@
    * @return list of issues sorted by build version in which
    *         they appear
    */
-  static public List<VersionCompatibilityIssue> getEvents(
+  public static List<VersionCompatibilityIssue> getEvents(
           Collection<Integer> excludeIds, BuildInformation current,
           BuildInformation neu)
   {
@@ -581,7 +581,7 @@
    * @param from build from which events will be returned
    * @return List or IncompatibleVersionEvent objects
    */
-  static public List<VersionCompatibilityIssue> getEvents(BuildVersion from) {
+  public static List<VersionCompatibilityIssue> getEvents(BuildVersion from) {
     List<VersionCompatibilityIssue> issueList =
             new ArrayList<VersionCompatibilityIssue>();
     for (VersionCompatibilityIssue evt : VERSION_COMPATIBILITY_ISSUES) {
@@ -598,7 +598,7 @@
    * Comparator used to sort issues by the build version for
    * which they apply.
    */
-  static private final Comparator<VersionCompatibilityIssue>
+  private static final Comparator<VersionCompatibilityIssue>
           VERSION_COMPARATOR = new Comparator<VersionCompatibilityIssue>()
   {
     @Override
diff --git a/opendj-server-legacy/src/messages/src/org/opends/messages/Category.java b/opendj-server-legacy/src/messages/src/org/opends/messages/Category.java
index 0b34bce..0a5083c 100644
--- a/opendj-server-legacy/src/messages/src/org/opends/messages/Category.java
+++ b/opendj-server-legacy/src/messages/src/org/opends/messages/Category.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2007-2009 Sun Microsystems, Inc.
- *      Portions copyright 2011-2012 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 
 package org.opends.messages;
@@ -174,7 +174,7 @@
    */
   USER_DEFINED(0x7FF00000);
 
-  static private Map<Integer,Category> MASK_VALUE_MAP;
+  private static Map<Integer,Category> MASK_VALUE_MAP;
 
   static {
     MASK_VALUE_MAP = new HashMap<Integer,Category>();
@@ -187,9 +187,9 @@
    * Obtains the <code>Severity</code> associated with the the input
    * message ID <code>msgId</code>.
    * @param msgId int message ID
-   * @return Severity assocated with the ID
+   * @return Severity associated with the ID
    */
-  static public Category parseMessageId(int msgId) {
+  public static Category parseMessageId(int msgId) {
     return Category.parseMask(msgId & 0xFFF00000);
   }
 
@@ -199,7 +199,7 @@
    * @param mask for which a <code>Severity</code> is obtained.
    * @return Severity associated with <code>mask</code>
    */
-  static public Category parseMask(int mask) {
+  public static Category parseMask(int mask) {
     return MASK_VALUE_MAP.get(mask);
   }
 
diff --git a/opendj-server-legacy/src/messages/src/org/opends/messages/Severity.java b/opendj-server-legacy/src/messages/src/org/opends/messages/Severity.java
index d8fbe0d..71195e8 100644
--- a/opendj-server-legacy/src/messages/src/org/opends/messages/Severity.java
+++ b/opendj-server-legacy/src/messages/src/org/opends/messages/Severity.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.messages;
@@ -72,9 +72,9 @@
    */
   NOTICE("NOTE");
 
-  static private Set<String> PROPERTY_KEY_FORM_VALUES_SET;
+  private static Set<String> PROPERTY_KEY_FORM_VALUES_SET;
 
-  static private Map<String,Severity> PROPERTY_KEY_FORM_MAP;
+  private static Map<String,Severity> PROPERTY_KEY_FORM_MAP;
 
   static {
     PROPERTY_KEY_FORM_MAP = new HashMap<String,Severity>();
@@ -90,7 +90,7 @@
    * abbreviated representations.
    * @return set of messageDescriptorForm strings
    */
-  static public Set<String> getPropertyKeyFormSet() {
+  public static Set<String> getPropertyKeyFormSet() {
     return Collections.unmodifiableSet(PROPERTY_KEY_FORM_VALUES_SET);
   }
 
@@ -99,9 +99,9 @@
    * string <code>s</code> which can either be a severity's name
    * or messageDescriptorForm.
    * @param s Severity name or messageDescriptorForm
-   * @return Severity assocated with <code>s</code>
+   * @return Severity associated with <code>s</code>
    */
-  static public Severity parseString(String s) {
+  public static Severity parseString(String s) {
     Severity sev = PROPERTY_KEY_FORM_MAP.get(s);
     if (sev == null) {
       sev = valueOf(s);

--
Gitblit v1.10.0