From 2a3158aad80fc910b83336485b3e545dea50066c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Apr 2016 09:23:30 +0000
Subject: [PATCH] guitools + quicksetup: added @Override + Autorefactor'ed comments

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java                         |   12 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java                                      |   18 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java                           |   31 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackendPopulatedListener.java                   |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java                      |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java                           |   17 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java                              |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java                              |   74 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java                      |  159 -
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/OutputReader.java                                           |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java                        |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java              |   43 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java                                    |   10 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java                       |   16 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java                      |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java                   |   17 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java                                       |   16 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java                            |   12 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java                 |   12 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java                 |   13 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Launcher.java                                                    |   27 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java                       |   44 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java                       |   22 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java                           |   22 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java                            |   18 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java                      |    7 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java                                  |   23 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java                            |   21 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java                               |   29 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java                       |   30 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java            |   95 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java                             |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java                        |   34 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java              |   10 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java                                          |   43 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java                                            |    8 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java                                       |   22 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java                   |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java                |   28 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java                            |   27 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java               |   30 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java                                   |   67 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DatabaseMonitoringTableModel.java           |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java                   |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java                     |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java                            |   26 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java                           |   50 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java                         |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java                             |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java                                |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedListener.java                      |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java                           |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java                                   |   11 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java                                |   16 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java                    |   34 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java                        |   24 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java        |   18 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java                                   |  147 -
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java                                    |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java                 |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java                    |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java                                    |   19 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java                             |    5 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java                                                    |   14 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java                         |  120 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java                                  |   23 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java                                             |    9 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java                          |    8 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java                                              |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java                    |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java              |   51 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java                       |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java                           |   12 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java                                                |   47 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java                                    |   17 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java                      |   24 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java                                            |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java                      |   21 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java                              |    6 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java                                             |   35 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java               |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java               |   12 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java                   |    9 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java                             |   25 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java                 |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java    |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java                                |   66 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java                                   |   16 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java                       |   54 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java              |  208 -
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java                     |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java                             |   19 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java                                     |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java                                 |   18 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java                   |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java                         |   16 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java                           |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java                   |   10 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java                                         |   13 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java                            |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java                              |   23 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java                                           |   24 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java                                 |   29 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java                    |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java                    |   45 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java                          |   35 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java                                |   21 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java                           |   41 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java                               |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java             |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java   |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java                                   |   24 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java                   |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java               |    2 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java  |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java                                             |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java                        |   28 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java                                                  |   29 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java                                |   22 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java                        |    7 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java                                               |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelLauncher.java                             |   39 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java        |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java                |   22 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java                                   |   11 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java                                        |   10 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java                                               |    8 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java                                            |   28 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java                                          |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java                     |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java                            |   17 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java          |   10 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java                    |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java                        |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java                                  |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java                               |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java                      |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java                              |   18 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java                      |   19 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java                  |   39 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java        |   39 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java                       |   16 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java                   |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java                       |   19 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java                     |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java                                   |   21 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java                |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java                          |   19 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java                       |   28 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java                                 |   18 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java                           |   10 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/UIFactory.java                                                |   97 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java                               |   75 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java                           |   16 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java             |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java                        |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java                               |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java                     |   21 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java                  |    5 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java                        |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java                          |   53 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java               |   15 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java                            |   19 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java                       |    6 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java                                   |    9 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java                        |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java                   |   12 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java               |   30 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java                         |  125 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java                           |   24 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java                                    |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java                               |   19 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java                                                |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java                           |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java                       |   87 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java                             |   12 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java                    |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java                                  |   52 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java                            |  107 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java                                   |   33 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java                  |    9 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java                                               |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java                      |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java                         |   20 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java                                         |    5 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java                               |   37 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowserEventListener.java                       |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java                          |   27 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java            |    3 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java                         |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java                 |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java                              |   32 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java                 |   34 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java                                                  |   87 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java                                              |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java                                               |   15 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java                                      |   26 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java                        |   38 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java                              |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java                               |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java                              |   26 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java                         |    7 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java                       |    2 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java                                |   67 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java               |   21 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java            |    3 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java                            |   26 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java                       |    9 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java                                     |   24 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java                    |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java                      |    5 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java                  |   33 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java                     |   20 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java                            |   11 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java                          |   21 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java                 |    9 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java                       |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java                                 |   46 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java                                                 |   40 
 opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java                                    |   51 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java                |   27 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java                                     |    5 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java                   |   13 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java                             |   22 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java                        |   26 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java                                         |   81 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java                   |   33 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java                    |    5 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java                                  |   27 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java                    |   15 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java                         |    3 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java                                                 |   80 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java                          |   24 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java                        |   35 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java              |   21 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java                         |    9 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java                               |   28 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java                             |    6 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java        |    7 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java                                                        |    9 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java                 |    8 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java                                |   23 
 244 files changed, 1,855 insertions(+), 3,877 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
index 41c52e1..32465f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationKeyManager.java
@@ -13,9 +13,8 @@
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
  * Portions Copyright 2009 Parametric Technology Corporation (PTC)
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
-
 package org.opends.admin.ads.util;
 
 import java.net.Socket;
@@ -28,17 +27,15 @@
 import java.security.UnrecoverableKeyException;
 import java.security.cert.X509Certificate;
 
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509KeyManager;
 
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.opends.server.util.Platform;
 
-
 /**
  * This class is in charge of checking whether the certificates that are
  * presented are trusted or not.
@@ -55,9 +52,7 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * The default keyManager.
-   */
+  /** The default keyManager. */
   private X509KeyManager keyManager;
 
   /**
@@ -116,14 +111,13 @@
         KeyManager kms[] = kmf.getKeyManagers();
         /*
          * Iterate over the returned keymanagers, look for an instance
-         * of X509KeyManager. If found, use that as our "default" key
-         * manager.
+         * of X509KeyManager. If found, use that as our "default" key manager.
          */
-        for (int j = 0; j < kms.length; j++)
+        for (KeyManager km : kms)
         {
           if (kms[i] instanceof X509KeyManager)
           {
-            keyManager = (X509KeyManager) kms[j];
+            keyManager = (X509KeyManager) km;
             break;
           }
         }
@@ -155,138 +149,39 @@
     }
   }
 
-
-  /**
-   * Choose an alias to authenticate the client side of a secure
-   * socket given the public key type and the list of certificate
-   * issuer authorities recognized by the peer (if any).
-   *
-   * @param keyType
-   *          the key algorithm type name(s), ordered with the
-   *          most-preferred key type first.
-   * @param issuers
-   *          the list of acceptable CA issuer subject names or null
-   *          if it does not matter which issuers are used.
-   * @param socket
-   *          the socket to be used for this connection. This
-   *          parameter can be null, in which case this method will
-   *          return the most generic alias to use.
-   * @return the alias name for the desired key, or null if there are
-   *         no matches.
-   */
-  public String chooseClientAlias(String[] keyType, Principal[] issuers,
-      Socket socket)
+  @Override
+  public String chooseClientAlias(String[] keyType, Principal[] issuers, Socket socket)
   {
-    if (keyManager != null)
-    {
-      return keyManager.chooseClientAlias(keyType, issuers, socket);
-    }
-    return null;
+    return keyManager != null ? keyManager.chooseClientAlias(keyType, issuers, socket) : null;
   }
 
-  /**
-   * Choose an alias to authenticate the client side of a secure
-   * socket given the public key type and the list of certificate
-   * issuer authorities recognized by the peer (if any).
-   *
-   * @param keyType
-   *          the key algorithm type name(s), ordered with the
-   *          most-preferred key type first.
-   * @param issuers
-   *          the list of acceptable CA issuer subject names or null
-   *          if it does not matter which issuers are used.
-   * @param socket
-   *          the socket to be used for this connection. This
-   *          parameter can be null, in which case this method will
-   *          return the most generic alias to use.
-   * @return the alias name for the desired key, or null if there are
-   *         no matches.
-   */
-  public String chooseServerAlias(String keyType, Principal[] issuers,
-      Socket socket)
+  @Override
+  public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket)
   {
-    if (keyManager != null)
-    {
-      return keyManager.chooseServerAlias(keyType, issuers, socket);
-    }
-    return null;
+    return keyManager != null ? keyManager.chooseServerAlias(keyType, issuers, socket) : null;
   }
 
-  /**
-   * Returns the certificate chain associated with the given alias.
-   *
-   * @param alias
-   *          the alias name
-   * @return the certificate chain (ordered with the user's
-   *         certificate first and the root certificate authority
-   *         last), or null if the alias can't be found.
-   */
+  @Override
   public X509Certificate[] getCertificateChain(String alias)
   {
-    if (keyManager != null)
-    {
-      return keyManager.getCertificateChain(alias);
-    }
-    return null;
+    return keyManager != null ? keyManager.getCertificateChain(alias) : null;
   }
 
-  /**
-   * Get the matching aliases for authenticating the server side of a
-   * secure socket given the public key type and the list of
-   * certificate issuer authorities recognized by the peer (if any).
-   *
-   * @param keyType
-   *          the key algorithm type name
-   * @param issuers
-   *          the list of acceptable CA issuer subject names or null
-   *          if it does not matter which issuers are used.
-   * @return an array of the matching alias names, or null if there
-   *         were no matches.
-   */
+  @Override
   public String[] getClientAliases(String keyType, Principal[] issuers)
   {
-    if (keyManager != null)
-    {
-      return keyManager.getClientAliases(keyType, issuers);
-    }
-    return null;
+    return keyManager != null ? keyManager.getClientAliases(keyType, issuers) : null;
   }
 
-  /**
-   * Returns the key associated with the given alias.
-   *
-   * @param alias
-   *          the alias name
-   * @return the requested key, or null if the alias can't be found.
-   */
+  @Override
   public PrivateKey getPrivateKey(String alias)
   {
-    if (keyManager != null)
-    {
-      return keyManager.getPrivateKey(alias);
-    }
-    return null;
+    return keyManager != null ? keyManager.getPrivateKey(alias) : null;
   }
 
-  /**
-   * Get the matching aliases for authenticating the server side of a
-   * secure socket given the public key type and the list of
-   * certificate issuer authorities recognized by the peer (if any).
-   *
-   * @param keyType
-   *          the key algorithm type name
-   * @param issuers
-   *          the list of acceptable CA issuer subject names or null
-   *          if it does not matter which issuers are used.
-   * @return an array of the matching alias names, or null if there
-   *         were no matches.
-   */
+  @Override
   public String[] getServerAliases(String keyType, Principal[] issuers)
   {
-    if (keyManager != null)
-    {
-      return keyManager.getServerAliases(keyType, issuers);
-    }
-    return null;
+    return keyManager != null ? keyManager.getServerAliases(keyType, issuers) : null;
   }
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
index 35c27c9..e6d151c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ApplicationTrustManager.java
@@ -13,9 +13,8 @@
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
  * Portions Copyright 2009 Parametric Technology Corporation (PTC)
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
-
 package org.opends.admin.ads.util;
 
 import java.security.KeyStore;
@@ -46,8 +45,7 @@
  * it cannot be retrieved this class will only accept the certificates
  * explicitly accepted by the user (and specified by calling acceptCertificate).
  *
- * NOTE: this class is not aimed to be used when we have connections in
- * parallel.
+ * NOTE: this class is not aimed to be used when we have connections in parallel.
  */
 public class ApplicationTrustManager implements X509TrustManager
 {
@@ -57,14 +55,9 @@
    */
   public enum Cause
   {
-    /**
-     * The certificate was not trusted.
-     */
+    /** The certificate was not trusted. */
     NOT_TRUSTED,
-    /**
-     * The certificate's subject DN's value and the host name we tried to
-     * connect to do not match.
-     */
+    /** The certificate's subject DN's value and the host name we tried to connect to do not match. */
     HOST_NAME_MISMATCH
   }
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -85,7 +78,6 @@
 
   private String host;
 
-
   /**
    * The default constructor.
    *
@@ -161,7 +153,7 @@
       }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void checkClientTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
@@ -195,7 +187,7 @@
     {
       try
       {
-        verifyHostName(chain, authType);
+        verifyHostName(chain);
       }
       catch (CertificateException ce)
       {
@@ -204,7 +196,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void checkServerTrusted(X509Certificate[] chain,
       String authType) throws CertificateException
   {
@@ -238,7 +230,7 @@
     {
       try
       {
-        verifyHostName(chain, authType);
+        verifyHostName(chain);
       }
       catch (CertificateException ce)
       {
@@ -257,7 +249,7 @@
     throw new OpendsCertificateException(chain, ce);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public X509Certificate[] getAcceptedIssuers()
   {
     if (trustManager != null)
@@ -364,8 +356,7 @@
    * @throws CertificateException if the subject DN of the certificate does
    * not match with the host name specified with the method setHost.
    */
-  private void verifyHostName(X509Certificate[] chain, String authType)
-  throws CertificateException
+  private void verifyHostName(X509Certificate[] chain) throws CertificateException
   {
     if (host != null)
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
index 7793677..f11490b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
@@ -12,20 +12,17 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.admin.ads.util;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLSession;
 
-/**
- * A HostnameVerifier which verifies nothing.
- */
+/** A HostnameVerifier which verifies nothing. */
 class BlindHostnameVerifier implements HostnameVerifier
 {
-  /** {@inheritDoc} */
+  @Override
   public boolean verify(String hostname, SSLSession session)
   {
     return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
index bcf4362..d16aa0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
@@ -12,32 +12,30 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.admin.ads.util;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
+
 import javax.net.ssl.X509TrustManager;
 
-/**
- * An X509TrustManager which trusts everything.
- */
+/** An X509TrustManager which trusts everything. */
 public class BlindTrustManager implements X509TrustManager {
-
-  /** {@inheritDoc} */
-  public void checkClientTrusted(X509Certificate[] chain, String authType)
-  throws CertificateException
+  @Override
+  public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException
   {
+    // no-op
   }
 
-  /** {@inheritDoc} */
-  public void checkServerTrusted(X509Certificate[] chain, String authType)
-  throws CertificateException
+  @Override
+  public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException
   {
+    // no-op
   }
 
-  /** {@inheritDoc} */
+  @Override
   public X509Certificate[] getAcceptedIssuers()
   {
     return new X509Certificate[0];
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
index c85fb98..b7723ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
@@ -12,29 +12,25 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.admin.ads.util;
 
 import java.io.IOException;
-import java.net.Socket;
 import java.net.InetAddress;
-import java.util.Map;
-import java.util.HashMap;
-
+import java.net.Socket;
 import java.security.GeneralSecurityException;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.SSLKeyException;
+import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 
-/**
- * An implementation of SSLSocketFactory.
- */
+/** An implementation of SSLSocketFactory. */
 public class TrustedSocketFactory extends SSLSocketFactory
 {
   private static Map<Thread, TrustManager> hmTrustManager = new HashMap<>();
@@ -110,9 +106,7 @@
     }
   }
 
-  //
   // SocketFactory implementation
-  //
   /**
    * Returns the default SSL socket factory. The default
    * implementation can be changed by setting the value of the
@@ -161,14 +155,13 @@
       {
         SocketFactory tmsf = hmDefaultFactoryTm.get(trustManager);
         SocketFactory kmsf = hmDefaultFactoryKm.get(keyManager);
-        if ( tmsf == null || kmsf == null)
+        if (tmsf == null || kmsf == null)
         {
           result = new TrustedSocketFactory(trustManager, keyManager);
           hmDefaultFactoryTm.put(trustManager, result);
           hmDefaultFactoryKm.put(keyManager, result);
         }
-        else
-        if ( !tmsf.equals(kmsf) )
+        else if (!tmsf.equals(kmsf))
         {
           result = new TrustedSocketFactory(trustManager, keyManager);
           hmDefaultFactoryTm.put(trustManager, result);
@@ -176,7 +169,7 @@
         }
         else
         {
-          result = tmsf ;
+          result = tmsf;
         }
       }
     }
@@ -184,40 +177,39 @@
     return result;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Socket createSocket(InetAddress address, int port) throws IOException {
     return getInnerFactory().createSocket(address, port);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Socket createSocket(InetAddress address, int port,
       InetAddress clientAddress, int clientPort) throws IOException
   {
-    return getInnerFactory().createSocket(address, port, clientAddress,
-        clientPort);
+    return getInnerFactory().createSocket(address, port, clientAddress, clientPort);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Socket createSocket(String host, int port) throws IOException
   {
     return getInnerFactory().createSocket(host, port);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Socket createSocket(String host, int port, InetAddress clientHost,
       int clientPort) throws IOException
   {
     return getInnerFactory().createSocket(host, port, clientHost, clientPort);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Socket createSocket(Socket s, String host, int port, boolean autoClose)
   throws IOException
   {
     return getInnerFactory().createSocket(s, host, port, autoClose);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String[] getDefaultCipherSuites()
   {
     try
@@ -230,7 +222,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String[] getSupportedCipherSuites()
   {
     try
@@ -247,11 +239,10 @@
     if (innerFactory == null)
     {
       String algorithm = "TLSv1";
-      SSLKeyException xx;
-      KeyManager[] km = null;
-      TrustManager[] tm = null;
 
       try {
+        KeyManager[] km = null;
+        TrustManager[] tm = null;
         SSLContext sslCtx = SSLContext.getInstance(algorithm);
         if (trustManager != null)
         {
@@ -265,8 +256,7 @@
         innerFactory = sslCtx.getSocketFactory();
       }
       catch(GeneralSecurityException x) {
-        xx = new SSLKeyException("Failed to create SSLContext for " +
-            algorithm);
+        SSLKeyException xx = new SSLKeyException("Failed to create SSLContext for " + algorithm);
         xx.initCause(x);
         throw xx;
       }
@@ -274,4 +264,3 @@
     return innerFactory;
   }
 }
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
index 8a975ef..cee0614 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel;
@@ -80,6 +80,7 @@
     final ControlPanel test = new ControlPanel();
     test.initialize(args);
     javax.swing.SwingUtilities.invokeLater(new Runnable() {
+      @Override
       public void run() {
         test.createAndDisplayGUI();
       }
@@ -119,9 +120,7 @@
     info.setConnectTimeout(argParser.getConnectTimeout());
   }
 
-  /**
-   * Creates the main Control Panel dialog and displays it.
-   */
+  /** Creates the main Control Panel dialog and displays it. */
   public void createAndDisplayGUI()
   {
     LocalOrRemotePanel localOrRemotePanel = new LocalOrRemotePanel();
@@ -144,7 +143,7 @@
 
     ComponentListener listener = new ComponentAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void componentHidden(ComponentEvent e)
       {
         handleWindowClosed(localOrRemote, info);
@@ -170,6 +169,7 @@
     // calling pack.
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         // Create and set up the content pane.
@@ -179,6 +179,7 @@
         dlg.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
         final MainMenuBar menuBar = new MainMenuBar(info);
         dlg.addWindowListener(new WindowAdapter() {
+          @Override
           public void windowClosing(WindowEvent e) {
             menuBar.quitClicked();
           }
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 3c9f565..bf7a199 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel;
 
@@ -43,7 +43,6 @@
  * class basically displays a splash screen and then calls the methods in
  * ControlPanel.  It also is in charge of detecting whether there are issues
  * with the
- *
  */
 public class ControlPanelLauncher
 {
@@ -211,8 +210,7 @@
     }
     catch (InterruptedException ie)
     {
-      /* An error occurred, so the return value will be -1.  We got nothing to
-      do with this exception. */
+      /* An error occurred, so the return value will be -1. We got nothing to do with this exception. */
     }
     System.setErr(printStream);
     return returnValue[0];
@@ -230,39 +228,23 @@
 }
 
 
-/**
- * The enumeration containing the different return codes that the command-line
- * can have.
- *
- */
+/** The enumeration containing the different return codes that the command-line can have. */
 enum ErrorReturnCode
 {
-  /**
-   * Successful display of the status.
-   */
+  /** Successful display of the status. */
   SUCCESSFUL(0),
-  /**
-   * We did no have an error but the status was not displayed (displayed
-   * version or usage).
-   */
+  /** We did no have an error but the status was not displayed (displayed version or usage). */
   SUCCESSFUL_NOP(0),
-  /**
-   * Unexpected error (potential bug).
-   */
+  /** Unexpected error (potential bug). */
   ERROR_UNEXPECTED(1),
-  /**
-   * Cannot parse arguments.
-   */
+  /** Cannot parse arguments. */
   ERROR_PARSING_ARGS(2),
   /**
    * User cancelled (for instance not accepting the certificate proposed) or
    * could not use the provided connection parameters in interactive mode.
    */
   USER_CANCELLED_OR_DATA_ERROR(3),
-  /**
-   * This occurs for instance when the authentication provided by the user is
-   * not valid.
-   */
+  /** This occurs for instance when the authentication provided by the user is not valid. */
   ERROR_READING_CONFIGURATION_WITH_LDAP(4);
 
   private int returnCode;
@@ -281,10 +263,7 @@
   }
 }
 
-/**
- * The splash screen for the control panel.
- *
- */
+/** The splash screen for the control panel. */
 class ControlPanelSplashScreen extends org.opends.quicksetup.SplashScreen
 {
   private static final long serialVersionUID = 4472839063380302713L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
index 62dee38..095f887 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/AbstractNodeTask.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.browser;
@@ -46,10 +47,7 @@
   }
 
 
-  /**
-   * Cancels the searching/refreshing process.
-   *
-   */
+  /** Cancels the searching/refreshing process. */
   public void cancel() {
     cancelled = true;
   }
@@ -63,8 +61,7 @@
     return cancelled;
   }
 
-  /**
-   * The method that is called to refresh/search the node.
-   */
+  /** The method that is called to refresh/search the node. */
+  @Override
   public abstract void run();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
index 6693f04..978c091 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -80,15 +80,10 @@
 public class BrowserController
 implements TreeExpansionListener, ReferralAuthenticationListener
 {
-  /**
-   * The mask used to display the number of ACIs or not.
-   */
+  /** The mask used to display the number of ACIs or not. */
   private static final int DISPLAY_ACI_COUNT = 0x01;
 
-  /**
-   * The list of attributes that are used to sort the entries (if the sorting
-   * option is used).
-   */
+  /** The list of attributes that are used to sort the entries (if the sorting option is used). */
   private static final String[] SORT_ATTRIBUTES =
       { "cn", "givenname", "o", "ou", "sn", "uid" };
 
@@ -98,9 +93,7 @@
    */
   private static final String RDN_ATTRIBUTE = "rdn attribute";
 
-  /**
-   * The filter used to retrieve all the entries.
-   */
+  /** The filter used to retrieve all the entries. */
   public static final String ALL_OBJECTS_FILTER =
     "(|(objectClass=*)(objectClass=ldapsubentry))";
 
@@ -614,10 +607,7 @@
     startRefreshNode(node, null, false);
   }
 
-  /**
-   * Notify this controller that authentication data have changed in the
-   * connection pool.
-   */
+  /** Notify this controller that authentication data have changed in the connection pool. */
   @Override
   public void notifyAuthDataChanged() {
     notifyAuthDataChanged(null);
@@ -658,10 +648,7 @@
     startRefreshNode(node, null, true);
   }
 
-  /**
-   * Stop the current refreshing.
-   * Nodes being expanded are collapsed.
-   */
+  /** Stop the current refreshing. Nodes being expanded are collapsed. */
   private void stopRefresh() {
     stopRefreshNode(rootNode);
     // TODO: refresh must be stopped in a clean state.
@@ -1229,7 +1216,6 @@
    * are not invoked directly by the task classes: they are
    * invoked using SwingUtilities.invokeAndWait() (each of the
    * methods XXX() below has a matching wrapper invokeXXX()).
-   *
    */
 
   /**
@@ -1338,8 +1324,7 @@
           updateNodeRendering(node, task.getDisplayedEntry());
           nodeChanged = true;
           if (node.isLeaf()) {
-            /* We didn't detect any child: remove the previously existing
-             * ones */
+            /* We didn't detect any child: remove the previously existing ones */
             removeAllChildNodes(node, false /* Remove suffixes */);
           }
         }
@@ -1995,9 +1980,7 @@
 
 
 
-  /**
-   * Collection utilities
-   */
+  /** Collection utilities. */
   /**
    * Returns an array of integer from a Collection of Integer objects.
    * @param v the Collection of Integer objects.
@@ -2036,9 +2019,7 @@
   }
 
 
-  /**
-   * The default implementation of the BrowserNodeInfo interface.
-   */
+  /** The default implementation of the BrowserNodeInfo interface. */
   private class BrowserNodeInfoImpl implements BrowserNodeInfo
   {
     private BasicNode node;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java
index 8bdbb38..81696b4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/IconPool.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.browser;
 
@@ -35,17 +35,11 @@
  */
 public class IconPool {
 
-  /**
-   * Mask for the leaf node.
-   */
+  /** Mask for the leaf node. */
   public static final int MODIFIER_LEAF   = 0x01;
-  /**
-   * Mask for the referral node.
-   */
+  /** Mask for the referral node. */
   public static final int MODIFIER_REFERRAL = 0x02;
-  /**
-   * Mask for the node that has an error.
-   */
+  /** Mask for the node that has an error. */
   public static final int MODIFIER_ERROR    = 0x04;
 
   private final HashMap<String, ImageIcon> iconTable = new HashMap<>();
@@ -59,9 +53,7 @@
   private ImageIcon errorMaskIcon;
   private ImageIcon referralMaskIcon;
 
-  /**
-   * The path that contains the icons.
-   */
+  /** The path that contains the icons. */
   public static final String IMAGE_PATH =
     "org/opends/guitools/controlpanel/images";
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
index 82f2432..544bbba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/LDAPConnectionPool.java
@@ -361,10 +361,7 @@
     }
   }
 
-  /**
-   * Notifies the listeners that a referral authentication change happened.
-   *
-   */
+  /** Notifies the listeners that a referral authentication change happened. */
   private void notifyListeners()
   {
     for (ReferralAuthenticationListener listener : listeners)
@@ -522,17 +519,13 @@
 
 }
 
-/**
- * A structure representing authentication data.
- */
+/** A structure representing authentication data. */
 class AuthRecord {
   String dn;
   String password;
 }
 
-/**
- * A structure representing an active connection.
- */
+/** A structure representing an active connection. */
 class ConnectionRecord {
   InitialLdapContext ctx;
   int counter;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
index 8f178fa..336bc4b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeSearcherQueue.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.browser;
 
@@ -29,7 +29,6 @@
  *
  * The queue will basically start a certain number of threads and this threads
  * will "consume" the AbstractNodeTask objects that are added to this queue.
- *
  */
 class NodeSearcherQueue implements Runnable {
 
@@ -65,10 +64,7 @@
   }
 
 
-  /**
-   * Shutdown this queue.
-   * All the associated threads are stopped.
-   */
+  /** Shutdown this queue. All the associated threads are stopped. */
   public void shutdown() {
     threadGroup.interrupt();
   }
@@ -131,9 +127,7 @@
   }
 
 
-  /**
-   * Cancel all the object from this queue.
-   */
+  /** Cancel all the object from this queue. */
   public synchronized void cancelAll() {
     waitingQueue.clear();
     for (BasicNode node : workingList.keySet())
@@ -225,6 +219,7 @@
    * the NodeSearchQueue constructor.
    * Basically this method fetches objects from the waiting queue and runs them.
    */
+  @Override
   public void run() {
     boolean interrupted = false;
     while (!interrupted)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
index 537f8cf..e84d6fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
@@ -12,14 +12,12 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
 
-/**
- * Abstract class used to describe the configuration of an index.
- *
- */
+/** Abstract class used to describe the configuration of an index. */
 public abstract class AbstractIndexDescriptor
 implements Comparable<AbstractIndexDescriptor>
 {
@@ -64,9 +62,6 @@
     recalculateHashCode();
   }
 
-  /**
-   * Method used to minimize the times the hashcode is calculated.
-   *
-   */
+  /** Method used to minimize the times the hashcode is calculated. */
   protected abstract void recalculateHashCode();
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
index 845ca5a..fafc5d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -30,7 +30,6 @@
  * Table Model used to store information about indexes.  It is used basically
  * by the tables that appear on the right side of the 'Manage Indexes...'
  * dialog when the user clicks on 'Indexes' or 'VLV Indexes'.
- *
  */
 public abstract class AbstractIndexTableModel extends SortableTableModel
 implements Comparator<AbstractIndexDescriptor>
@@ -40,13 +39,9 @@
   private ArrayList<String[]> dataArray = new ArrayList<>();
   private ArrayList<AbstractIndexDescriptor> indexArray = new ArrayList<>();
   private final String[] COLUMN_NAMES = getColumnNames();
-  /**
-   * The sort column of the table.
-   */
+  /** The sort column of the table. */
   protected int sortColumn;
-  /**
-   * Whether the sorting is ascending or descending.
-   */
+  /** Whether the sorting is ascending or descending. */
   protected boolean sortAscending = true;
   private ControlPanelInfo info;
 
@@ -70,6 +65,7 @@
    * Updates the table model contents and sorts its contents depending on the
    * sort options set by the user.
    */
+  @Override
   public void forceResort()
   {
     updateDataArray();
@@ -78,25 +74,25 @@
 
 
 
-  /** {@inheritDoc} */
+  @Override
   public int getColumnCount()
   {
     return COLUMN_NAMES.length;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getColumnName(int col) {
     return COLUMN_NAMES[col];
   }
@@ -107,6 +103,7 @@
    * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
    * otherwise.
    */
+  @Override
   public boolean isSortAscending()
   {
     return sortAscending;
@@ -116,6 +113,7 @@
    * Sets whether to sort ascending of descending.
    * @param sortAscending whether to sort ascending or descending.
    */
+  @Override
   public void setSortAscending(boolean sortAscending)
   {
     this.sortAscending = sortAscending;
@@ -125,6 +123,7 @@
    * Returns the column index used to sort.
    * @return the column index used to sort.
    */
+  @Override
   public int getSortColumn()
   {
     return sortColumn;
@@ -134,6 +133,7 @@
    * Sets the column index used to sort.
    * @param sortColumn column index used to sort..
    */
+  @Override
   public void setSortColumn(int sortColumn)
   {
     this.sortColumn = sortColumn;
@@ -193,9 +193,7 @@
     return getRebuildRequiredString(i1).compareTo(getRebuildRequiredString(i2));
   }
 
-  /**
-   * Updates the array data.  This includes resorting it.
-   */
+  /** Updates the array data. This includes resorting it. */
   private void updateDataArray()
   {
     TreeSet<AbstractIndexDescriptor> sortedSet = new TreeSet<>(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
index 909ad76..773f2ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackendDescriptor.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2011 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -140,7 +140,6 @@
     return entries;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o)
   {
@@ -170,7 +169,6 @@
     return monitoringEntry;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
@@ -207,7 +205,6 @@
    * @param baseDns the base DNs associated with the Backend.
    * @param indexes the indexes defined in the backend.
    * @param vlvIndexes the VLV indexes defined in the backend.
-   *
    */
   private void updateBaseDnsAndIndexes(Set<BaseDNDescriptor> baseDns,
       Set<IndexDescriptor> indexes, Set<VLVIndexDescriptor> vlvIndexes)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
index 510abd4..b250948 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -21,10 +21,7 @@
 
 import javax.swing.table.AbstractTableModel;
 
-/**
- * The table used to display the backups.
- *
- */
+/** The table used to display the backups. */
 public class BackupTableModel extends AbstractTableModel
 {
   private static final long serialVersionUID = -3511425157550147124L;
@@ -45,7 +42,7 @@
     backups.add(backup);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getValueAt(int row, int column)
   {
     switch (column)
@@ -63,19 +60,13 @@
     }
   }
 
-  /**
-   * Returns the row count.
-   * @return the row count.
-   */
+  @Override
   public int getRowCount()
   {
     return backups.size();
   }
 
-  /**
-   * Returns the column count.
-   * @return the column count.
-   */
+  @Override
   public int getColumnCount()
   {
     return 4;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index 9e19db3..e6fe548 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -23,26 +23,17 @@
 /**
  * This class is used to represent a Base DN / Replica and is aimed to be
  * used by the classes in the BackendTableModel class.
- *
  */
 public class BaseDNDescriptor implements Comparable<BaseDNDescriptor>
 {
-  /**
-   * An enumeration describing the type of base DN for a given backend.
-   */
+  /** An enumeration describing the type of base DN for a given backend. */
   public enum Type
   {
-    /**
-     * The base DN is not replicated.
-     */
+    /** The base DN is not replicated. */
     NOT_REPLICATED,
-    /**
-     * The base DN is replicated.
-     */
+    /** The base DN is replicated. */
     REPLICATED,
-    /**
-     * Replication is disabled.
-     */
+    /** Replication is disabled. */
     DISABLED
   }
 
@@ -90,7 +81,6 @@
     return baseDn;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object v)
   {
@@ -120,14 +110,13 @@
         && getBackend().getBackendID().equals(desc.getBackend().getBackendID());
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
     return hashCode;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int compareTo(BaseDNDescriptor desc)
   {
     int returnValue = desc.getDn().compareTo(getDn());
@@ -285,7 +274,6 @@
    * Method called when one of the elements that affect the value of the
    * hashcode is modified.  It is used to minimize the time spent calculating
    * hashCode.
-   *
    */
   private void recalculateHashCode()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
index 22d68d1..420ffd5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -29,10 +29,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The table model used to display all the base DNs.
- *
- */
+/** The table model used to display all the base DNs. */
 public class BaseDNTableModel extends SortableTableModel
 implements Comparator<BaseDNDescriptor>
 {
@@ -47,22 +44,14 @@
   private boolean sortAscending = true;
   private boolean displayReplicationInformation;
 
-  /**
-   * Key value to identify the case of a value not available because the server
-   * is down.
-   */
+  /** Key value to identify the case of a value not available because the server is down. */
   public static String NOT_AVAILABLE_SERVER_DOWN = "NOT_AVAILABLE_SERVER_DOWN";
 
-  /**
-   * Key value to identify the case of a value not available because
-   * authentication is required.
-   */
+  /** Key value to identify the case of a value not available because authentication is required. */
   public static String NOT_AVAILABLE_AUTHENTICATION_REQUIRED =
     "NOT_AVAILABLE_AUTHENTICATION_REQUIRED";
 
-  /**
-   * Key value to identify the case of a value not available.
-   */
+  /** Key value to identify the case of a value not available. */
   public static String NOT_AVAILABLE = "NOT_AVAILABLE";
 
   /**
@@ -133,6 +122,7 @@
    * Updates the table model contents and sorts its contents depending on the
    * sort options set by the user.
    */
+  @Override
   public void forceResort()
   {
     updateDataArray();
@@ -148,6 +138,7 @@
    * are equivalent in terms of sorting and -1 if the second descriptor must
    * be put before the first descriptor.
    */
+  @Override
   public int compare(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
   {
     int result = 0;
@@ -336,25 +327,25 @@
     return result;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int getColumnCount()
   {
     return displayReplicationInformation ? 6 : 4;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /** Updates the array data.  This includes resorting it. */
+  /** Updates the array data. This includes resorting it. */
   private void updateDataArray()
   {
     TreeSet<BaseDNDescriptor> sortedSet = new TreeSet<>(this);
@@ -373,43 +364,30 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getColumnName(int col) {
     return COLUMN_NAMES[col];
   }
 
-  /**
-   * Returns whether the sort is ascending or descending.
-   * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
-   * otherwise.
-   */
+  @Override
   public boolean isSortAscending()
   {
     return sortAscending;
   }
 
-  /**
-   * Sets whether to sort ascending of descending.
-   * @param sortAscending whether to sort ascending or descending.
-   */
+  @Override
   public void setSortAscending(boolean sortAscending)
   {
     this.sortAscending = sortAscending;
   }
 
-  /**
-   * Returns the column index used to sort.
-   * @return the column index used to sort.
-   */
+  @Override
   public int getSortColumn()
   {
     return sortColumn;
   }
 
-  /**
-   * Sets the column index used to sort.
-   * @param sortColumn column index used to sort..
-   */
+  @Override
   public void setSortColumn(int sortColumn)
   {
     this.sortColumn = sortColumn;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
index 81b0682..eef9a67 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -28,234 +28,140 @@
  */
 public enum BasicMonitoringAttributes implements MonitoringAttributes
 {
-  /**
-   * Start Date.
-   */
+  /** Start Date. */
   START_DATE(LocalizableMessage.EMPTY, ServerConstants.ATTR_START_TIME),
-  /**
-   * Current Date.
-   */
+  /** Current Date. */
   CURRENT_DATE(LocalizableMessage.EMPTY, ServerConstants.ATTR_CURRENT_TIME),
-  /**
-   * Current Connections.
-   */
+  /** Current Connections. */
   CURRENT_CONNECTIONS(LocalizableMessage.EMPTY, ServerConstants.ATTR_CURRENT_CONNS),
-  /**
-   * Maximum Connections.
-   */
+  /** Maximum Connections. */
   MAX_CONNECTIONS(LocalizableMessage.EMPTY, ServerConstants.ATTR_MAX_CONNS),
-  /**
-   * Total Connections.
-   */
+  /** Total Connections. */
   TOTAL_CONNECTIONS(LocalizableMessage.EMPTY, ServerConstants.ATTR_TOTAL_CONNS),
-  /**
-   * Average Request Backlog.
-   */
+  /** Average Request Backlog. */
   AVERAGE_REQUEST_BACKLOG(INFO_CTRL_PANEL_AVERAGE_REQUEST_BACKLOG.get(),
   TraditionalWorkQueueMonitor.ATTR_AVERAGE_BACKLOG),
-  /**
-   * Max Request Backlog.
-   */
+  /** Max Request Backlog. */
   MAX_REQUEST_BACKLOG(INFO_CTRL_PANEL_MAX_REQUEST_BACKLOG.get(),
   TraditionalWorkQueueMonitor.ATTR_MAX_BACKLOG),
-  /**
-   * Current Request Backlog.
-   */
+  /** Current Request Backlog. */
   CURRENT_REQUEST_BACKLOG(INFO_CTRL_PANEL_CURRENT_REQUEST_BACKLOG.get(),
   TraditionalWorkQueueMonitor.ATTR_CURRENT_BACKLOG),
-  /**
-   * Requests submitted.
-   */
+  /** Requests submitted. */
   REQUESTS_SUBMITTED(INFO_CTRL_PANEL_REQUESTS_SUBMITTED.get(),
   TraditionalWorkQueueMonitor.ATTR_OPS_SUBMITTED),
-  /**
-   * Requests rejected.
-   */
+  /** Requests rejected. */
   REQUESTS_REJECTED(INFO_CTRL_PANEL_REQUESTS_REJECTED.get(),
   TraditionalWorkQueueMonitor.ATTR_OPS_REJECTED_QUEUE_FULL),
-  /**
-   * Entry cache Hits.
-   */
+  /** Entry cache Hits. */
   ENTRY_CACHE_HITS(INFO_CTRL_PANEL_ENTRY_CACHE_HITS.get(),
   "entryCacheHits"),
-  /**
-   * Current entry cache count.
-   */
+  /** Current entry cache count. */
   CURRENT_ENTRY_CACHE_COUNT(INFO_CTRL_PANEL_CURRENT_ENTRY_CACHE_COUNT.get(),
   "currentEntryCacheCount"),
-  /**
-   * Entry cache tries.
-   */
+  /** Entry cache tries. */
   ENTRY_CACHE_TRIES(INFO_CTRL_PANEL_ENTRY_CACHE_TRIES.get(),
   "entryCacheTries"),
-  /**
-   * Entry cache hit ratio.
-   */
+  /** Entry cache hit ratio. */
   ENTRY_CACHE_HIT_RATIO(INFO_CTRL_PANEL_ENTRY_CACHE_HIT_RATIO.get(),
   "entryCacheHitRatio"),
-  /**
-   * Entry cache current size.
-   */
+  /** Entry cache current size. */
   CURRENT_ENTRY_CACHE_SIZE(INFO_CTRL_PANEL_CURRENT_ENTRY_CACHE_SIZE.get(),
   "currentEntryCacheSize"),
-  /**
-   * Entry cache max size.
-   */
+  /** Entry cache max size. */
   MAX_ENTRY_CACHE_SIZE(INFO_CTRL_PANEL_MAX_ENTRY_CACHE_SIZE.get(),
   "maxEntryCacheSize"),
-  /**
-   * Entry cache max count.
-   */
+  /** Entry cache max count. */
   MAX_ENTRY_CACHE_COUNT(INFO_CTRL_PANEL_MAX_ENTRY_CACHE_COUNT.get(),
   "maxEntryCacheCount"),
-  /**
-   * Available CPUs.
-   */
+  /** Available CPUs. */
   AVAILABLE_CPUS(INFO_CTRL_PANEL_AVAILABLE_CPUS.get(),
   "availableCPUs"),
-  /**
-   * System Name.
-   */
+  /** System Name. */
   SYSTEM_NAME(INFO_CTRL_PANEL_SYSTEM_NAME.get(),
   "systemName"),
-  /**
-   * Operating System.
-   */
+  /** Operating System. */
   OPERATING_SYSTEM(INFO_CTRL_PANEL_OPERATING_SYSTEM.get(),
   "operatingSystem"),
-  /**
-   * Free used memory.
-   */
+  /** Free used memory. */
   FREE_USED_MEMORY(INFO_CTRL_PANEL_FREE_USED_MEMORY.get(),
   "freeUsedMemory"),
-  /**
-   * Max memory.
-   */
+  /** Max memory. */
   MAX_MEMORY(INFO_CTRL_PANEL_MAX_MEMORY.get(),
   "maxMemory"),
-  /**
-   * Used memory.
-   */
+  /** Used memory. */
   USED_MEMORY(INFO_CTRL_PANEL_USED_MEMORY.get(),
   "usedMemory"),
-  /**
-   * Class path.
-   */
+  /** Class path. */
   CLASS_PATH(INFO_CTRL_PANEL_CLASS_PATH.get(),
   "classPath"),
-  /**
-   * Java Vendor.
-   */
+  /** Java Vendor. */
   JAVA_VENDOR(INFO_CTRL_PANEL_JAVA_VENDOR.get(),
   "javaVendor"),
-  /**
-   * JVM Vendor.
-   */
+  /** JVM Vendor. */
   JVM_VENDOR(INFO_CTRL_PANEL_JVM_VENDOR.get(),
   "javaVendor"),
-  /**
-   * Java Version.
-   */
+  /** Java Version. */
   JAVA_VERSION(INFO_CTRL_PANEL_JAVA_VERSION.get(),
   "javaVersion"),
-  /**
-   * JVM Version.
-   */
+  /** JVM Version. */
   JVM_VERSION(INFO_CTRL_PANEL_JVM_VERSION.get(),
   "jvmVersion"),
-  /**
-   * JVM Architecture.
-   */
+  /** JVM Architecture. */
   JVM_ARCHITECTURE(INFO_CTRL_PANEL_JVM_ARCHITECTURE.get(),
   "jvmArchitecture"),
-  /**
-   * JVM Arguments.
-   */
+  /** JVM Arguments. */
   JVM_ARGUMENTS(INFO_CTRL_PANEL_JVM_ARGUMENTS.get(),
   "jvmArguments"),
-  /**
-   * Add Request.
-   */
+  /** Add Request. */
   ADD_REQUESTS(INFO_CTRL_PANEL_ADD_REQUESTS_LABEL.get(),
   "addRequests"),
-  /**
-   * Add Responses.
-   */
+  /** Add Responses. */
   ADD_RESPONSES(INFO_CTRL_PANEL_ADD_RESPONSES_LABEL.get(),
   "addResponses"),
-  /**
-   * Bind Request.
-   */
+  /** Bind Request. */
   BIND_REQUESTS(INFO_CTRL_PANEL_BIND_REQUESTS_LABEL.get(),
   "bindRequests"),
-  /**
-   * Bind Responses.
-   */
+  /** Bind Responses. */
   BIND_RESPONSES(INFO_CTRL_PANEL_BIND_RESPONSES_LABEL.get(),
   "bindResponses"),
-  /**
-   * Compare Requests.
-   */
+  /** Compare Requests. */
   COMPARE_REQUESTS(INFO_CTRL_PANEL_COMPARE_REQUESTS_LABEL.get(),
   "compareRequests"),
-  /**
-   * Compare Responses.
-   */
+  /** Compare Responses. */
   COMPARE_RESPONSES(INFO_CTRL_PANEL_COMPARE_RESPONSES_LABEL.get(),
   "compareResponses"),
-  /**
-   * Delete Request.
-   */
+  /** Delete Request. */
   DELETE_REQUESTS(INFO_CTRL_PANEL_DELETE_REQUESTS_LABEL.get(),
   "deleteRequests"),
-  /**
-   * Delete Responses.
-   */
+  /** Delete Responses. */
   DELETE_RESPONSES(INFO_CTRL_PANEL_DELETE_RESPONSES_LABEL.get(),
   "deleteResponses"),
-  /**
-   * Extended Request.
-   */
+  /** Extended Request. */
   EXTENDED_REQUESTS(INFO_CTRL_PANEL_EXTENDED_REQUESTS_LABEL.get(),
   "extendedRequests"),
-  /**
-   * Extended Responses.
-   */
+  /** Extended Responses. */
   EXTENDED_RESPONSES(INFO_CTRL_PANEL_EXTENDED_RESPONSES_LABEL.get(),
   "extendedResponses"),
-  /**
-   * Modify DN Request.
-   */
+  /** Modify DN Request. */
   MOD_DN_REQUESTS(INFO_CTRL_PANEL_MOD_DN_REQUESTS_LABEL.get(),
   "modifyDNRequests"),
-  /**
-   * Modify DN Responses.
-   */
+  /** Modify DN Responses. */
   MOD_DN_RESPONSES(INFO_CTRL_PANEL_MOD_DN_RESPONSES_LABEL.get(),
   "modifyDNResponses"),
-  /**
-   * Modify Request.
-   */
+  /** Modify Request. */
   MOD_REQUESTS(INFO_CTRL_PANEL_MOD_REQUESTS_LABEL.get(),
   "modifyRequests"),
-  /**
-   * Modify Responses.
-   */
+  /** Modify Responses. */
   MOD_RESPONSES(INFO_CTRL_PANEL_MOD_RESPONSES_LABEL.get(),
   "modifyResponses"),
-  /**
-   * Search Request.
-   */
+  /** Search Request. */
   SEARCH_REQUESTS(INFO_CTRL_PANEL_SEARCH_REQUESTS_LABEL.get(),
   "searchRequests"),
-  /**
-   * Searches Done.
-   */
+  /** Searches Done. */
   SEARCH_DONE(INFO_CTRL_PANEL_SEARCH_DONE_LABEL.get(),
   "searchResultsDone"),
-  /**
-   * Unbind Request.
-   */
+  /** Unbind Request. */
   UNBIND_REQUESTS(INFO_CTRL_PANEL_UNBIND_REQUESTS_LABEL.get(),
   "unbindRequests"),;
 
@@ -284,55 +190,55 @@
     this.attributeName = attributeName;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getMessage()
   {
     return msg;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getAttributeName()
   {
     return attributeName;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isAborted()
   {
     return isAborted;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isNumeric()
   {
     return isNumeric;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isTime()
   {
     return isTime;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isGMTDate()
   {
     return isGMTDate;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isValueInBytes()
   {
     return isValueInBytes;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canHaveAverage()
   {
     return canHaveAverage;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isNumericDate()
   {
     return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
index f353444..2ef06b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BinaryValue.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -28,7 +28,6 @@
  * when the user wants to use the value in a file.  To be able to reflect
  * this this object is used: it contains the binary itself, the base 64
  * representation and the file that has been used.
- *
  */
 public class BinaryValue
 {
@@ -38,27 +37,16 @@
   private File file;
   private int hashCode;
 
-  /**
-   * The type of the binary value.
-   *
-   */
+  /** The type of the binary value. */
   public enum Type
   {
-    /**
-     * The binary value is provided as Base 64 string.
-     */
+    /** The binary value is provided as Base 64 string. */
     BASE64_STRING,
-    /**
-     * The binary value is provided as a byte array.
-     */
+    /** The binary value is provided as a byte array. */
     BYTE_ARRAY
   }
 
-  /**
-   * This is done to force the use of the factory methods (createBase64 and
-   * createFromFile).
-   *
-   */
+  /** This is done to force the use of the factory methods (createBase64 and createFromFile). */
   private BinaryValue()
   {
   }
@@ -158,7 +146,7 @@
     return file;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean equals(Object o)
   {
     if (this == o)
@@ -201,7 +189,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int hashCode()
   {
     return hashCode;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
index 17d32cf..acd41e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
@@ -12,25 +12,19 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
 
-/**
- * Class used in the combo box models.  It is used to have special rendering in
- * the combo boxes.
- */
+/** Class used in the combo box models. It is used to have special rendering in the combo boxes. */
 public class CategorizedComboBoxElement
 {
   private Object value;
   private Type type;
   private int hashCode;
 
-  /**
-   * The type of the element.
-   *
-   */
+  /** The type of the element. */
   public enum Type
   {
     /**
@@ -38,9 +32,7 @@
      * type category, for instance).
      */
     CATEGORY,
-    /**
-     * Regular type.
-     */
+    /** Regular type. */
     REGULAR
   }
 
@@ -74,7 +66,7 @@
     return type;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean equals(Object o)
   {
     if (o instanceof CategorizedComboBoxElement)
@@ -86,7 +78,7 @@
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int hashCode()
   {
     return hashCode;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
index 9e0dcd5..e28b4ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConfigReadException.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -20,10 +20,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.types.OpenDsException;
 
-/**
- * Exception that occurs reading the server configuration.
- *
- */
+/** Exception that occurs reading the server configuration. */
 public class ConfigReadException extends OpenDsException
 {
   private static final long serialVersionUID = 1266482779183126905L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
index 307ed5a..ea5c26c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerDescriptor.java
@@ -185,21 +185,18 @@
     this.monitoringEntries = Collections.unmodifiableSet(monitoringEntries);
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
     return hashCode;
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString()
   {
     return toString;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
index 2010047..06ae314 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
@@ -12,13 +12,11 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.guitools.controlpanel.datamodel;
 
 import static org.opends.messages.AdminToolMessages.*;
-
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -26,10 +24,9 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-/**
- * The table model used by the table that displays the connection handlers.
- *
- */
+import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor.State;
+
+/** The table model used by the table that displays the connection handlers. */
 public class ConnectionHandlerTableModel extends SortableTableModel
 implements Comparator<ConnectionHandlerDescriptor>
 {
@@ -40,9 +37,7 @@
   private int sortColumn;
   private boolean sortAscending = true;
 
-  /**
-   * Constructor for this table model.
-   */
+  /** Constructor for this table model. */
   public ConnectionHandlerTableModel()
   {
     this(true);
@@ -92,6 +87,7 @@
    * Updates the table model contents and sorts its contents depending on the
    * sort options set by the user.
    */
+  @Override
   public void forceResort()
   {
     updateDataArray();
@@ -107,6 +103,7 @@
    * are equivalent in terms of sorting and -1 if the second descriptor must
    * be put before the first descriptor.
    */
+  @Override
   public int compare(ConnectionHandlerDescriptor desc1,
       ConnectionHandlerDescriptor desc2)
   {
@@ -176,62 +173,48 @@
     return result;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int getColumnCount()
   {
     return 3;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getColumnName(int col) {
     return COLUMN_NAMES[col];
   }
 
-
-  /**
-   * Returns whether the sort is ascending or descending.
-   * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
-   * otherwise.
-   */
+  @Override
   public boolean isSortAscending()
   {
     return sortAscending;
   }
 
-  /**
-   * Sets whether to sort ascending of descending.
-   * @param sortAscending whether to sort ascending or descending.
-   */
+  @Override
   public void setSortAscending(boolean sortAscending)
   {
     this.sortAscending = sortAscending;
   }
 
-  /**
-   * Returns the column index used to sort.
-   * @return the column index used to sort.
-   */
+  @Override
   public int getSortColumn()
   {
     return sortColumn;
   }
 
-  /**
-   * Sets the column index used to sort.
-   * @param sortColumn column index used to sort..
-   */
+  @Override
   public void setSortColumn(int sortColumn)
   {
     this.sortColumn = sortColumn;
@@ -270,17 +253,13 @@
 
   private String getProtocolString(ConnectionHandlerDescriptor desc)
   {
-    String returnValue;
     switch (desc.getProtocol())
     {
     case OTHER:
-      returnValue = desc.getName();
-      break;
+      return desc.getName();
     default:
-      returnValue = desc.getProtocol().getDisplayMessage().toString();
-      break;
+      return desc.getProtocol().getDisplayMessage().toString();
     }
-    return returnValue;
   }
 
   private void updateDataArray()
@@ -290,28 +269,26 @@
     dataArray.clear();
     for (ConnectionHandlerDescriptor desc : sortedSet)
     {
-      String[] s = new String[3];
-      s[0] = getAddressPortString(desc);
-      s[1] = getProtocolString(desc);
+      dataArray.add(new String[] {
+        getAddressPortString(desc),
+        getProtocolString(desc),
+        toLabel(desc.getState())
+      });
+    }
+  }
 
-      switch (desc.getState())
-      {
-      case ENABLED:
-        s[2] = INFO_ENABLED_LABEL.get().toString();
-        break;
-
-      case DISABLED:
-        s[2] = INFO_DISABLED_LABEL.get().toString();
-        break;
-
-      case UNKNOWN:
-        s[2] = INFO_UNKNOWN_LABEL.get().toString();
-        break;
-
-      default:
-        throw new RuntimeException("Unknown state: "+desc.getState());
-      }
-      dataArray.add(s);
+  private String toLabel(State state)
+  {
+    switch (state)
+    {
+    case ENABLED:
+      return INFO_ENABLED_LABEL.get().toString();
+    case DISABLED:
+      return INFO_DISABLED_LABEL.get().toString();
+    case UNKNOWN:
+      return INFO_UNKNOWN_LABEL.get().toString();
+    default:
+      throw new RuntimeException("Unknown state: " + state);
     }
   }
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
index ec56332..28005cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlersMonitoringTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -28,17 +28,13 @@
 import static org.opends.guitools.controlpanel.util.Utilities.*;
 import static org.opends.messages.AdminToolMessages.*;
 
-/**
- * The table model used to display the monitoring information of connection
- * handlers.
- */
+/** The table model used to display the monitoring information of connection handlers. */
 public class ConnectionHandlersMonitoringTableModel extends
 MonitoringTableModel<ConnectionHandlerDescriptor,
 AddressConnectionHandlerDescriptor>
 {
   private static final long serialVersionUID = -8891998773191495L;
 
-  /** {@inheritDoc} */
   @Override
   protected Set<AddressConnectionHandlerDescriptor> convertToInternalData(
       Set<ConnectionHandlerDescriptor> newData)
@@ -63,7 +59,6 @@
     return newAddresses;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int compare(AddressConnectionHandlerDescriptor desc1,
       AddressConnectionHandlerDescriptor desc2)
@@ -105,7 +100,6 @@
     return getName(ach1).compareTo(getName(ach2));
   }
 
-  /** {@inheritDoc} */
   @Override
   protected CustomSearchResult getMonitoringEntry(
       AddressConnectionHandlerDescriptor ach)
@@ -113,7 +107,6 @@
     return ach.getMonitoringEntry();
   }
 
-  /** {@inheritDoc} */
   @Override
   protected String getName(AddressConnectionHandlerDescriptor ach)
   {
@@ -168,7 +161,6 @@
     return null;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getNameHeader()
   {
@@ -179,7 +171,6 @@
 /**
  * The table model has one line per address, this object represents that
  * address and all the associated monitoring information.
- *
  */
 class AddressConnectionHandlerDescriptor
 {
@@ -240,14 +231,12 @@
     return monitoringEntry;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
     return hashCode;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
index 5d0c352..8da3e7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionProtocolPolicy.java
@@ -12,40 +12,26 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
 
 
- /**
-  * Policy to follow to choose the protocol to be used.
-  *
-  * */
+ /** Policy to follow to choose the protocol to be used. */
 public enum ConnectionProtocolPolicy
 {
-  /**
-   * Force to use Start TLS.
-   */
+  /** Force to use Start TLS. */
   USE_STARTTLS,
-  /**
-   * Force to use LDAP.
-   */
+  /** Force to use LDAP. */
   USE_LDAP,
-  /**
-   * Force to use LDAPs.
-   */
+  /** Force to use LDAPs. */
   USE_LDAPS,
-  /**
-   * Force to use the Administration Connector.
-   */
+  /** Force to use the Administration Connector. */
   USE_ADMIN,
-  /**
-   * Use the most secure available (LDAPs, StartTLS and finally LDAP).
-   */
+  /** Use the most secure available (LDAPs, StartTLS and finally LDAP). */
   USE_MOST_SECURE_AVAILABLE,
-  /**
-   * Use the less secure available (LDAP, and then LDAPs).
-   */
+  /** Use the less secure available (LDAP, and then LDAPs). */
   USE_LESS_SECURE_AVAILABLE;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DatabaseMonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DatabaseMonitoringTableModel.java
index 3b80aae..8b0f77d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DatabaseMonitoringTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/DatabaseMonitoringTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -85,34 +85,29 @@
     fireTableDataChanged();
   }
 
-  /** {@inheritDoc} */
   @Override
   public int getColumnCount()
   {
     return columnNames.length;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /** {@inheritDoc} */
   @Override
   public String getColumnName(int col) {
     return columnNames[col];
   }
 
-  /** {@inheritDoc} */
   @Override
   public int compare(BackendDescriptor desc1, BackendDescriptor desc2)
   {
@@ -214,9 +209,7 @@
     }
   }
 
-  /**
-   * Updates the array data.  This includes resorting it.
-   */
+  /** Updates the array data. This includes resorting it. */
   private void updateDataArray()
   {
     TreeSet<BackendDescriptor> sortedSet = new TreeSet<>(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
index 31b8c7a..2e626a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -99,28 +99,24 @@
     fireTableDataChanged();
   }
 
-  /** {@inheritDoc} */
   @Override
   public int getColumnCount()
   {
     return columnNames.length;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /** {@inheritDoc} */
   @Override
   public String getColumnName(int col) {
     return columnNames[col];
@@ -220,9 +216,7 @@
     }
   }
 
-  /**
-   * Updates the array data.  This includes resorting it.
-   */
+  /** Updates the array data. This includes resorting it. */
   private void updateDataArray()
   {
     TreeSet<P> sortedSet = new TreeSet<>(this);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
index eb52b8a..736eec0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ObjectClassValue.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -70,13 +70,13 @@
     return structural;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int hashCode()
   {
     return hashCode;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean equals(Object o)
   {
     if (this == o)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java
index d497791..cb6eed8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ScheduleType.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
@@ -112,7 +112,7 @@
     return cronValue;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean equals(Object o)
   {
     if (o == this)
@@ -123,13 +123,13 @@
         && toString().equals(o.toString());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String toString()
   {
     return toString;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int hashCode()
   {
     return hashCode;
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 c818e51..1e2ed1c 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
@@ -305,7 +305,6 @@
     this.taskEntries = Collections.unmodifiableSet(taskEntries);
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o)
   {
@@ -337,7 +336,6 @@
         && desc.getTaskEntries().equals(getTaskEntries());
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
index 91c8492..a94584e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -31,17 +31,14 @@
  * of calls to the add/remove methods and a single call to notify that
  * things have changed is enough.
  *
- * @param <T>
+ * @param <T> type of the elements in this list model
  */
-public class SortableListModel<T> extends AbstractListModel
+public class SortableListModel<T> extends AbstractListModel<T>
 {
   private static final long serialVersionUID = 3241258779190228463L;
   private SortedSet<T> data = new TreeSet<>();
 
-  /**
-   * Returns the size of the list model.
-   * @return the size of the list model.
-   */
+  @Override
   public int getSize()
   {
     return data.size();
@@ -58,11 +55,7 @@
     data.addAll(copy);
   }
 
-  /**
-   * Returns the element at the specified index.
-   * @param i the index of the element.
-   * @return the element at the specified index.
-   */
+  @Override
   public T getElementAt(int i)
   {
     int index = 0;
@@ -98,10 +91,7 @@
     return data.remove(value);
   }
 
-  /**
-   * Clears the list model.
-   *
-   */
+  /** Clears the list model. */
   public void clear()
   {
     data.clear();
@@ -116,7 +106,7 @@
     data.addAll(newData);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void fireContentsChanged(Object source, int index0, int index1)
   {
     super.fireContentsChanged(source, index0, index1);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
index 6d3e81f..866dd70 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -27,9 +27,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.util.ServerConstants;
 
-/**
- * A generic interface that must implement table models that are sortable.
- */
+/** A generic interface that must implement table models that are sortable. */
 public abstract class SortableTableModel extends AbstractTableModel
 {
   private static final long serialVersionUID = 123129879083L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
index 9e6183f..5c55ed1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
@@ -12,13 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
 import static org.forgerock.util.Utils.*;
 import static org.opends.messages.AdminToolMessages.*;
 import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.util.CollectionUtils.*;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -28,57 +29,45 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.backends.task.TaskState;
 import org.opends.server.tools.tasks.TaskEntry;
 
-/**
- * The table used to display the tasks.
- *
- */
+/** The table used to display the tasks. */
 public class TaskTableModel  extends SortableTableModel
 implements Comparator<TaskEntry>
 {
   private static final long serialVersionUID = -351142550147124L;
-  private Set<TaskEntry> data = new HashSet<>();
-  private ArrayList<TaskEntry> dataSourceArray = new ArrayList<>();
+  private final Set<TaskEntry> data = new HashSet<>();
+  private final List<TaskEntry> dataSourceArray = new ArrayList<>();
 
-  LinkedHashSet<LocalizableMessage> displayedAttributes = new LinkedHashSet<>();
-  final LinkedHashSet<LocalizableMessage> defaultAttributes = new LinkedHashSet<>();
-  {
-    defaultAttributes.add(INFO_TASKINFO_FIELD_ID.get());
-    defaultAttributes.add(INFO_TASKINFO_FIELD_TYPE.get());
-    defaultAttributes.add(INFO_TASKINFO_FIELD_STATUS.get());
-    defaultAttributes.add(INFO_CTRL_PANEL_TASK_CANCELABLE.get());
-  }
-  LinkedHashSet<LocalizableMessage> allAttributes = new LinkedHashSet<>();
-  {
-    allAttributes.addAll(defaultAttributes);
-    allAttributes.add(INFO_TASKINFO_FIELD_SCHEDULED_START.get());
-    allAttributes.add(INFO_TASKINFO_FIELD_ACTUAL_START.get());
-    allAttributes.add(INFO_TASKINFO_FIELD_COMPLETION_TIME.get());
-    allAttributes.add(INFO_TASKINFO_FIELD_DEPENDENCY.get());
-    allAttributes.add(INFO_TASKINFO_FIELD_FAILED_DEPENDENCY_ACTION.get());
-    allAttributes.add(INFO_TASKINFO_FIELD_NOTIFY_ON_COMPLETION.get());
-    allAttributes.add(INFO_TASKINFO_FIELD_NOTIFY_ON_ERROR.get());
-  }
+  private final Set<LocalizableMessage> displayedAttributes = new LinkedHashSet<>();
+  private final Set<LocalizableMessage> defaultAttributes = newLinkedHashSet(
+      INFO_TASKINFO_FIELD_ID.get(),
+      INFO_TASKINFO_FIELD_TYPE.get(),
+      INFO_TASKINFO_FIELD_STATUS.get(),
+      INFO_CTRL_PANEL_TASK_CANCELABLE.get()
+  );
+  private LinkedHashSet<LocalizableMessage> allAttributes = newLinkedHashSet(
+      INFO_TASKINFO_FIELD_SCHEDULED_START.get(),
+      INFO_TASKINFO_FIELD_ACTUAL_START.get(),
+      INFO_TASKINFO_FIELD_COMPLETION_TIME.get(),
+      INFO_TASKINFO_FIELD_DEPENDENCY.get(),
+      INFO_TASKINFO_FIELD_FAILED_DEPENDENCY_ACTION.get(),
+      INFO_TASKINFO_FIELD_NOTIFY_ON_COMPLETION.get(),
+      INFO_TASKINFO_FIELD_NOTIFY_ON_ERROR.get()
+  );
 
   private String[] columnNames = {};
 
-  /**
-   * The sort column of the table.
-   */
+  /** The sort column of the table. */
   private int sortColumn;
-  /**
-   * Whether the sorting is ascending or descending.
-   */
+  /** Whether the sorting is ascending or descending. */
   private boolean sortAscending = true;
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public TaskTableModel()
   {
     super();
@@ -104,6 +93,7 @@
    * Updates the table model contents and sorts its contents depending on the
    * sort options set by the user.
    */
+  @Override
   public void forceResort()
   {
     updateDataArray();
@@ -121,9 +111,7 @@
     fireTableDataChanged();
   }
 
-  /**
-   * Updates the array data.  This includes resorting it.
-   */
+  /** Updates the array data. This includes resorting it. */
   private void updateDataArray()
   {
     TreeSet<TaskEntry> sortedSet = new TreeSet<>(this);
@@ -136,7 +124,7 @@
    * Sets the operations displayed by this table model.
    * @param attributes the attributes displayed by this table model.
    */
-  public void setAttributes(LinkedHashSet<LocalizableMessage> attributes)
+  public void setAttributes(Set<LocalizableMessage> attributes)
   {
     if (!allAttributes.containsAll(attributes))
     {
@@ -155,18 +143,18 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Class<?> getColumnClass(int column)
   {
     return LocalizableMessage.class;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getColumnName(int col) {
     return columnNames[col];
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getValueAt(int row, int column)
   {
     LocalizableMessage value;
@@ -225,6 +213,7 @@
    * Returns the row count.
    * @return the row count.
    */
+  @Override
   public int getRowCount()
   {
     return dataSourceArray.size();
@@ -234,6 +223,7 @@
    * Returns the column count.
    * @return the column count.
    */
+  @Override
   public int getColumnCount()
   {
     return columnNames.length;
@@ -253,7 +243,7 @@
    * Returns the set of attributes ordered.
    * @return the set of attributes ordered.
    */
-  public LinkedHashSet<LocalizableMessage> getDisplayedAttributes()
+  public Set<LocalizableMessage> getDisplayedAttributes()
   {
     return displayedAttributes;
   }
@@ -267,7 +257,7 @@
     return allAttributes;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int compare(TaskEntry desc1, TaskEntry desc2)
   {
     int result;
@@ -298,38 +288,25 @@
     return result;
   }
 
-  /**
-   * Returns whether the sort is ascending or descending.
-   * @return <CODE>true</CODE> if the sort is ascending and <CODE>false</CODE>
-   * otherwise.
-   */
+  @Override
   public boolean isSortAscending()
   {
     return sortAscending;
   }
 
-  /**
-   * Sets whether to sort ascending of descending.
-   * @param sortAscending whether to sort ascending or descending.
-   */
+  @Override
   public void setSortAscending(boolean sortAscending)
   {
     this.sortAscending = sortAscending;
   }
 
-  /**
-   * Returns the column index used to sort.
-   * @return the column index used to sort.
-   */
+  @Override
   public int getSortColumn()
   {
     return sortColumn;
   }
 
-  /**
-   * Sets the column index used to sort.
-   * @param sortColumn column index used to sort..
-   */
+  @Override
   public void setSortColumn(int sortColumn)
   {
     this.sortColumn = sortColumn;
@@ -362,24 +339,15 @@
 
   private LocalizableMessage getValue(List<String> values, LocalizableMessage valueIfEmpty)
   {
-    LocalizableMessage msg;
     if (values.isEmpty())
     {
-      msg = valueIfEmpty;
+      return valueIfEmpty;
     }
-    else
+    String s = joinAsString("<br>", values);
+    if (values.size() <= 1)
     {
-      String s = joinAsString("<br>", values);
-      if (values.size() > 1)
-      {
-        msg = LocalizableMessage.raw(
-            "<html>"+Utilities.applyFont(s, ColorAndFontConstants.tableFont));
-      }
-      else
-      {
-        msg = LocalizableMessage.raw(s);
-      }
+      return LocalizableMessage.raw(s);
     }
-    return msg;
+    return LocalizableMessage.raw("<html>" + Utilities.applyFont(s, ColorAndFontConstants.tableFont));
   }
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
index 3712121..930ebd4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -27,13 +27,12 @@
  * table that appears on the right side of the Manage Index dialog when the user
  * clicks on the node "VLV Indexes" and it gives a global view of the VLV
  * indexes defined on a given backend.
- *
  */
 public class VLVIndexTableModel extends AbstractIndexTableModel
 {
   private static final long serialVersionUID = 897379916278218775L;
 
-  /** {@inheritDoc} */
+  @Override
   protected String[] getColumnNames()
   {
     return new String[] {
@@ -55,6 +54,7 @@
    * are equivalent in terms of sorting and -1 if the second descriptor must
    * be put before the first descriptor.
    */
+  @Override
   public int compare(AbstractIndexDescriptor index1,
       AbstractIndexDescriptor index2)
   {
@@ -84,7 +84,7 @@
     return result;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String[] getLine(AbstractIndexDescriptor index)
   {
     VLVIndexDescriptor i = (VLVIndexDescriptor)index;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
index 8ce0e74..91aed9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVSortOrder.java
@@ -12,13 +12,11 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.datamodel;
 
-/**
- * Class that describes the VLV sort order.
- */
+/** Class that describes the VLV sort order. */
 public class VLVSortOrder
 {
   private String attributeName;
@@ -56,13 +54,13 @@
     return isAscending;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int hashCode()
   {
     return hashCode;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean equals(Object o)
   {
     if (o == this) {
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 96e0cbd..5e3b884 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
@@ -12,16 +12,12 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
 
-/**
- * The listeners that receive notifications when a set of backends are
- * populated.
- *
- */
+/** The listeners that receive notifications when a set of backends are populated. */
 public interface BackendPopulatedListener
 {
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
index fa84bda..0f3bd07 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BackupCreatedEvent.java
@@ -12,16 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
 
 import org.opends.guitools.controlpanel.datamodel.BackupDescriptor;
 
-/**
- * The event used to notify that a backup has been created.
- *
- */
+/** The event used to notify that a backup has been created. */
 public class BackupCreatedEvent
 {
   private BackupDescriptor newBackup;
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 89821fe..148157f 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
@@ -12,15 +12,12 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
 
-/**
- * The listeners that receive notifications when a backup is created.
- *
- */
+/** The listeners that receive notifications when a backup is created. */
 public interface BackupCreatedListener
 {
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java
index 167d43c..a9d62d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/BrowseActionListener.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -36,7 +36,6 @@
  * in the buttons and text fields so that a file chooser will be displayed
  * when the user clicks on the button and if the user chooses a file or a
  * directory the text field will be updated accordingly.
- *
  */
 public class BrowseActionListener implements ActionListener
 {
@@ -48,40 +47,22 @@
 
   private BrowseType type;
 
-  /**
-   * Enumeration used to specify which kind of file browser dialog must be
-   * displayed.
-   *
-   */
+  /** Enumeration used to specify which kind of file browser dialog must be displayed. */
   public enum BrowseType
   {
-    /**
-     * The Browser is used to retrieve a directory.
-     */
+    /** The Browser is used to retrieve a directory. */
     LOCATION_DIRECTORY,
-    /**
-     * The Browser is used to retrieve an LDIF file.
-     */
+    /** The Browser is used to retrieve an LDIF file. */
     OPEN_LDIF_FILE,
-    /**
-     * The Browser is used to retrieve a .zip file.
-     */
+    /** The Browser is used to retrieve a .zip file. */
     OPEN_ZIP_FILE,
-    /**
-     * The Browser is used to retrieve a generic file.
-     */
+    /** The Browser is used to retrieve a generic file. */
     OPEN_GENERIC_FILE,
-    /**
-     * The Browser is used to create a generic file.
-     */
+    /** The Browser is used to create a generic file. */
     CREATE_GENERIC_FILE,
-    /**
-     * The Browser is used to create an LDIF file.
-     */
+    /** The Browser is used to create an LDIF file. */
     CREATE_LDIF_FILE,
-    /**
-     * The Browser is used to create a generic directory.
-     */
+    /** The Browser is used to create a generic directory. */
     CREATE_DIRECTORY
   }
 
@@ -178,8 +159,8 @@
    * dialog.
    *
    * @param e the ActionEvent we receive.
-   *
    */
+  @Override
   public void actionPerformed(ActionEvent e)
   {
     int returnVal;
@@ -242,10 +223,7 @@
     }
   }
 
-  /**
-   * The method that is called after the text field is updated.
-   *
-   */
+  /** The method that is called after the text field is updated. */
   protected void fieldUpdated()
   {
   }
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 67418cc..18d1ba3 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
@@ -12,16 +12,12 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
 
-/**
- * Interface that must be implemented by the objects that want to receive
- * browse events.
- *
- */
+/** Interface that must be implemented by the objects that want to receive browse events. */
 public interface BrowserEventListener extends java.util.EventListener {
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
index b7606f7..4ac0d2a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -34,20 +34,19 @@
 /**
  * This class listens to events and displays a tooltip when the user clicks on
  * the object that registered this listener.
- *
  */
 public class ClickTooltipDisplayer extends MouseAdapter
 {
   private boolean isTooltipVisible;
   private Popup tipWindow;
 
-  /** {@inheritDoc} */
+  @Override
   public void mouseExited(MouseEvent event)
   {
     hideToolTip(event);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void mousePressed(MouseEvent event)
   {
     if (isTooltipVisible)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
index 9e5c05a..c18cad7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.event;
 
@@ -60,7 +60,7 @@
     list = new JList();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int selectionForKey(char key, ComboBoxModel model)
   {
     int selectedIndex = -1;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
index 8695e62..879f125 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -33,7 +33,6 @@
  * the scrollpane if no scrollbars are visible.  So the code basically adds
  * a component listener to the scroll pane and depending on whether the scroll
  * bars are displayed or not some border to the scroll pane is added (or not).
- *
  */
 public class ScrollPaneBorderListener extends ComponentAdapter
 {
@@ -42,10 +41,7 @@
   private Border etchedBorder = BorderFactory.createMatteBorder(0, 0, 1, 0,
       ColorAndFontConstants.defaultBorderColor);
 
-  /**
-   * Private constructor.
-   *
-   */
+  /** Private constructor. */
   private ScrollPaneBorderListener()
   {
   }
@@ -99,22 +95,19 @@
     return listener;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void componentShown(ComponentEvent ev)
   {
     updateBorder();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void componentHidden(ComponentEvent ev)
   {
     updateBorder();
   }
 
-  /**
-   * Updates the border depending on whether the scroll bars are visible or not.
-   *
-   */
+  /** Updates the border depending on whether the scroll bars are visible or not. */
   public void updateBorder()
   {
     boolean displayBorder = scroll.getVerticalScrollBar().isVisible() ||
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
index 585695f..b687da3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -22,11 +22,7 @@
 
 import javax.swing.text.JTextComponent;
 
-/**
- * A class used to be able to select the contents of the text field when
- * it gets the focus.
- *
- */
+/** A class used to be able to select the contents of the text field when it gets the focus. */
 public class TextComponentFocusListener implements FocusListener
 {
   private JTextComponent tf;
@@ -40,7 +36,7 @@
     this.tf = tf;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void focusGained(FocusEvent e)
   {
     if (tf.getText() == null || "".equals(tf.getText()))
@@ -55,7 +51,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void focusLost(FocusEvent e)
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
index 1bd0c67..c6ab786 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
@@ -49,10 +49,7 @@
 import org.forgerock.opendj.ldap.DN;
 import org.opends.server.util.ServerConstants;
 
-/**
- * The class that is in charge of adding a set of entries to a set of static
- * groups.
- */
+/** The class that is in charge of adding a set of entries to a set of static groups. */
 public class AddToGroupTask extends Task
 {
   private Set<String> backendSet;
@@ -89,37 +86,37 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.MODIFY_ENTRY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return AdminToolMessages.INFO_CTRL_PANEL_ADD_TO_GROUP_TASK_DESCRIPTION.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<>();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -141,13 +138,13 @@
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
@@ -167,6 +164,7 @@
 
           SwingUtilities.invokeLater(new Runnable()
           {
+            @Override
             public void run()
             {
               printEquivalentCommandToModify(groupDn, modifications, false);
@@ -182,6 +180,7 @@
 
           SwingUtilities.invokeLater(new Runnable()
           {
+            @Override
             public void run()
             {
               getProgressDialog().appendProgressHtml(
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
index 9b82aaa..0f7373b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -35,10 +35,7 @@
 import org.opends.server.tools.ManageTasks;
 import org.opends.server.tools.tasks.TaskEntry;
 
-/**
- * Task used to cancel tasks in server.
- *
- */
+/** Task used to cancel tasks in server. */
 public class CancelTaskTask extends Task
 {
   private Set<String> backendSet;
@@ -62,38 +59,38 @@
     this.tasks = new ArrayList<>(tasks);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     // TODO: change this
     return Type.MODIFY_ENTRY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_CANCEL_TASK_DESCRIPTION.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean regenerateDescriptor()
   {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<>();
@@ -114,7 +111,7 @@
     return args;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -134,7 +131,7 @@
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
@@ -146,6 +143,7 @@
 
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           getProgressDialog().getProgressBar().setIndeterminate(true);
@@ -158,6 +156,7 @@
         final boolean isFirst = numberCanceled == 0;
         SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
             if (isFirst)
@@ -187,6 +186,7 @@
           final int fNumberCanceled = numberCanceled;
           SwingUtilities.invokeLater(new Runnable()
           {
+            @Override
             public void run()
             {
               if (fNumberCanceled == 1)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 5b82c50..76dc89d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -55,9 +55,7 @@
 import org.opends.server.types.DirectoryException;
 import org.opends.server.util.ServerConstants;
 
-/**
- * The task that is launched when an entry must be deleted.
- */
+/** The task that is launched when an entry must be deleted. */
 public class DeleteEntryTask extends Task
 {
   private Set<String> backendSet;
@@ -113,37 +111,37 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.DELETE_ENTRY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_DELETE_ENTRY_TASK_DESCRIPTION.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<>();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -164,13 +162,13 @@
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
@@ -223,6 +221,7 @@
         toNotify.clear();
         SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
             notifyEntriesDeleted(fToNotify);
@@ -299,6 +298,7 @@
       // Only display the first entry equivalent command-line.
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           if (!equivalentCommandWithoutControlPrinted)
@@ -373,6 +373,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
             getProgressDialog().getProgressBar().setIndeterminate(false);
@@ -400,6 +401,7 @@
     //  Only display the first entry equivalent command-line.
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         if (!equivalentCommandWithControlPrinted)
@@ -456,6 +458,7 @@
     }
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         getProgressDialog().getProgressBar().setIndeterminate(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
index b0a8e23..34d4970 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -145,14 +145,12 @@
     this.attrsToDelete.addAll(allAttrsToDelete);
   }
 
-  /** {@inheritDoc} */
   @Override
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
@@ -170,14 +168,12 @@
     return canLaunch;
   }
 
-  /** {@inheritDoc} */
   @Override
   public Type getType()
   {
     return Type.NEW_SCHEMA_ELEMENT;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void runTask()
   {
@@ -196,21 +192,18 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected List<String> getCommandLineArguments()
   {
     return Collections.emptyList();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTaskDescription()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
index c59f252..a39f656 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
@@ -28,20 +28,12 @@
 import org.opends.guitools.controlpanel.ui.ProgressDialog;
 import org.forgerock.opendj.ldap.DN;
 
-/**
- * Abstract task used to factorize some code shared by different tasks involving
- * indexes.
- *
- */
+/** Abstract task used to factorize some code shared by different tasks involving indexes. */
 public abstract class IndexTask extends Task
 {
-  /**
-   * The set of backends that are affected by this task.
-   */
+  /** The set of backends that are affected by this task. */
   protected Set<String> backendSet;
-  /**
-   * The set of base DNs that are affected by this task.
-   */
+  /** The set of base DNs that are affected by this task. */
   protected Set<String> baseDNs;
 
   /**
@@ -112,7 +104,7 @@
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
index 6974f28..1e1a396 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
@@ -73,20 +73,20 @@
     this.newAttribute = newAttribute;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.MODIFY_SCHEMA_ELEMENT;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_MODIFY_ATTRIBUTE_TASK_DESCRIPTION.get(
         oldAttribute.getNameOrOID());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -103,25 +103,25 @@
     return canLaunch;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected List<String> getCommandLineArguments()
   {
     return Collections.emptyList();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     try
@@ -231,6 +231,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         getProgressDialog().appendProgressHtml(Utilities.applyFont(
@@ -247,6 +248,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         getProgressDialog().appendProgressHtml(Utilities.applyFont("<br><br>",
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
index bb5ae6a..c2dc769 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
@@ -71,20 +71,20 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.MODIFY_SCHEMA_ELEMENT;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_MODIFY_OBJECTCLASS_TASK_DESCRIPTION.get(
         oldObjectClass.getNameOrOID());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -101,25 +101,25 @@
     return canLaunch;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected List<String> getCommandLineArguments()
   {
     return Collections.emptyList();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     try
@@ -199,6 +199,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         getProgressDialog().appendProgressHtml(Utilities.applyFont(
@@ -215,6 +216,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         getProgressDialog().appendProgressHtml(Utilities.applyFont("<br><br>",
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 15e6213..7feffcd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -91,37 +91,37 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.NEW_ENTRY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_NEW_ENTRY_TASK_DESCRIPTION.get(dn);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<>();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -143,13 +143,13 @@
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
@@ -195,6 +195,7 @@
 
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           printEquivalentCommand();
@@ -210,6 +211,7 @@
 
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           getProgressDialog().appendProgressHtml(
@@ -270,10 +272,7 @@
     }
   }
 
-  /**
-   * Prints the equivalent command-line in the progress dialog.
-   *
-   */
+  /** Prints the equivalent command-line in the progress dialog. */
   private void printEquivalentCommand()
   {
     ArrayList<String> args = new ArrayList<>(getObfuscatedCommandLineArguments(
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index 9835084..c9f5e04 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -98,38 +98,38 @@
     useAdminCtx = controller.isConfigurationNode(node);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.MODIFY_ENTRY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_RESET_USER_PASSWORD_TASK_DESCRIPTION.get(
         node.getDN());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return getCommandLinePath("ldappasswordmodify");
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     ArrayList<String> args = new ArrayList<>();
@@ -150,7 +150,7 @@
     return args;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -172,7 +172,7 @@
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
index 73ba1dd..6a51229 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -29,10 +29,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The task called when we want to restart the server.
- *
- */
+/** The task called when we want to restart the server. */
 public class RestartServerTask extends StartStopTask
 {
   private boolean starting;
@@ -50,7 +47,7 @@
     startTask = new StartServerTask(info, dlg);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     if (starting)
@@ -63,13 +60,13 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_RESTART_SERVER_TASK_DESCRIPTION.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return null;
@@ -102,7 +99,7 @@
     return getCommandLinePath("stop-ds");
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
@@ -111,6 +108,7 @@
     final ProgressDialog dlg = getProgressDialog();
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         String cmdLine = getStopCommandLineName();
@@ -142,6 +140,7 @@
       {
         SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
             getProgressDialog().getProgressBar().setIndeterminate(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
index d41d57b..939796d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -25,10 +25,7 @@
 import org.opends.guitools.controlpanel.ui.ProgressDialog;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The task called when we want to start the server.
- *
- */
+/** The task called when we want to start the server. */
 public class StartServerTask extends StartStopTask
 {
 
@@ -42,25 +39,25 @@
     super(info, dlg);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.START_SERVER;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_START_SERVER_TASK_DESCRIPTION.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return getCommandLinePath("start-ds");
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     ArrayList<String> args = new ArrayList<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
index 35fadfa..787f158 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.task;
 
@@ -26,10 +26,7 @@
 import org.opends.guitools.controlpanel.ui.ProgressDialog;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * An abstract class used to re-factor some code between the start, stop and
- * restart tasks.
- */
+/** An abstract class used to re-factor some code between the start, stop and restart tasks. */
 public abstract class StartStopTask extends Task
 {
   Set<String> backendSet;
@@ -52,13 +49,13 @@
 
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -72,7 +69,7 @@
     return canLaunch;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     state = State.RUNNING;
@@ -100,7 +97,7 @@
     getInfo().startPooling();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
index fdbeecc..f625375 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -29,10 +29,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The task called when we want to start the server.
- *
- */
+/** The task called when we want to start the server. */
 public class StopServerTask extends StartStopTask
 {
 
@@ -46,20 +43,20 @@
     super(info, dlg);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Type getType()
   {
     return Type.STOP_SERVER;
   }
 
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_STOP_SERVER_TASK_DESCRIPTION.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void runTask()
   {
     super.runTask();
@@ -68,6 +65,7 @@
       // Verify that the server is actually stopped
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           getProgressDialog().appendProgressHtml(Utilities.applyFont(
@@ -78,7 +76,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getCommandLinePath()
   {
     return getCommandLinePath("stop-ds");
@@ -88,6 +86,7 @@
    * Method called just after calling the command-line.  To be overwritten
    * by the inheriting classes.
    */
+  @Override
   protected void postCommandLine()
   {
     if (returnCode != 0)
@@ -116,6 +115,7 @@
       {
         SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
             getProgressDialog().appendProgressHtml(
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
index 87be04a..889a8bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -46,23 +46,16 @@
  * class are the two panels that appear on the right side of the
  * 'Manage Indexes...' dialog when the user clicks on 'Indexes' or
  * 'VLV Indexes'.
- *
  */
 public abstract class AbstractBackendIndexesPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 2702054131388877743L;
   private String backendName;
-  /**
-   * The table model.
-   */
+  /** The table model. */
   protected AbstractIndexTableModel tableModel;
-  /**
-   * The table contained by this panel.
-   */
+  /** The table contained by this panel. */
   protected JTable table;
-  /**
-   * The scroll pane that contains the table.
-   */
+  /** The scroll pane that contains the table. */
   protected JScrollPane tableScroll;
   private Set<IndexSelectionListener> indexListeners = new HashSet<>();
   private int lastRowMouseOver = -1;
@@ -73,13 +66,13 @@
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return table;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     update(backendName);
@@ -100,6 +93,7 @@
       final BackendDescriptor b = backend;
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           updateTableModel(b);
@@ -137,13 +131,13 @@
    */
   protected abstract void updateTableModel(BackendDescriptor backend);
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No OK button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
@@ -173,10 +167,7 @@
    */
   protected abstract AbstractIndexTableModel getIndexTableModel();
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   *
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -195,6 +186,7 @@
     table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
     table.addMouseListener(new MouseAdapter()
     {
+      @Override
       public void mouseReleased(MouseEvent ev)
       {
         int selectedRow = table.getSelectedRow();
@@ -205,6 +197,7 @@
           SwingUtilities.invokeLater(new Runnable()
           {
             /** Call it this way to let the painting events happen. */
+            @Override
             public void run()
             {
               for (IndexSelectionListener listener : indexListeners)
@@ -218,12 +211,14 @@
     });
     table.addMouseMotionListener(new MouseMotionAdapter()
     {
+      @Override
       public void mouseMoved(MouseEvent ev)
       {
         lastRowMouseOver = table.rowAtPoint(ev.getPoint());
 
       }
 
+      @Override
       public void mouseDragged(MouseEvent ev)
       {
         lastRowMouseOver = -1;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
index 803e6d8..f7c3212 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -160,9 +160,7 @@
 
   private List<DN> otherBaseDns = new ArrayList<>();
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public AbstractBrowseEntriesPanel()
   {
     super();
@@ -571,14 +569,12 @@
     return buttonsPanel;
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return baseDNs;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void cancelClicked()
   {
@@ -781,7 +777,6 @@
    */
   protected abstract Component createMainPanel();
 
-  /** {@inheritDoc} */
   @Override
   public void backendPopulated(BackendPopulatedEvent ev)
   {
@@ -937,7 +932,6 @@
     controller.setMaxChildren(MAX_NUMBER_ENTRIES);
     controller.addBrowserEventListener(new BrowserEventListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void processBrowserEvent(BrowserEvent ev)
       {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
index 41f5fa8..c716f3d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -90,7 +90,7 @@
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     final ArrayList<LocalizableMessage> errors = new ArrayList<>();
@@ -99,6 +99,7 @@
     {
       BackgroundTask<Void> worker = new BackgroundTask<Void>()
       {
+        @Override
         public Void processBackgroundTask()
         {
           try
@@ -111,6 +112,7 @@
           checkSyntax(errors);
           return null;
         }
+        @Override
         public void backgroundTaskCompleted(Void returnValue, Throwable t)
         {
           if (t != null)
@@ -190,6 +192,7 @@
           Utilities.getParentDialog(this).setVisible(false);
           SwingUtilities.invokeLater(new Runnable()
           {
+            @Override
             public void run()
             {
               dlg.toFront();
@@ -209,7 +212,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     updateErrorPaneIfServerRunningAndAuthRequired(ev.getNewDescriptor(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
index 4460f44..32ec3cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
@@ -69,10 +69,7 @@
   private GenericDialog browseGroupDlg;
   private LDAPEntrySelectionPanel browseGroupPanel;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public AddToGroupPanel()
   {
     super();
@@ -109,19 +106,19 @@
     packParentDialog();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return groups;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     final ArrayList<LocalizableMessage> errors = new ArrayList<>();
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /** {@inheritDoc} */
+      @Override
       public Void processBackgroundTask()
       {
         try
@@ -134,7 +131,7 @@
         updateErrors(errors);
         return null;
       }
-      /** {@inheritDoc} */
+      @Override
       public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
         if (t != null)
@@ -153,20 +150,18 @@
     worker.startBackgroundTask();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_ADD_TO_GROUP_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -214,7 +209,7 @@
     add(browse, gbc);
     browse.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         browseGroupsClicked();
@@ -223,27 +218,27 @@
 
     DropTargetListener dropTargetlistener = new DropTargetListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void dragEnter(DropTargetDragEvent e)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dragExit(DropTargetEvent e)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dragOver(DropTargetDragEvent e)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dropActionChanged(DropTargetDragEvent e)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void drop(DropTargetDropEvent e)
       {
         try {
@@ -323,7 +318,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         setPrimaryValid(lGroups);
@@ -371,7 +366,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
+        @Override
         public void run()
         {
           setPrimaryInvalid(lGroups);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
index 6407db4..596b956 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
@@ -41,10 +41,7 @@
 import org.forgerock.opendj.ldap.schema.AttributeType;
 import org.opends.server.types.Schema;
 
-/**
- * Panel containing information about an attribute syntax.
- *
- */
+/** Panel containing information about an attribute syntax. */
 public class AttributeSyntaxPanel extends SchemaElementPanel
 {
   private static final long serialVersionUID = -2426247742251904863L;
@@ -55,45 +52,36 @@
   private JLabel description = Utilities.createDefaultLabel();
   private JList usedByAttributes = new JList(new DefaultListModel());
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public AttributeSyntaxPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return usedByAttributes;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -160,7 +148,6 @@
 
     KeyAdapter keyListener = new KeyAdapter()
     {
-      /** {@inheritDoc} */
       @Override
       public void keyTyped(KeyEvent ev)
       {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
index fac9421..e593184 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -26,10 +26,7 @@
 import org.opends.messages.AdminToolMessages;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * Panel displaying a table containing the indexes of a backend.
- *
- */
+/** Panel displaying a table containing the indexes of a backend. */
 public class BackendIndexesPanel extends AbstractBackendIndexesPanel
 {
   private static final long serialVersionUID = 7214847636854721907L;
@@ -40,19 +37,19 @@
     super();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return AdminToolMessages.INFO_CTRL_PANEL_BACKEND_INDEXES_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected AbstractIndexTableModel getIndexTableModel()
   {
     return new IndexTableModel();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void updateTableModel(BackendDescriptor backend)
   {
     tableModel.setData(
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
index 98037ff..2ab17ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -26,10 +26,7 @@
 import org.opends.messages.AdminToolMessages;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * Panel displaying a table containing the VLV indexes of a backend.
- *
- */
+/** Panel displaying a table containing the VLV indexes of a backend. */
 public class BackendVLVIndexesPanel extends AbstractBackendIndexesPanel
 {
   private static final long serialVersionUID = -5864660402543106492L;
@@ -40,19 +37,19 @@
     super();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return AdminToolMessages.INFO_CTRL_PANEL_BACKEND_VLV_INDEXES_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected AbstractIndexTableModel getIndexTableModel()
   {
     return new VLVIndexTableModel();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void updateTableModel(BackendDescriptor backend)
   {
     tableModel.setData(
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
index 0700b85..bfbadfb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -63,10 +63,7 @@
 import org.opends.server.types.BackupInfo;
 import org.opends.server.util.ServerConstants;
 
-/**
- * The panel that appears when the user clicks on 'Backup...'.
- *
- */
+/** The panel that appears when the user clicks on 'Backup...'. */
 public class BackupPanel extends BackupListPanel
 {
   private static final long serialVersionUID = -1626301350756394814L;
@@ -97,38 +94,32 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BackupPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_BACKUP_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return backupID;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void verifyBackupClicked()
   {
     // Nothing to do: the button is not visible.
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   *
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -283,7 +274,7 @@
 
     changeListener = new ChangeListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void stateChanged(ChangeEvent ev)
       {
         backends.setEnabled(!allBackends.isSelected());
@@ -310,7 +301,7 @@
   }
 
   /**
-   * Check status of incremental backup radio/checkbox
+   * Check status of incremental backup radio/checkbox.
    *
    * @return boolean true if both incremental and parent base ID
    *                  are selected
@@ -321,14 +312,14 @@
             incrementalBackup.isSelected();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
     updateSimpleBackendComboBoxModel(backends, lNoBackendsFound, desc);
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         allBackends.setVisible(backends.getModel().getSize() > 0);
@@ -351,7 +342,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     setPrimaryValid(lBackend);
@@ -460,7 +451,7 @@
     final String path = parentDirectory.getText();
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /** {@inheritDoc} */
+      @Override
       public Void processBackgroundTask() throws Throwable
       {
         // Open the backup directory and make sure it is valid.
@@ -509,7 +500,7 @@
             errors.add(ERR_CTRL_PANEL_BACKUP_ID_ALREADY_EXIST.get(id, path));
             SwingUtilities.invokeLater(new Runnable()
             {
-              /** {@inheritDoc} */
+              @Override
               public void run()
               {
                 setPrimaryInvalid(lBackupID);
@@ -520,7 +511,7 @@
         }
         return null;
       }
-      /** {@inheritDoc} */
+      @Override
       public void backgroundTaskCompleted(Void returnValue,
           Throwable t)
       {
@@ -587,7 +578,7 @@
     return schedulePanel.getSchedule();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     setPrimaryValid(lBackend);
@@ -598,7 +589,7 @@
     super.cancelClicked();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
@@ -612,10 +603,7 @@
     }
   }
 
-  /**
-   * Initialize the backup ID field with a value.
-   *
-   */
+  /** Initialize the backup ID field with a value. */
   private void initializeBackupID()
   {
     SimpleDateFormat dateFormat = new SimpleDateFormat(
@@ -624,10 +612,7 @@
     backupID.setText(id);
   }
 
-  /**
-   * Class that launches the backup.
-   *
-   */
+  /** Class that launches the backup. */
   protected class BackupTask extends Task
   {
     private Set<String> backendSet;
@@ -674,20 +659,20 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Type getType()
     {
       return Type.BACKUP;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_BACKUP_TASK_DESCRIPTION.get(
       Utilities.getStringFromCollection(backendSet, ", "), dir);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -706,7 +691,7 @@
       return canLaunch;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void runTask()
     {
       state = State.RUNNING;
@@ -750,13 +735,13 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<>();
@@ -830,7 +815,7 @@
       return args;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected String getCommandLinePath()
     {
       return getCommandLinePath("backup");
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
index a9c8a76..00d8eb6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
@@ -39,17 +39,14 @@
   private JLabel dnLabel;
   private String baseDn;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BaseDNPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_OTHER_BASE_DN_TITLE.get();
@@ -64,9 +61,7 @@
     return baseDn;
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -89,18 +84,18 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return dn;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     setPrimaryValid(dnLabel);
@@ -137,7 +132,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     setPrimaryValid(dnLabel);
@@ -145,7 +140,7 @@
     super.cancelClicked();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
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 4457dbf..78b0f11 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -72,10 +72,7 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BinaryAttributeEditorPanel()
   {
     super();
@@ -94,7 +91,6 @@
 //  Read the file or encode the base 64 content.
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /** {@inheritDoc} */
       @Override
       public Void processBackgroundTask() throws Throwable
       {
@@ -159,7 +155,6 @@
         return null;
       }
 
-      /** {@inheritDoc} */
       @Override
       public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
@@ -205,14 +200,12 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return file;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void cancelClicked()
   {
@@ -229,7 +222,6 @@
     return value;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
@@ -311,7 +303,6 @@
       // Read the file or encode the base 64 content.
       BackgroundTask<BinaryValue> worker = new BackgroundTask<BinaryValue>()
       {
-        /** {@inheritDoc} */
         @Override
         public BinaryValue processBackgroundTask() throws Throwable
         {
@@ -377,7 +368,6 @@
           return returnValue;
         }
 
-        /** {@inheritDoc} */
         @Override
         public void backgroundTaskCompleted(BinaryValue returnValue, Throwable t)
         {
@@ -423,14 +413,12 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
@@ -446,16 +434,13 @@
     return valueChanged;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean requiresScroll()
   {
     return true;
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -538,7 +523,6 @@
     add(Box.createHorizontalGlue(), gbc);
     refreshButton.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void actionPerformed(ActionEvent ev)
       {
@@ -570,10 +554,7 @@
     useBase64.addActionListener(listener);
   }
 
-  /**
-   * Updates the enabling state of all the components in the panel.
-   *
-   */
+  /** Updates the enabling state of all the components in the panel. */
   private void updateEnabling()
   {
     base64.setEnabled(useBase64.isSelected());
@@ -644,7 +625,6 @@
    * Class used to refresh automatically the contents in the panel after the
    * user provides a path value through the JFileChooser associated with the
    * browse button.
-   *
    */
   class CustomBrowseActionListener extends BrowseActionListener
   {
@@ -661,7 +641,6 @@
       super(field, type, parent);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void fieldUpdated()
     {
@@ -675,10 +654,7 @@
     }
   }
 
-  /**
-   * Called when the refresh button is clicked by the user.
-   *
-   */
+  /** Called when the refresh button is clicked by the user. */
   private void refreshButtonClicked()
   {
     refresh(false, true);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
index 99c947d..fc8ed38 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -34,10 +34,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.opends.server.types.Schema;
 
-/**
- * The panel used to display a binary value.
- *
- */
+/** The panel used to display a binary value. */
 public class BinaryValuePanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 2536360199438858665L;
@@ -50,10 +47,7 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BinaryValuePanel()
   {
     super();
@@ -71,7 +65,7 @@
     lastBytes = bytes;
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /** {@inheritDoc} */
+      @Override
       public Void processBackgroundTask() throws Throwable
       {
         try
@@ -102,7 +96,7 @@
         return null;
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
         displayMainPanel();
@@ -124,44 +118,42 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return base64;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No OK Button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_VIEW_BINARY_ATTRIBUTE_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index c7d71d6..9578817 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -146,7 +146,7 @@
 
   private boolean forceRefreshWhenOpening;
 
-  /** {@inheritDoc} */
+  @Override
   public JMenuBar getMenuBar()
   {
     if (menuBar == null)
@@ -157,31 +157,31 @@
     return menuBar;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_MANAGE_ENTRIES_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getBrowseButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void createBrowserController(ControlPanelInfo info)
   {
     super.createBrowserController(info);
     entryPane.setController(controller);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
@@ -201,7 +201,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createMainPanel()
   {
     JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
@@ -245,7 +245,7 @@
   {
     TreeSelectionListener treeSelectionListener = new TreeSelectionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void valueChanged(TreeSelectionEvent ev)
       {
         if (ignoreTreeSelectionEvents)
@@ -358,12 +358,12 @@
     final DragSource dragSource = DragSource.getDefaultDragSource();
     final DragSourceListener dragSourceListener = new DragSourceListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void dragDropEnd(DragSourceDropEvent dsde)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dragEnter(DragSourceDragEvent dsde)
       {
         DragSourceContext context = dsde.getDragSourceContext();
@@ -382,24 +382,24 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dragOver(DragSourceDragEvent dsde)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dropActionChanged(DragSourceDragEvent dsde)
       {
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void dragExit(DragSourceEvent dsde)
       {
       }
     };
     final DragGestureListener dragGestureListener = new DragGestureListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void dragGestureRecognized(DragGestureEvent e)
       {
         //Get the selected node
@@ -429,14 +429,14 @@
     );
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
     entryPane.setInfo(info);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
@@ -585,6 +585,7 @@
         LDAPEntryReader reader;
         CustomSearchResult sr;
         Throwable t;
+        @Override
         public void run()
         {
           while (true)
@@ -610,6 +611,7 @@
               }
               SwingUtilities.invokeAndWait(new Runnable()
               {
+                @Override
                 public void run()
                 {
                   reader.backgroundTaskCompleted(sr, t);
@@ -635,10 +637,7 @@
     }
   }
 
-  /**
-   * Adds a pop up menu to the tree.
-   *
-   */
+  /** Adds a pop up menu to the tree. */
   private void addPopupMenu()
   {
     popup = new JPopupMenu();
@@ -647,7 +646,7 @@
         INFO_CTRL_PANEL_NEW_USER_MENU.get());
     popupNewUserMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newUser();
@@ -660,7 +659,7 @@
         INFO_CTRL_PANEL_NEW_GROUP_MENU.get());
     popupNewGroupMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newGroup();
@@ -673,7 +672,7 @@
         INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU.get());
     popupNewOUMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newOrganizationalUnit();
@@ -686,7 +685,7 @@
         INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU.get());
     popupNewOrganizationMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newOrganization();
@@ -699,7 +698,7 @@
         INFO_CTRL_PANEL_NEW_DOMAIN_MENU.get());
     popupNewDomainMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newDomain();
@@ -712,7 +711,7 @@
         INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU.get());
     popupNewEntryFromLDIFMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newEntryFromLDIF();
@@ -725,7 +724,7 @@
         INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU.get());
     popupResetUserPasswordMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         resetUserPassword();
@@ -739,7 +738,7 @@
         INFO_CTRL_PANEL_ADD_TO_GROUP_MENU.get());
     popupAddToGroupMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         addToGroup();
@@ -754,7 +753,7 @@
         INFO_CTRL_PANEL_DUPLICATE_ENTRY_MENU.get());
     popupDuplicateEntryMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         duplicateEntry();
@@ -766,7 +765,7 @@
         INFO_CTRL_PANEL_COPY_DN_MENU.get());
     popupCopyDNMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         copyDN();
@@ -781,7 +780,7 @@
         INFO_CTRL_PANEL_DELETE_ENTRY_MENU.get());
     popupDeleteMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         deleteClicked();
@@ -869,9 +868,7 @@
     {
       newGroupPanel = new NewGroupPanel();
       newGroupPanel.setInfo(getInfo());
-      /* First argument:  Component to associate the target with
-       * Second argument: DropTargetListener
-       */
+      /* First argument: Component to associate the target with Second argument: DropTargetListener */
       newGroupDlg = new GenericDialog(Utilities.getFrame(this), newGroupPanel);
       Utilities.centerGoldenMean(newGroupDlg,
           Utilities.getParentDialog(this));
@@ -1041,7 +1038,7 @@
   {
     ClipboardOwner owner = new ClipboardOwner()
     {
-      /** {@inheritDoc} */
+      @Override
       public void lostOwnership( Clipboard aClipboard,
           Transferable aContents) {
         //do nothing
@@ -1103,10 +1100,7 @@
     frame.setVisible(true);
   }
 
-  /**
-   * The specific menu bar of this panel.
-   *
-   */
+  /** The specific menu bar of this panel. */
   class BrowseMenuBar extends GenericMenuBar
   {
     private static final long serialVersionUID = 505187832236882370L;
@@ -1150,7 +1144,7 @@
           INFO_CTRL_PANEL_NEW_BROWSER_WINDOW_MENU.get());
       newWindow.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newWindow();
@@ -1162,7 +1156,7 @@
           INFO_CTRL_PANEL_CLOSE_MENU.get());
       close.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           closeClicked();
@@ -1205,7 +1199,7 @@
       {
         private boolean ignoreEvents;
         private JRadioButtonMenuItem lastSelected = menus[0];
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           if (ignoreEvents)
@@ -1259,6 +1253,7 @@
           entryPane.getController().getFollowReferrals());
       sortUserData.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           try
@@ -1275,6 +1270,7 @@
       });
       followReferrals.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           try
@@ -1297,6 +1293,7 @@
       menu.add(refresh);
       refresh.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           refreshClicked();
@@ -1320,7 +1317,7 @@
           INFO_CTRL_PANEL_NEW_USER_MENU.get());
       newUserMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newUser();
@@ -1333,7 +1330,7 @@
           INFO_CTRL_PANEL_NEW_GROUP_MENU.get());
       newGroupMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newGroup();
@@ -1346,7 +1343,7 @@
           INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU.get());
       newOUMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newOrganizationalUnit();
@@ -1359,7 +1356,7 @@
           INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU.get());
       newOrganizationMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newOrganization();
@@ -1372,7 +1369,7 @@
           INFO_CTRL_PANEL_NEW_DOMAIN_MENU.get());
       newDomainMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newDomain();
@@ -1385,7 +1382,7 @@
           INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU.get());
       newEntryFromLDIFMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           newEntryFromLDIF();
@@ -1397,7 +1394,7 @@
           INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU.get());
       resetPasswordMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           resetUserPassword();
@@ -1410,7 +1407,7 @@
           INFO_CTRL_PANEL_ADD_TO_GROUP_MENU.get());
       addToGroupMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           addToGroup();
@@ -1425,7 +1422,7 @@
           INFO_CTRL_PANEL_DUPLICATE_ENTRY_MENU.get());
       duplicateEntryMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           duplicateEntry();
@@ -1438,7 +1435,7 @@
           INFO_CTRL_PANEL_COPY_DN_MENU.get());
       copyDNMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           copyDN();
@@ -1451,7 +1448,7 @@
           INFO_CTRL_PANEL_DELETE_ENTRY_MENU.get());
       deleteMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           deleteClicked();
@@ -1464,7 +1461,7 @@
           INFO_CTRL_PANEL_DELETE_BASE_DN_MENU.get());
       deleteBaseDNMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           deleteBaseDN();
@@ -1477,7 +1474,7 @@
           INFO_CTRL_PANEL_DELETE_BACKEND_MENU.get());
       deleteBackendMenuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           deleteBackend();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
index 67eda8b..71260da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
@@ -213,6 +213,7 @@
 
     treePane.getTree().addTreeSelectionListener(new TreeSelectionListener()
     {
+      @Override
       public void valueChanged(TreeSelectionEvent ev)
       {
         if (!ignoreSelectionEvents)
@@ -254,7 +255,7 @@
     entryPane.setInfo(info);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor server = ev.getNewDescriptor();
@@ -265,6 +266,7 @@
 
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           String serverName = getServerName(lastServer);
@@ -333,6 +335,7 @@
     final LocalizableMessage fErrorDetails = errorDetails;
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         errorPane.setVisible(fDisplayErrorPane);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
index bcd573e..9509cbf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -74,10 +74,7 @@
 import org.opends.guitools.controlpanel.util.ViewPositions;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The pane that is displayed when the user clicks on 'Browse Indexes'.
- *
- */
+/** The pane that is displayed when the user clicks on 'Browse Indexes'. */
 public class BrowseIndexPanel extends StatusGenericPanel
 implements IndexModifiedListener
 {
@@ -118,29 +115,26 @@
 
   private boolean firstTreeRepopulate = true;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BrowseIndexPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresBorder()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
@@ -155,9 +149,7 @@
     }
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     setBackground(ColorAndFontConstants.greyBackground);
@@ -185,7 +177,7 @@
     backends.setModel(new DefaultComboBoxModel(new String[]{}));
     ItemListener comboListener = new ItemListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void itemStateChanged(ItemEvent ev)
       {
         if (!ignoreSelectionEvents &&
@@ -209,7 +201,7 @@
     newIndex.setOpaque(false);
     newIndex.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newIndexClicked();
@@ -224,7 +216,7 @@
     newVLVIndex.setOpaque(false);
     newVLVIndex.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newVLVIndexClicked();
@@ -247,31 +239,31 @@
     add(createSplitPane(), gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_MANAGE_INDEXES_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return backends;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void closeClicked()
   {
     super.closeClicked();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
@@ -290,7 +282,7 @@
 
     entryPane.addIndexSelectionListener(new IndexSelectionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void indexSelected(IndexSelectionEvent ev)
       {
         AbstractIndexDescriptor index = ev.getIndex();
@@ -329,7 +321,7 @@
 
     treePane.getTree().addTreeSelectionListener(new TreeSelectionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void valueChanged(TreeSelectionEvent ev)
       {
         if (!ignoreSelectionEvents)
@@ -419,7 +411,7 @@
     return pane;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -428,7 +420,7 @@
     info.addIndexModifiedListener(this);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ignoreSelectionEvents = true;
@@ -438,10 +430,7 @@
     refreshContents(desc);
   }
 
-  /**
-   * Adds a pop up menu.
-   *
-   */
+  /** Adds a pop up menu. */
   private void addPopupMenu()
   {
     final JPopupMenu popup = new JPopupMenu();
@@ -449,7 +438,7 @@
         INFO_CTRL_PANEL_NEW_INDEX_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newIndexClicked();
@@ -460,7 +449,7 @@
         INFO_CTRL_PANEL_NEW_VLV_INDEX_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         newVLVIndexClicked();
@@ -472,7 +461,7 @@
         INFO_CTRL_PANEL_DELETE_INDEX_MENU.get());
     deleteMenuItem.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         deleteClicked();
@@ -492,7 +481,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         repopulateTree(treePane.getTree());
@@ -518,13 +507,13 @@
     });
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void indexModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void backendIndexesModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
@@ -662,6 +651,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         if (firstTreeRepopulate)
@@ -678,10 +668,7 @@
     ignoreSelectionEvents = false;
   }
 
-  /**
-   * Updates the contents of the right panel.
-   *
-   */
+  /** Updates the contents of the right panel. */
   private void updateEntryPane()
   {
     ViewPositions pos = Utilities.getViewPositions(entryPane);
@@ -752,6 +739,7 @@
       newIndexPanel.addConfigurationElementCreatedListener(
           new ConfigurationElementCreatedListener()
           {
+            @Override
             public void elementCreated(ConfigurationElementCreatedEvent ev)
             {
               Object o = ev.getConfigurationObject();
@@ -792,7 +780,7 @@
       newVLVIndexPanel.addConfigurationElementCreatedListener(
           new ConfigurationElementCreatedListener()
           {
-            /** {@inheritDoc} */
+            @Override
             public void elementCreated(ConfigurationElementCreatedEvent ev)
             {
               Object o = ev.getConfigurationObject();
@@ -914,7 +902,7 @@
 
     private static final long serialVersionUID = -6953837045703643228L;
 
-    /** {@inheritDoc} */
+    @Override
     public Component getTreeCellRendererComponent(JTree tree, Object value,
         boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
         boolean hasFocus)
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 eed5e15..1b32968 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -31,25 +31,16 @@
 
 import org.opends.guitools.controlpanel.util.Utilities;
 
-/**
- * Class containing some Fonts and Colors used in the Control Panel.
- *
- */
+/** Class containing some Fonts and Colors used in the Control Panel. */
 public class ColorAndFontConstants
 {
-  /**
-   * Foreground color (the color of normal text).
-   */
+  /** Foreground color (the color of normal text). */
   public static final Color foreground =
     UIManager.getColor("TextField.foreground");
-  /**
-   * Background color (the color of the panels).
-   */
+  /** Background color (the color of the panels). */
   public static final Color background;
   private static Color toggleButtonColor;
-  /**
-   * The border to be used for a text area.
-   */
+  /** The border to be used for a text area. */
   public static final Border textAreaBorder;
   static
   {
@@ -97,18 +88,12 @@
     textAreaBorder = border;
     background = bg;
   }
-  /**
-   * The text color of buttons.
-   */
+  /** The text color of buttons. */
   public static final Color buttonForeground =
     UIManager.getColor("Button.foreground");
-  /**
-   * The text color of the category items.
-   */
+  /** The text color of the category items. */
   public static final Color categoryForeground = foreground;
-  /**
-   * The text color of the BasicExpander components.
-   */
+  /** The text color of the BasicExpander components. */
   public static final Color expanderForeground = foreground;
   /**
    * The grey color background that is used for instance as background for the
@@ -118,33 +103,21 @@
   UIManager.getColor("MenuBar.background") :
     UIManager.getColor("Panel.background");
 
-  /**
-   * The default border color.
-   */
+  /** The default border color. */
   public static final Color defaultBorderColor =
   Utilities.deriveColorHSB(toggleButtonColor, 0, 0, -.2f);
 
-  /**
-   * The grid color for the table.
-   */
+  /** The grid color for the table. */
   public static final Color gridColor =
   isMacOS() ? defaultBorderColor :
   UIManager.getColor("Table.gridColor");
-  /**
-   * The color of the text in the table.
-   */
+  /** The color of the text in the table. */
   public static final Color tableForeground = foreground;
-  /**
-   * The background color of the table.
-   */
+  /** The background color of the table. */
   public static final Color tableBackground = background;
-  /**
-   * The text color of the tree.
-   */
+  /** The text color of the tree. */
   public static final Color treeForeground = foreground;
-  /**
-   * The background color of the tree.
-   */
+  /** The background color of the tree. */
   public static final Color treeBackground = background;
   /**
    * The color of the background when the mouse is over (this is used in some
@@ -153,9 +126,7 @@
    */
   public static final Color mouseOverBackground =
   UIManager.getColor("TextField.selectionBackground");
-  /**
-   * Text color indicating that a field is valid.
-   */
+  /** Text color indicating that a field is valid. */
   public static final Color validFontColor = foreground;
 
   /**
@@ -182,77 +153,43 @@
     Utilities.deriveColorHSB(mouseOverForeground,
         0, 0, +.20f);
 
-  /**
-   * The default font of the labels.
-   */
+  /** The default font of the labels. */
   public static final Font defaultFont = UIManager.getFont("Label.font");
-  /**
-   * The font of the BasicExpander component.
-   */
+  /** The font of the BasicExpander component. */
   public static final Font expanderFont = defaultFont.deriveFont(Font.BOLD);
-  /**
-   * The in-line help font.
-   */
+  /** The in-line help font. */
   public static final Font inlineHelpFont = defaultFont.deriveFont(
   (float)(defaultFont.getSize() - 2));
-  /**
-   * The font of the table header.
-   */
+  /** The font of the table header. */
   public static final Font headerFont =
   UIManager.getFont("TableHeader.font").deriveFont(Font.BOLD);
-  /**
-   * The font to be used in the title of the error panes.
-   */
+  /** The font to be used in the title of the error panes. */
   public static final Font errorTitleFont =
   defaultFont.deriveFont(Font.BOLD).deriveFont(13f);
-  /**
-   * The font to be used in the CategoryButton component.
-   */
+  /** The font to be used in the CategoryButton component. */
   public static final Font categoryFont =
     UIManager.getFont("Label.font").deriveFont(Font.BOLD);
-  /**
-   * The top border of the accordion component.
-   */
+  /** The top border of the accordion component. */
   public static final Color topAccordionBorderColor = Utilities.deriveColorHSB(
       toggleButtonColor, 0, 0, .2f);
-  /**
-   * The font to be used in primary labels.
-   */
+  /** The font to be used in primary labels. */
   public static final Font primaryFont = defaultFont.deriveFont(Font.BOLD);
-  /**
-   * The font to be used in the tree.
-   */
+  /** The font to be used in the tree. */
   public static final Font treeFont = UIManager.getFont("Tree.font");
-  /**
-   * The font to be used in the table.
-   */
+  /** The font to be used in the table. */
   public static final Font tableFont = UIManager.getFont("Table.font");
-  /**
-   * The font to be used in the title of the TitlePanel component.
-   */
+  /** The font to be used in the title of the TitlePanel component. */
   public static final Font titleFont =
   defaultFont.deriveFont(Font.BOLD).deriveFont(14f);
-  /**
-   * Text color indicating that a field is not valid.
-   */
+  /** Text color indicating that a field is not valid. */
   public static final Color invalidFontColor = Color.red;
-  /**
-   * The font to be used when the field associated with a primary label is not
-   * valid.
-   */
+  /** The font to be used when the field associated with a primary label is not valid. */
   public static final Font primaryInvalidFont =
     primaryFont.deriveFont(Font.ITALIC);
-  /**
-   * The font to be used when the field associated with a normal label is not
-   * valid.
-   */
+  /** The font to be used when the field associated with a normal label is not valid. */
   public static final Font invalidFont = defaultFont.deriveFont(Font.ITALIC);
-  /**
-   * The font to be used in the progress dialog's 'Details' section.
-   */
+  /** The font to be used in the progress dialog's 'Details' section. */
   public static final Font progressFont = UIManager.getFont("EditorPane.font");
-  /**
-   * Specifies the font for the command-line output in the detail panel.
-   */
+  /** Specifies the font for the command-line output in the detail panel. */
   public static final Font outputFont = Font.decode("Monospaced-PLAIN-12");
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
index eab2c8d..b6e8cb9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
@@ -12,21 +12,19 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
 import static org.opends.messages.AdminToolMessages.*;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The panel that displays a configuration attribute definition.
- */
+/** The panel that displays a configuration attribute definition. */
 public class ConfigurationAttributePanel extends StandardAttributePanel
 {
   private static final long serialVersionUID = -6072885354690411482L;
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CONFIGURATION_ATTRIBUTE_TITLE.get();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
index e2d11e4..b3c304c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
@@ -12,21 +12,19 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
 import static org.opends.messages.AdminToolMessages.*;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The panel that displays a configuration objectclass definition.
- */
+/** The panel that displays a configuration objectclass definition. */
 public class ConfigurationObjectClassPanel extends StandardObjectClassPanel
 {
   private static final long serialVersionUID = 8875851764570955881L;
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CONFIGURATION_OBJECTCLASS_TITLE.get();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
index 5b03881..6f8de1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -41,27 +41,17 @@
  * It proposes the user to save the changes, do not save them or cancel the
  * action that make the dialog appear (for instance when the user is editing
  * an entry and clicks on another node, this dialog appears).
- *
  */
 public class ConfirmInitializeAndImportDialog extends GenericDialog
 {
-  /**
-   * The different input that the user can provide.
-   *
-   */
+  /** The different input that the user can provide. */
   public enum Result
   {
-    /**
-     * The user asks to do the import and then the initialization.
-     */
+    /** The user asks to do the import and then the initialization. */
     INITIALIZE_ALL,
-    /**
-     * The user asks to only do the import locally.
-     */
+    /** The user asks to only do the import locally. */
     IMPORT_ONLY,
-    /**
-     * The user asks to cancel the operation that made this dialog to appear.
-     */
+    /** The user asks to cancel the operation that made this dialog to appear. */
     CANCEL
   }
   private static final long serialVersionUID = -442311801035162311L;
@@ -95,7 +85,7 @@
     pack();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setVisible(boolean visible)
   {
     if (visible)
@@ -127,10 +117,7 @@
     return panel;
   }
 
-  /**
-   * The panel to be displayed inside the dialog.
-   *
-   */
+  /** The panel to be displayed inside the dialog. */
   private static class ConfirmInitializeAndImportPanel
   extends StatusGenericPanel
   {
@@ -142,10 +129,7 @@
 
     private Result result;
 
-    /**
-     * Default constructor.
-     *
-     */
+    /** Default constructor. */
     public ConfirmInitializeAndImportPanel()
     {
       super();
@@ -167,13 +151,13 @@
       add(createButtonsPanel(), gbc);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean requiresBorder()
     {
       return false;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean requiresScroll()
     {
       return false;
@@ -205,6 +189,7 @@
       buttonsPanel.add(initializeAllButton, gbc);
       initializeAllButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.INITIALIZE_ALL;
@@ -222,7 +207,7 @@
       buttonsPanel.add(importOnlyButton, gbc);
       importOnlyButton.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.IMPORT_ONLY;
@@ -238,7 +223,7 @@
       buttonsPanel.add(cancelButton, gbc);
       cancelButton.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.CANCEL;
@@ -252,29 +237,29 @@
       return buttonsPanel;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Component getPreferredFocusComponent()
     {
       return initializeAllButton;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void okClicked()
     {
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTitle()
     {
       return INFO_CTRL_PANEL_CONFIRM_INITIALIZE_TITLE.get();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void configurationChanged(ConfigurationChangeEvent ev)
     {
     }
 
-    /** {@inheritDoc} */
+    @Override
     public GenericDialog.ButtonType getButtonType()
     {
       return GenericDialog.ButtonType.NO_BUTTON;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
index bafe071..b88aeb9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -72,10 +72,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.LocalizableMessageBuilder;
 
-/**
- * Class that displays the monitoring information of connection handlers.
- *
- */
+/** Class that displays the monitoring information of connection handlers. */
 public class ConnectionHandlerMonitoringPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = -6462932160985559830L;
@@ -126,19 +123,14 @@
   private LocalizableMessage ALL_CONNECTION_HANDLERS =
     INFO_CTRL_PANEL_ALL_CONNECTION_HANDLERS.get();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public ConnectionHandlerMonitoringPanel()
   {
     super();
     createLayout();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -170,6 +162,7 @@
         new IgnoreItemListener(connectionHandlers));
     connectionHandlers.addItemListener(new ItemListener()
     {
+      @Override
       public void itemStateChanged(ItemEvent ev)
       {
         if (ev.getStateChange() == ItemEvent.SELECTED)
@@ -241,14 +234,12 @@
     updateTableSizes();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CONNECTION_HANDLER_MONITORING_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public JMenuBar getMenuBar()
   {
@@ -260,7 +251,7 @@
     return menuBar;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor server = ev.getNewDescriptor();
@@ -274,6 +265,7 @@
       new TreeSet<>(
           new Comparator<ConnectionHandlerDescriptor>()
           {
+            @Override
             public int compare(ConnectionHandlerDescriptor desc1,
                 ConnectionHandlerDescriptor desc2)
             {
@@ -359,7 +351,7 @@
     final LocalizableMessage fErrorDetails = errorDetails;
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         ViewPositions pos = Utilities.getViewPositions(
@@ -383,21 +375,18 @@
     });
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return connectionHandlers;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
   @Override
   public GenericDialog.ButtonType getButtonType()
   {
@@ -405,14 +394,12 @@
   }
 
 
-  /** {@inheritDoc} */
   @Override
   public boolean requiresBorder()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean requiresScroll()
   {
@@ -452,10 +439,7 @@
     return sb.toString();
   }
 
-  /**
-   * Displays a dialog allowing the user to select which operations to display.
-   *
-   */
+  /** Displays a dialog allowing the user to select which operations to display. */
   private void operationViewClicked()
   {
     if (operationViewDlg == null)
@@ -483,7 +467,6 @@
   /**
    * Updates the contents of the tables depending on whether the averages
    * must be displayed or not.
-   *
    */
   private void showAverageClicked()
   {
@@ -565,10 +548,7 @@
             || ch.getProtocol() == Protocol.OTHER);
   }
 
-  /**
-   * The specific menu bar of this panel.
-   *
-   */
+  /** The specific menu bar of this panel. */
   class ConnectionHandlerMonitoringMenuBar extends MainMenuBar
   {
     private static final long serialVersionUID = 505187831116443370L;
@@ -582,7 +562,6 @@
       super(info);
     }
 
-    /** {@inheritDoc} */
     @Override
     protected void addMenus()
     {
@@ -606,6 +585,7 @@
       menu.add(viewOperations);
       viewOperations.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           operationViewClicked();
@@ -617,6 +597,7 @@
       menu.add(showAveragesMenu);
       showAveragesMenu.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           showAverageClicked();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
index b679577..730e82c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
@@ -44,7 +44,6 @@
  * The main panel of the control panel.  It contains a split pane.  On the left
  * we have some actions and on the right some global information about the
  * server.
- *
  */
 public class ControlCenterMainPane extends JPanel
 {
@@ -87,7 +86,6 @@
     info.addConfigChangeListener(new ConfigChangeListener()
     {
       private boolean lastStatusStopped;
-      /** {@inheritDoc} */
       @Override
       public void configurationChanged(final ConfigurationChangeEvent ev)
       {
@@ -109,7 +107,6 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /** {@inheritDoc} */
           @Override
           public void run()
           {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 89662e6..c9d2c5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -157,16 +157,13 @@
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CUSTOM_ATTRIBUTE_TITLE.get();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -198,7 +195,6 @@
     add(delete, gbc);
     delete.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void actionPerformed(ActionEvent ev)
       {
@@ -214,7 +210,6 @@
     add(saveChanges, gbc);
     saveChanges.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void actionPerformed(ActionEvent ev)
       {
@@ -333,7 +328,6 @@
       final BasicExpander expander = expanders[i];
       ChangeListener changeListener = new ChangeListener()
       {
-        /** {@inheritDoc} */
         @Override
         public void stateChanged(ChangeEvent e)
         {
@@ -347,7 +341,6 @@
 
     ItemListener itemListener = new ItemListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void itemStateChanged(ItemEvent ev)
       {
@@ -401,7 +394,6 @@
       final JList list = lists[i];
       MouseAdapter clickListener = new MouseAdapter()
       {
-        /** {@inheritDoc} */
         @Override
         public void mouseClicked(MouseEvent ev)
         {
@@ -415,7 +407,6 @@
 
       KeyAdapter keyListener = new KeyAdapter()
       {
-        /** {@inheritDoc} */
         @Override
         public void keyTyped(KeyEvent ev)
         {
@@ -431,21 +422,18 @@
 
     DocumentListener docListener = new DocumentListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void insertUpdate(DocumentEvent ev)
       {
         checkEnableSaveChanges();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void removeUpdate(DocumentEvent ev)
       {
         checkEnableSaveChanges();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void changedUpdate(DocumentEvent arg0)
       {
@@ -482,14 +470,12 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean mustCheckUnsavedChanges()
   {
     return saveChanges.isEnabled();
   }
 
-  /** {@inheritDoc} */
   @Override
   public UnsavedChangesDialog.Result checkUnsavedChanges()
   {
@@ -510,7 +496,6 @@
     return result;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean requiresScroll()
   {
@@ -618,7 +603,6 @@
     ignoreChangeEvents = false;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
@@ -687,7 +671,6 @@
     }
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
       @Override
       public void run()
       {
@@ -711,14 +694,12 @@
     return schema == null && s != null;
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index 621ffae..d14838f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -139,26 +139,20 @@
   private boolean ignoreChangeEvents;
 
 
-  /**
-   * Default constructor of the panel.
-   *
-   */
+  /** Default constructor of the panel. */
   public CustomObjectClassPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CUSTOM_OBJECTCLASS_TITLE.get();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   protected void createLayout()
   {
     JPanel p = new JPanel(new GridBagLayout());
@@ -190,7 +184,6 @@
     add(delete, gbc);
     delete.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void actionPerformed(ActionEvent ev)
       {
@@ -206,7 +199,6 @@
     add(saveChanges, gbc);
     saveChanges.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void actionPerformed(ActionEvent ev)
       {
@@ -226,7 +218,6 @@
     SuperiorObjectClassesChangedListener listener =
       new SuperiorObjectClassesChangedListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void parentObjectClassesChanged(
           SuperiorObjectClassesChangedEvent ev)
@@ -265,7 +256,6 @@
     attributes = new DoubleAddRemovePanel<>(0, AttributeType.class);
     Comparator<AttributeType> comparator = new Comparator<AttributeType>()
     {
-      /** {@inheritDoc} */
       @Override
       public int compare(AttributeType attr1, AttributeType attr2)
       {
@@ -365,7 +355,6 @@
     add(labels, comps, inlineHelps, p, gbc1);
     ChangeListener changeListener = new ChangeListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void stateChanged(ChangeEvent e)
       {
@@ -378,21 +367,18 @@
 
     DocumentListener docListener = new DocumentListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void insertUpdate(DocumentEvent ev)
       {
         checkEnableSaveChanges();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void removeUpdate(DocumentEvent ev)
       {
         checkEnableSaveChanges();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void changedUpdate(DocumentEvent arg0)
       {
@@ -418,19 +404,16 @@
 
     ListDataListener dataListener = new ListDataListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void contentsChanged(ListDataEvent e)
       {
         checkEnableSaveChanges();
       }
-      /** {@inheritDoc} */
       @Override
       public void intervalAdded(ListDataEvent e)
       {
         checkEnableSaveChanges();
       }
-      /** {@inheritDoc} */
       @Override
       public void intervalRemoved(ListDataEvent e)
       {
@@ -547,7 +530,6 @@
     ignoreChangeEvents = false;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
@@ -589,7 +571,6 @@
     }
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
       @Override
       public void run()
       {
@@ -610,14 +591,12 @@
     });
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean mustCheckUnsavedChanges()
   {
     return saveChanges.isEnabled();
   }
 
-  /** {@inheritDoc} */
   @Override
   public UnsavedChangesDialog.Result checkUnsavedChanges()
   {
@@ -644,14 +623,12 @@
     return result;
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
@@ -1149,22 +1126,17 @@
   /**
    * A renderer for the attribute lists.  The renderer basically marks the
    * inherited attributes with an asterisk.
-   *
    */
   private class AttributeTypeCellRenderer implements ListCellRenderer
   {
     private ListCellRenderer defaultRenderer;
 
-    /**
-     * Renderer constructor.
-     *
-     */
+    /** Renderer constructor. */
     public AttributeTypeCellRenderer()
     {
       defaultRenderer = attributes.getAvailableList().getCellRenderer();
     }
 
-    /** {@inheritDoc} */
     @Override
     public Component getListCellRendererComponent(JList list, Object value,
         int index, boolean isSelected, boolean cellHasFocus)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
index b3ad2ee..2c854aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -39,13 +39,12 @@
 /**
  * The panel displayed when the user clicks on 'Delete Backend...' in the
  * browse entries dialog.
- *
  */
 public class DeleteBackendPanel extends DeleteBaseDNPanel
 {
   private static final long serialVersionUID = 8744925738292396658L;
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_DELETE_BACKEND_TITLE.get();
@@ -55,6 +54,7 @@
    * Returns the no backend found label.
    * @return the no backend found label.
    */
+  @Override
   protected LocalizableMessage getNoElementsFoundLabel()
   {
     return INFO_CTRL_PANEL_NO_BACKENDS_FOUND_LABEL.get();
@@ -64,12 +64,13 @@
    * Returns the list label.
    * @return the list label.
    */
+  @Override
   protected LocalizableMessage getListLabel()
   {
     return INFO_CTRL_PANEL_SELECT_BACKENDS_TO_DELETE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -88,7 +89,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     final LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
index b6e2259..b31e4f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
@@ -78,19 +78,19 @@
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_DELETE_BASE_DN_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return list;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return false;
@@ -139,7 +139,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
+        @Override
         public void run()
         {
           @SuppressWarnings("deprecation")
@@ -240,7 +240,7 @@
         INFO_CTRL_PANEL_SELECT_ALL_BUTTON.get());
     selectAllButton.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         int[] indices = new int[list.getModel().getSize()];
@@ -264,7 +264,7 @@
         INFO_CTRL_PANEL_CLEAR_SELECTION_BUTTON.get());
     unselectAllButton.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         list.clearSelection();
@@ -274,7 +274,7 @@
 
     list.addListSelectionListener(new ListSelectionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void valueChanged(ListSelectionEvent ev)
       {
         checkOKButtonEnable();
@@ -288,7 +288,7 @@
     mainPanel.add(Box.createVerticalGlue(), gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -298,13 +298,13 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void checkOKButtonEnable()
   {
     setEnabledOK(!list.isSelectionEmpty() && mainPanel.isVisible());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -326,7 +326,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     final LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index 3f6f8fe..ba20cd7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -70,29 +70,26 @@
   private CustomSearchResult entryToDuplicate;
   private String rdnAttribute;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public DuplicateEntryPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     throw new IllegalArgumentException("this method must not be called");
@@ -145,15 +142,13 @@
     return INFO_CTRL_PANEL_DUPLICATE_ENTRY_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_DUPLICATE_ENTRY_TITLE.get();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -207,7 +202,7 @@
     add(browse, gbc);
     browse.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         browseClicked();
@@ -267,19 +262,19 @@
 
     DocumentListener listener = new DocumentListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void insertUpdate(DocumentEvent ev)
       {
         updateDNValue();
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void changedUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void removeUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
@@ -291,7 +286,7 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     int origSize = errors.size();
@@ -341,7 +336,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected String getLDIF()
   {
     String dn = this.dn.getText();
@@ -447,6 +442,7 @@
     BackgroundTask<CustomSearchResult> task =
       new BackgroundTask<CustomSearchResult>()
     {
+      @Override
       public CustomSearchResult processBackgroundTask() throws Throwable
       {
         InitialLdapContext ctx =
@@ -456,6 +452,7 @@
         return reader.processBackgroundTask();
       }
 
+      @Override
       public void backgroundTaskCompleted(CustomSearchResult sr,
           Throwable throwable)
       {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
index a195054..620b6fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -33,9 +33,7 @@
 import static org.opends.guitools.controlpanel.datamodel.BasicMonitoringAttributes.*;
 import static org.opends.guitools.controlpanel.util.Utilities.*;
 import static org.opends.messages.AdminToolMessages.*;
-/**
- * The panel displaying the entry caches monitor panel.
- */
+/** The panel displaying the entry caches monitor panel. */
 public class EntryCachesMonitoringPanel extends GeneralMonitoringPanel
 {
   private static final long serialVersionUID = 9031734563700069830L;
@@ -58,25 +56,20 @@
     }
   }
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public EntryCachesMonitoringPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return monitoringLabels.get(0);
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -121,10 +114,7 @@
     setBorder(PANEL_BORDER);
   }
 
-  /**
-   * Updates the contents of the panel.
-   *
-   */
+  /** Updates the contents of the panel. */
   public void updateContents()
   {
     ServerDescriptor server = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
index 75ccadc..ade36c2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -26,10 +26,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.LocalizableMessageBuilder;
 
-/**
- * Class used to display an collection of error messages.
- *
- */
+/** Class used to display an collection of error messages. */
 public class ErrorPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = -4494826284037288552L;
@@ -46,7 +43,7 @@
     createLayout(errors);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return title;
@@ -76,24 +73,24 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.OK;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     Utilities.getParentDialog(this).setVisible(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
index afd8a07..683120d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
@@ -58,27 +58,23 @@
     errorPane.setVisible(true);
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return errorPane;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_ERROR_SEARCHING_ENTRY_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
index 2ad142f..549600a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -43,6 +43,7 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
 import org.opends.guitools.controlpanel.datamodel.ScheduleType;
 import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
@@ -51,14 +52,9 @@
 import org.opends.guitools.controlpanel.task.Task;
 import org.opends.guitools.controlpanel.ui.components.ScheduleSummaryPanel;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.tools.ExportLDIF;
 
-/**
- * The panel where the user can export the contents of the server to an LDIF
- * file.
- *
- */
+/** The panel where the user can export the contents of the server to an LDIF file. */
 public class ExportLDIFPanel extends InclusionExclusionPanel
 {
  private static final long serialVersionUID = 2256902594454214644L;
@@ -83,29 +79,26 @@
 
   private ScheduleSummaryPanel schedulePanel;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public ExportLDIFPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EXPORT_LDIF_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return file;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -114,9 +107,7 @@
     }
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -159,18 +150,18 @@
     file = Utilities.createTextField();
     documentListener = new DocumentListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void changedUpdate(DocumentEvent ev)
       {
         String text = file.getText().trim();
         setEnabledOK(text != null && text.length() > 0 && !errorPane.isVisible());
       }
-      /** {@inheritDoc} */
+      @Override
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
-      /** {@inheritDoc} */
+      @Override
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -238,18 +229,12 @@
 
     encryptData = Utilities.createCheckBox(
         INFO_CTRL_PANEL_ENCRYPT_DATA_LABEL.get());
-
-    /*
-    gbc.gridy ++;
-    gbc.insets.top = 5;
-    add(encryptData, gbc);
-*/
     generateSignedHash = Utilities.createCheckBox(
         INFO_CTRL_PANEL_EXPORT_GENERATE_SIGNED_HASH.get());
 
     encryptData.addChangeListener(new ChangeListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void stateChanged(ChangeEvent ev)
       {
         generateSignedHash.setEnabled(encryptData.isSelected());
@@ -258,11 +243,7 @@
     encryptData.setSelected(false);
     generateSignedHash.setEnabled(false);
 
-    /*
-    gbc.gridy ++;
-    gbc.insets.left = 30;
-    add(generateSignedHash, gbc);
-*/
+    /* gbc.gridy ++; gbc.insets.left = 30; add(generateSignedHash, gbc); */
     wrapText = Utilities.createCheckBox(INFO_CTRL_PANEL_EXPORT_WRAP_TEXT.get());
     wrapText.setOpaque(false);
     gbc.insets.left = 10;
@@ -280,7 +261,7 @@
 
     wrapText.addChangeListener(new ChangeListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void stateChanged(ChangeEvent ev)
       {
         wrapColumn.setEnabled(wrapText.isSelected());
@@ -306,7 +287,7 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -319,6 +300,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         lRemoteFileHelp.setVisible(!isLocal());
@@ -327,13 +309,13 @@
     });
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void checkOKButtonEnable()
   {
     documentListener.changedUpdate(null);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     setPrimaryValid(lBackend);
@@ -419,7 +401,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     setPrimaryValid(lBackend);
@@ -433,10 +415,7 @@
     return schedulePanel.getSchedule();
   }
 
-  /**
-   * The class that performs the export.
-   *
-   */
+  /** The class that performs the export. */
   protected class ExportTask extends InclusionExclusionTask
   {
     private Set<String> backendSet;
@@ -454,20 +433,20 @@
       fileName = file.getText();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Type getType()
     {
       return Type.EXPORT_LDIF;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_EXPORT_TASK_DESCRIPTION.get(
           backendSet.iterator().next(), fileName);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -486,7 +465,7 @@
       return canLaunch;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void runTask()
     {
       state = State.RUNNING;
@@ -523,13 +502,13 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<>();
@@ -570,7 +549,7 @@
       return args;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected String getCommandLinePath()
     {
       return getCommandLinePath("export-ldif");
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
index 081eaae..9c3ab4e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -39,18 +39,18 @@
   protected static LocalizableMessage NO_VALUE_SET =
     INFO_CTRL_PANEL_NO_MONITORING_VALUE.get();
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return LocalizableMessage.EMPTY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
index 4666451..6ce4891 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -32,10 +32,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 
 
-/**
- * The panel on the right of the 'General Information' panel.
- *
- */
+/** The panel on the right of the 'General Information' panel. */
 public class GeneralMonitoringRightPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = -4197460101279681042L;
@@ -85,13 +82,14 @@
    * Displays a panel containing a message.
    * @param msg the message.
    */
+  @Override
   public void displayMessage(LocalizableMessage msg)
   {
     noEntryPanel.setMessage(msg);
     ((CardLayout)mainPanel.getLayout()).show(mainPanel, noEntryPanelTitle);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -131,31 +129,31 @@
     add(mainPanel, gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return LocalizableMessage.EMPTY;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
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 3a9c2ab..f16ac89 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -55,9 +55,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.opends.server.util.DynamicConstants;
 
-/**
- * The generic dialog of the Control Panel.  It contains a StatusGenericPanel.
- */
+/** The generic dialog of the Control Panel. It contains a StatusGenericPanel. */
 public class GenericDialog extends JDialog
 {
   private static final long serialVersionUID = -2643144936460484112L;
@@ -131,7 +129,7 @@
     KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
     ActionListener actionListener = new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         setVisible(false);
@@ -142,7 +140,7 @@
 
     FocusListener focusListener = new FocusAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void focusGained(FocusEvent ev)
       {
         lastComponentWithFocus = ev.getComponent();
@@ -151,7 +149,7 @@
     addFocusListener(focusListener, panel);
 
     addWindowListener(new WindowAdapter() {
-      /** {@inheritDoc} */
+      @Override
       public void windowClosing(WindowEvent e) {
         GenericDialog.this.panel.closeClicked();
       }
@@ -193,7 +191,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setVisible(boolean visible)
   {
     if (visible && lastComponentWithFocus == null)
@@ -280,6 +278,7 @@
       buttonsPanel.add(okButton, gbc);
       okButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.okClicked();
@@ -293,6 +292,7 @@
       cancelButton.setOpaque(false);
       cancelButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.cancelClicked();
@@ -314,6 +314,7 @@
       buttonsPanel.add(okButton, gbc);
       okButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.okClicked();
@@ -333,6 +334,7 @@
       buttonsPanel.add(closeButton, gbc);
       closeButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.closeClicked();
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 aa07864..a629a0f 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -55,9 +55,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.opends.server.util.DynamicConstants;
 
-/**
- * The generic frame of the Control Panel.  It contains a StatusGenericPanel.
- */
+/** The generic frame of the Control Panel. It contains a StatusGenericPanel. */
 public class GenericFrame extends JFrame
 {
   private static final long serialVersionUID = -2643144936460484112L;
@@ -117,7 +115,7 @@
     KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
     ActionListener actionListener = new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         setVisible(false);
@@ -128,7 +126,7 @@
 
     FocusListener focusListener = new FocusAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void focusGained(FocusEvent ev)
       {
         lastComponentWithFocus = ev.getComponent();
@@ -137,7 +135,7 @@
     addFocusListener(focusListener, panel);
 
     addWindowListener(new WindowAdapter() {
-      /** {@inheritDoc} */
+      @Override
       public void windowClosing(WindowEvent e) {
         GenericFrame.this.panel.closeClicked();
       }
@@ -180,7 +178,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setVisible(boolean visible)
   {
     if (visible && lastComponentWithFocus == null)
@@ -224,10 +222,7 @@
     closeButton.setEnabled(enable);
   }
 
-  /**
-   * Updates the title of the frame using the title of the panel.
-   *
-   */
+  /** Updates the title of the frame using the title of the panel. */
   public void updateTitle()
   {
     if (panel.getTitle() != null)
@@ -268,6 +263,7 @@
       buttonsPanel.add(okButton, gbc);
       okButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.okClicked();
@@ -281,6 +277,7 @@
       cancelButton.setOpaque(false);
       cancelButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.cancelClicked();
@@ -302,6 +299,7 @@
       buttonsPanel.add(okButton, gbc);
       okButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.okClicked();
@@ -321,6 +319,7 @@
       buttonsPanel.add(closeButton, gbc);
       closeButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           panel.closeClicked();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
index 86cbaa3..b33c405 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -36,10 +36,7 @@
 import org.opends.quicksetup.util.WebBrowserLauncher;
 import org.opends.server.util.DynamicConstants;
 
-/**
- * An abstract class that the different menu bars in the Control Panel extend.
- *
- */
+/** An abstract class that the different menu bars in the Control Panel extend. */
 
 public abstract class GenericMenuBar extends JMenuBar
 {
@@ -47,16 +44,12 @@
 
   private ControlPanelInfo info;
 
-  /**
-   * The URL to the administration guide.
-   */
+  /** The URL to the administration guide. */
   protected final String ADMINISTRATION_GUIDE_URL =
     Utils.getCustomizedObject("ADMINISTRATION_GUIDE_URL",
         DynamicConstants.ADMINISTRATION_GUIDE_URL, String.class);
 
-  /**
-   * The URL to the wiki main page.
-   */
+  /** The URL to the wiki main page. */
   protected final String DOC_REFERENCE_WIKI =
     Utils.getCustomizedObject("DOC_REFERENCE_WIKI",
         DynamicConstants.DOC_REFERENCE_WIKI, String.class);
@@ -92,6 +85,7 @@
         INFO_CTRL_PANEL_ADMINISTRATION_GUIDE_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         displayURL(ADMINISTRATION_GUIDE_URL);
@@ -102,6 +96,7 @@
         INFO_CTRL_PANEL_DOCUMENTATION_WIKI_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         displayURL(DOC_REFERENCE_WIKI);
@@ -119,7 +114,7 @@
   {
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /** {@inheritDoc} */
+      @Override
       public Void processBackgroundTask() throws WebBrowserException
       {
         try
@@ -133,7 +128,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void backgroundTaskCompleted(Void returnValue, Throwable throwable)
       {
         WebBrowserException ex = (WebBrowserException) throwable;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
index dee8a03..7b6a589 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -61,10 +61,7 @@
 import org.opends.server.tools.dsreplication.ReplicationCliException;
 import org.opends.server.tools.dsreplication.ReplicationCliMain;
 
-/**
- * The panel where the user can import the contents of an LDIF file to the
- * server.
- */
+/** The panel where the user can import the contents of an LDIF file to the server. */
 public class ImportLDIFPanel extends InclusionExclusionPanel
 {
   private static final long serialVersionUID = 1143246529610229229L;
@@ -98,10 +95,7 @@
 
   private DocumentListener documentListener;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public ImportLDIFPanel()
   {
     super();
@@ -129,9 +123,7 @@
     }
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -617,10 +609,7 @@
     return baseDNs;
   }
 
-  /**
-   * The class that performs the import.
-   *
-   */
+  /** The class that performs the import. */
   protected class ImportTask extends InclusionExclusionTask
   {
     private Set<String> backendSet;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
index 2718e20..f27f69f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -24,6 +24,7 @@
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -34,6 +35,8 @@
 import javax.swing.event.ChangeListener;
 import javax.swing.text.JTextComponent;
 
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.DN;
 import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
 import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
 import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
@@ -41,70 +44,40 @@
 import org.opends.guitools.controlpanel.task.Task;
 import org.opends.guitools.controlpanel.ui.components.BasicExpander;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.protocols.ldap.LDAPFilter;
-import org.forgerock.opendj.ldap.DN;
 import org.opends.server.types.LDAPException;
 
-/**
- * Abstract class used to refactor some code used by the import LDIF and export
- * LDIF panels.
- *
- */
+/** Abstract class used to refactor some code used by the import LDIF and export LDIF panels. */
 public abstract class InclusionExclusionPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = -3826176895778069011L;
-  /**
-   * The DNs to exclude.
-   */
+  /** The DNs to exclude. */
   protected JTextArea dnsToExclude;
-  /**
-   * The attributes to exclude.
-   */
+  /** The attributes to exclude. */
   protected JTextField attributesToExclude;
-  /**
-   * The exclusion filter.
-   */
+  /** The exclusion filter. */
   protected JTextField exclusionFilter;
-  /**
-   * The DNs to include.
-   */
+  /** The DNs to include. */
   protected JTextArea dnsToInclude;
-  /**
-   * The attributes to include.
-   */
+  /** The attributes to include. */
   protected JTextField attributesToInclude;
-  /**
-   * The inclusion filter.
-   */
+  /** The inclusion filter. */
   protected JTextField inclusionFilter;
 
-  /**
-   * The DNs to include.
-   */
+  /** The DNs to include. */
   protected JLabel lDnsToInclude;
-  /**
-   * The attributes to include.
-   */
+  /** The attributes to include. */
   protected JLabel lAttributesToInclude;
-  /**
-   * The inclusion filter label.
-   */
+  /** The inclusion filter label. */
   protected JLabel lInclusionFilter;
-  /**
-   * The DNs to exclude label.
-   */
+  /** The DNs to exclude label. */
   protected JLabel lDnsToExclude;
-  /**
-   * The attributes to exclude label.
-   */
+  /** The attributes to exclude label. */
   protected JLabel lAttributesToExclude;
-  /**
-   * The exclusion filter label.
-   */
+  /** The exclusion filter label. */
   protected JLabel lExclusionFilter;
 
-  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     setPrimaryValid(lDnsToInclude);
@@ -212,7 +185,7 @@
 
     ChangeListener changeListener = new ChangeListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void stateChanged(ChangeEvent e)
       {
         lDnsToInclude.setVisible(expander.isSelected());
@@ -330,7 +303,7 @@
 
     ChangeListener changeListener = new ChangeListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void stateChanged(ChangeEvent e)
       {
         lDnsToExclude.setVisible(expander.isSelected());
@@ -536,7 +509,6 @@
    * Abstract class that provides some methods that can be used to generate the
    * equivalent command-line arguments for some of the things that are contained
    * in the inclusion/exclusion panels.
-   *
    */
   protected abstract class InclusionExclusionTask extends Task
   {
@@ -556,27 +528,28 @@
      * @return the command line arguments corresponding to the elements
      * displayed in the inclusion/exclusion panels.
      */
-    protected ArrayList<String> getCommandLineArguments()
+    @Override
+    protected List<String> getCommandLineArguments()
     {
-      ArrayList<String> args = new ArrayList<>();
+      List<String> args = new ArrayList<>();
       String s = dnsToInclude.getText();
       if (s.trim().length() > 0)
       {
         String[] dnArray = s.split("\n");
-        for (int i=0; i<dnArray.length; i++)
+        for (String dn : dnArray)
         {
           args.add("--includeBranch");
-          args.add(dnArray[i]);
+          args.add(dn);
         }
       }
       s = attributesToInclude.getText();
       if (s.trim().length() > 0)
       {
         String[] attrArray = s.split(",");
-        for (int i=0; i<attrArray.length; i++)
+        for (String attr : attrArray)
         {
           args.add("--includeAttribute");
-          args.add(attrArray[i]);
+          args.add(attr);
         }
       }
       s = inclusionFilter.getText();
@@ -590,20 +563,20 @@
       if (s.trim().length() > 0)
       {
         String[] dnArray = s.split("\n");
-        for (int i=0; i<dnArray.length; i++)
+        for (String dn : dnArray)
         {
           args.add("--excludeBranch");
-          args.add(dnArray[i]);
+          args.add(dn);
         }
       }
       s = attributesToExclude.getText();
       if (s.trim().length() > 0)
       {
         String[] attrArray = s.split(",");
-        for (int i=0; i<attrArray.length; i++)
+        for (String attr : attrArray)
         {
           args.add("--excludeAttribute");
-          args.add(attrArray[i]);
+          args.add(attr);
         }
       }
       s = exclusionFilter.getText();
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 0f59503..34c07fa 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -32,10 +32,7 @@
 import org.opends.guitools.controlpanel.event.IndexSelectionListener;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The panel on the right of the 'Manage Indexes' panel.
- *
- */
+/** The panel on the right of the 'Manage Indexes' panel. */
 public class IndexBrowserRightPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = -6904674789074101772L;
@@ -49,29 +46,20 @@
   private static final String NOTHING_SELECTED = "Nothing Selected";
   private static final String MULTIPLE_SELECTED = "Multiple Selected";
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public IndexBrowserRightPanel()
   {
     super();
     createLayout();
   }
 
-  /**
-   * Displays a panel informing that no item is selected.
-   *
-   */
+  /** Displays a panel informing that no item is selected. */
   public void displayVoid()
   {
     ((CardLayout)mainPanel.getLayout()).show(mainPanel, NOTHING_SELECTED);
   }
 
-  /**
-   * Displays a panel informing that multiple items are selected.
-   *
-   */
+  /** Displays a panel informing that multiple items are selected. */
   public void displayMultiple()
   {
     ((CardLayout)mainPanel.getLayout()).show(mainPanel, MULTIPLE_SELECTED);
@@ -97,7 +85,7 @@
     backendVLVIndexesPanel.removeIndexSelectionListener(listener);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -154,9 +142,7 @@
         backendVLVIndexesPanel.getTitle().toString());
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -189,32 +175,32 @@
     add(mainPanel, gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_INDEX_BROWSER_RIGHT_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     // TODO
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java
index b7e1217..4e33c54 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaInformationMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -45,9 +45,7 @@
 import static org.opends.messages.AdminToolMessages.*;
 import static org.opends.server.util.ServerConstants.*;
 
-/**
- * The panel displaying the java monitoring information.
- */
+/** The panel displaying the java monitoring information. */
 public class JavaInformationMonitoringPanel extends GeneralMonitoringPanel
 {
   private static final long serialVersionUID = 9031734563799969830L;
@@ -92,25 +90,20 @@
   private List<JLabel> memoryLabels = new ArrayList<>();
   private JPanel memoryPanel;
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public JavaInformationMonitoringPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return generalMonitoringComps.get(0);
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -248,7 +241,6 @@
     }
     ChangeListener changeListener = new ChangeListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void stateChanged(ChangeEvent e)
       {
@@ -259,7 +251,6 @@
 
     changeListener = new ChangeListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void stateChanged(ChangeEvent e)
       {
@@ -279,10 +270,7 @@
     setBorder(PANEL_BORDER);
   }
 
-  /**
-   * Updates the contents of the panel.
-   *
-   */
+  /** Updates the contents of the panel. */
   public void updateContents()
   {
     ServerDescriptor server = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index c98ab78..8fb882b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -132,6 +132,7 @@
     add(delete, gbc);
     delete.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         deleteEntry();
@@ -146,7 +147,7 @@
     add(saveChanges, gbc);
     saveChanges.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         saveChanges(true);
@@ -175,7 +176,7 @@
 
     LDAPEntryChangedListener listener = new LDAPEntryChangedListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void entryChanged(LDAPEntryChangedEvent ev)
       {
         boolean enable = saveChanges.isVisible() &&
@@ -230,13 +231,13 @@
     cardLayout.show(mainPanel, NOTHING_SELECTED);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void entryRead(EntryReadEvent ev)
   {
     searchResult = ev.getSearchResult();
@@ -297,6 +298,7 @@
    * Displays a message informing that an error occurred reading the entry.
    * @param ev the entry read error event.
    */
+  @Override
   public void entryReadError(EntryReadErrorEvent ev)
   {
     searchResult = null;
@@ -358,31 +360,31 @@
     displayedEntryPanel = null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_LDAP_ENTRY_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return saveChanges;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         boolean isReadOnly = true;
@@ -399,7 +401,7 @@
     });
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
index 059363a..30f9242 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -84,7 +84,6 @@
           TreeSelectionModel.SINGLE_TREE_SELECTION);
   }
 
-  /** {@inheritDoc} */
   @Override
   public void toBeDisplayed(boolean visible)
   {
@@ -95,14 +94,12 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return title;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
@@ -139,14 +136,12 @@
     return dns;
   }
 
-  /** {@inheritDoc} */
   @Override
   public GenericDialog.ButtonType getBrowseButtonType()
   {
     return GenericDialog.ButtonType.OK_CANCEL;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected Component createMainPanel()
   {
@@ -156,7 +151,6 @@
     tree.getSelectionModel().addTreeSelectionListener(
     new TreeSelectionListener()
     {
-      /** {@inheritDoc} */
       @Override
       public void valueChanged(TreeSelectionEvent ev)
       {
@@ -165,7 +159,6 @@
       }
     });
     MouseListener mouseListener = new MouseAdapter() {
-      /** {@inheritDoc} */
       @Override
       public void mousePressed(MouseEvent e) {
         int selRow = tree.getRowForLocation(e.getX(), e.getY());
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
index a2f5e9f..c7f43e2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -44,9 +44,7 @@
 import org.opends.server.util.LDIFReader;
 import org.opends.server.util.StaticUtils;
 
-/**
- * The panel displaying an LDIF view of an entry.
- */
+/** The panel displaying an LDIF view of an entry. */
 public class LDIFViewEntryPanel extends ViewEntryPanel
 {
   /** Callback that sets the viewport's view position. */
@@ -61,7 +59,6 @@
       this.scroll = scroll;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void run()
     {
@@ -85,16 +82,13 @@
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return editableAttributes;
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -154,7 +148,6 @@
     add(readOnlyScroll, gbc);
   }
 
-  /** {@inheritDoc} */
   @Override
   public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
   {
@@ -231,7 +224,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public GenericDialog.ButtonType getButtonType()
   {
@@ -239,7 +231,6 @@
   }
 
 
-  /** {@inheritDoc} */
   @Override
   protected String getDisplayedDN()
   {
@@ -258,14 +249,12 @@
     return dn;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected List<Object> getValues(String attrName)
   {
     throw new IllegalStateException("This method should not be called.");
   }
 
-  /** {@inheritDoc} */
   @Override
   public Entry getEntry() throws OpenDsException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
index c914881..196f3f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -49,9 +49,7 @@
 import static org.opends.messages.AdminToolMessages.*;
 import static org.opends.messages.QuickSetupMessages.*;
 
-/**
- * The panel that appears when the user is asked to provide authentication.
- */
+/** The panel that appears when the user is asked to provide authentication. */
 public class LoginPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 5051556513294844797L;
@@ -63,26 +61,20 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public LoginPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_LOGIN_PANEL_TITLE.get();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -122,20 +114,17 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return pwd;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
   @Override
   public void toBeDisplayed(boolean visible)
   {
@@ -146,7 +135,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
@@ -378,7 +366,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public void cancelClicked()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
index e722d47..cffc89f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -48,16 +48,12 @@
 /**
  * The panel on the left side of the main Control Center dialog.  It contains
  * all the actions on the pane divided in categories.
- *
  */
 public class MainActionsPane extends StatusGenericPanel
 {
   private static final long serialVersionUID = 7616418700758530191L;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public MainActionsPane()
   {
     super();
@@ -87,7 +83,7 @@
         actions.add(b);
         b.addActionListener(new ActionListener()
         {
-          /** {@inheritDoc} */
+          @Override
           public void actionPerformed(ActionEvent ev)
           {
             // Constructs the panels using reflection.
@@ -152,7 +148,7 @@
     createActionButtonListeners(actions);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return null;
@@ -294,7 +290,7 @@
   {
     ActionListener actionListener = new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         for (ActionButton button : actions)
@@ -310,7 +306,7 @@
 
     MouseAdapter mouseListener = new MouseAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void mousePressed(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -323,7 +319,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void mouseReleased(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -336,7 +332,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void mouseExited(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -349,7 +345,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void mouseEntered(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -373,19 +369,19 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return null;
   }
 
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
index 7f28f64..a83414c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -37,10 +37,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The menu bar that appears on the main panel.
- *
- */
+/** The menu bar that appears on the main panel. */
 public class MainMenuBar extends GenericMenuBar
 {
   private static final long serialVersionUID = 6441273044772077947L;
@@ -64,10 +61,7 @@
     }
   }
 
-  /**
-   * Method that can be overwritten to set specific menus.
-   *
-   */
+  /** Method that can be overwritten to set specific menus. */
   protected void addMenus()
   {
     add(createFileMenuBar());
@@ -79,7 +73,6 @@
    * The method called when the user clicks on quick.  It will check that there
    * are not ongoing tasks.  If there are tasks, it will ask the user for
    * confirmation to quit.
-   *
    */
   public void quitClicked()
   {
@@ -120,6 +113,7 @@
         INFO_CTRL_PANEL_CONNECT_TO_SERVER_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         connectToServerClicked();
@@ -132,7 +126,7 @@
       menuItem = Utilities.createMenuItem(INFO_CTRL_PANEL_EXIT_MENU.get());
       menuItem.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           quitClicked();
@@ -156,6 +150,7 @@
         INFO_CTRL_PANEL_REFRESH_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         refreshOptionsClicked();
@@ -165,11 +160,7 @@
     return menu;
   }
 
-  /**
-   * Specific method to be able to handle the Quit events sent from the COCOA
-   * menu of Mac OS.
-   *
-   */
+  /** Specific method to be able to handle the Quit events sent from the COCOA menu of Mac OS. */
   private void setMacOSQuitHandler()
   {
     try
@@ -182,6 +173,7 @@
           (Class[])null).newInstance((Object[])null);
       InvocationHandler adapter = new InvocationHandler()
       {
+        @Override
         public Object invoke (Object proxy, Method method, Object[] args)
         throws Throwable
         {
@@ -209,10 +201,7 @@
     }
   }
 
-  /**
-   * The method called when the user clicks on 'Refresh Options'.
-   *
-   */
+  /** The method called when the user clicks on 'Refresh Options'. */
   protected void refreshOptionsClicked()
   {
     if (panel == null)
@@ -235,9 +224,7 @@
     }
   }
 
-  /**
-   * The method called when the user clicks on 'Connect to Server...'.
-   */
+  /** The method called when the user clicks on 'Connect to Server...'. */
   protected void connectToServerClicked()
   {
     Set<String> runningTasks = new HashSet<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
index ec52e68..a786e0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
@@ -40,10 +40,7 @@
 
 import static org.opends.messages.AdminToolMessages.*;
 
-/**
- * Class displaying the contents of a matching rule.
- *
- */
+/** Class displaying the contents of a matching rule. */
 public class MatchingRulePanel extends SchemaElementPanel
 {
   private static final long serialVersionUID = 2440493955626646008L;
@@ -55,44 +52,36 @@
   private JLabel syntax = Utilities.createDefaultLabel();
   private JList usedByAttributes = new JList(new DefaultListModel());
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public MatchingRulePanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_MATCHING_RULE_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return usedByAttributes;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -149,7 +138,6 @@
 
     MouseAdapter clickListener = new MouseAdapter()
     {
-      /** {@inheritDoc} */
       @Override
       public void mouseClicked(MouseEvent ev)
       {
@@ -163,7 +151,6 @@
 
     KeyAdapter keyListener = new KeyAdapter()
     {
-      /** {@inheritDoc} */
       @Override
       public void keyTyped(KeyEvent ev)
       {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
index bdab25f..73c1f0a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -28,6 +28,7 @@
 import java.awt.event.ActionListener;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.Set;
 
 import javax.swing.Box;
 import javax.swing.JButton;
@@ -53,7 +54,7 @@
  private static final long serialVersionUID = 6462932163745559L;
 
  private LinkedHashSet<T> selectedAttributes = new LinkedHashSet<>();
- private LinkedHashSet<T> monitoringAttributes;
+ private Set<T> monitoringAttributes;
  private boolean isCanceled = true;
 
  /**
@@ -100,7 +101,6 @@
    return new MonitoringAttributesViewPanel<>(attributes);
  }
 
- /** {@inheritDoc} */
  @Override
  public boolean requiresScroll()
  {
@@ -110,7 +110,6 @@
  /**
   * Default constructor.
   * @param attributes the attributes that will be proposed to the user.
-  *
   */
  protected MonitoringAttributesViewPanel(LinkedHashSet<T> attributes)
  {
@@ -133,9 +132,7 @@
    }
  }
 
- /**
-  * Creates the layout of the panel (but the contents are not populated here).
-  */
+ /** Creates the layout of the panel (but the contents are not populated here). */
  private void createLayout()
  {
    GridBagConstraints gbc = new GridBagConstraints();
@@ -166,6 +163,7 @@
    selectAll = Utilities.createButton(INFO_CTRL_PANEL_SELECT_ALL_BUTTON.get());
    selectAll.addActionListener(new ActionListener()
    {
+     @Override
      public void actionPerformed(ActionEvent ev)
      {
        for (JCheckBox cb : checkboxes)
@@ -178,6 +176,7 @@
    selectNone = Utilities.createButton(INFO_CTRL_PANEL_CLEAR_SELECTION_BUTTON.get());
    selectNone.addActionListener(new ActionListener()
    {
+     @Override
      public void actionPerformed(ActionEvent ev)
      {
        for (JCheckBox cb : checkboxes)
@@ -242,24 +241,25 @@
        new Dimension(checkBoxPanel.getPreferredSize().width + 15, preferredViewHeight));
  }
 
- /** {@inheritDoc} */
+ @Override
  public LocalizableMessage getTitle()
  {
    return INFO_CTRL_PANEL_ATTRIBUTE_VIEW_OPTIONS_TITLE.get();
  }
 
- /** {@inheritDoc} */
+ @Override
  public void configurationChanged(ConfigurationChangeEvent ev)
  {
+   // no-op
  }
 
- /** {@inheritDoc} */
+ @Override
  public Component getPreferredFocusComponent()
  {
    return checkboxes[0];
  }
 
- /** {@inheritDoc} */
+ @Override
  public void toBeDisplayed(boolean visible)
  {
    if (visible)
@@ -268,7 +268,7 @@
    }
  }
 
- /** {@inheritDoc} */
+ @Override
  public void okClicked()
  {
    // Check that at least one checkbox is selected.
@@ -293,7 +293,7 @@
    }
  }
 
- /** {@inheritDoc} */
+ @Override
  public GenericDialog.ButtonType getButtonType()
  {
    return GenericDialog.ButtonType.OK_CANCEL;
@@ -326,19 +326,17 @@
   */
  protected LocalizableMessage getMessage(T attribute)
  {
-   LocalizableMessage m;
    if (attribute instanceof MonitoringAttributes)
    {
-     m = ((MonitoringAttributes)attribute).getMessage();
+     return ((MonitoringAttributes)attribute).getMessage();
    }
    else if (attribute instanceof LocalizableMessage)
    {
-     m = (LocalizableMessage)attribute;
+     return (LocalizableMessage)attribute;
    }
    else
    {
-     m = LocalizableMessage.raw(attribute.toString());
+     return LocalizableMessage.raw(attribute.toString());
    }
-   return m;
  }
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
index 9182e01..ff8507a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NoItemSelectedPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -28,20 +28,14 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * A simple panel containing a message.
- *
- */
+/** A simple panel containing a message. */
 public class NoItemSelectedPanel extends JPanel
 {
   private JLabel l;
   private LocalizableMessage msg;
   private static final long serialVersionUID = -8288525745479095426L;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public NoItemSelectedPanel()
   {
     super(new GridBagLayout());
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
index d320ef4..2147fb7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -42,7 +42,6 @@
 /**
  * This is the class used to edit the object class of a given entry, it displays
  * the structural objectclass of the entry and its auxiliary objectclasses.
- *
  */
 public class ObjectClassEditorPanel extends StatusGenericPanel
 {
@@ -54,10 +53,7 @@
 
   private boolean valueChanged;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public ObjectClassEditorPanel()
   {
     super();
@@ -116,13 +112,13 @@
         availableListModel, 0, availableListModel.getSize());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return structural;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     valueChanged = false;
@@ -138,7 +134,7 @@
     return value;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     String struct = (String)  structural.getSelectedItem();
@@ -150,13 +146,13 @@
     Utilities.getParentDialog(this).setVisible(false);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_OBJECTCLASS_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final Schema schema = ev.getNewDescriptor().getSchema();
@@ -181,7 +177,7 @@
 
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
+        @Override
         public void run()
         {
           String currentStruct = (String)structural.getSelectedItem();
@@ -245,7 +241,7 @@
           ColorAndFontConstants.defaultFont);
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
+        @Override
         public void run()
         {
           setEnabledOK(false);
@@ -265,15 +261,13 @@
     return valueChanged;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index da55d4d..97cfa15 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -48,9 +48,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * The dialog that is used to display progress in a task.
- */
+/** The dialog that is used to display progress in a task. */
 public class ProgressDialog extends GenericDialog
 {
   private static final long serialVersionUID = -6462866257463062629L;
@@ -96,11 +94,12 @@
   {
     errorPrintStream.addListener(new PrintStreamListener()
     {
+      @Override
       public void newLine(final String msg)
       {
         SwingUtilities.invokeLater(new Runnable()
         {
-          /** {@inheritDoc} */
+          @Override
           public void run()
           {
             progressPanel.appendErrorLine(msg);
@@ -110,11 +109,12 @@
     });
     outPrintStream.addListener(new PrintStreamListener()
     {
+      @Override
       public void newLine(final String msg)
       {
-        /** {@inheritDoc} */
         SwingUtilities.invokeLater(new Runnable()
         {
+          @Override
           public void run()
           {
             progressPanel.appendOutputLine(msg);
@@ -142,10 +142,7 @@
     progressPanel.appendHtml(text);
   }
 
-  /**
-   * Resets the contents of the 'Details' section of the dialog.
-   *
-   */
+  /** Resets the contents of the 'Details' section of the dialog. */
   public void resetProgressLogs()
   {
     progressPanel.resetLogs();
@@ -161,7 +158,7 @@
     progressPanel.setSummary(text);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setEnabledClose(boolean enable)
   {
     progressPanel.closeButton.setEnabled(enable);
@@ -179,10 +176,7 @@
     progressPanel.closeWhenOverClicked();
   }
 
-  /**
-   * The panel contained in the progress dialog.
-   *
-   */
+  /** The panel contained in the progress dialog. */
   static class ProgressPanel extends StatusGenericPanel
   {
     private static final long serialVersionUID = -364496083928260306L;
@@ -209,35 +203,32 @@
 
     private boolean taskIsOver;
 
-    /**
-     * Default constructor.
-     *
-     */
+    /** Default constructor. */
     public ProgressPanel()
     {
       super();
       createLayout();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTitle()
     {
       return null;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean requiresScroll()
     {
       return false;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean requiresBorder()
     {
       return false;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean isDisposeOnClose()
     {
       return true;
@@ -316,20 +307,13 @@
       }
     }
 
-    /**
-     * Resets the contents of the logs (Details) section.
-     *
-     */
+    /** Resets the contents of the logs (Details) section. */
     public void resetLogs()
     {
       logs.setText(INIT_TEXT);
     }
 
-    /**
-     * Creates the layout of the panel (but the contents are not populated
-     * here).
-     *
-     */
+    /** Creates the layout of the panel (but the contents are not populated here). */
     private void createLayout()
     {
       GridBagConstraints gbc = new GridBagConstraints();
@@ -389,7 +373,7 @@
       updateVisibility(lastShowDetails);
       details.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           lastShowDetails = details.isSelected();
@@ -419,7 +403,7 @@
       closeWhenOver.setOpaque(false);
       closeWhenOver.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           closeWhenOverClicked();
@@ -446,7 +430,7 @@
       buttonsPanel.add(closeButton, gbc);
       closeButton.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           closeClicked();
@@ -470,6 +454,7 @@
       {
         final Runnable repaint = new Runnable()
         {
+          @Override
           public void run()
           {
             invalidate();
@@ -508,24 +493,24 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public GenericDialog.ButtonType getButtonType()
     {
       return GenericDialog.ButtonType.NO_BUTTON;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void configurationChanged(ConfigurationChangeEvent ev)
     {
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Component getPreferredFocusComponent()
     {
       return details;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void okClicked()
     {
       Utilities.getParentDialog(this).setVisible(false);
@@ -544,7 +529,6 @@
      * Checks if the 'Close when over' check box is selected and if it is the
      * case, closes the dialog after waiting for 2 seconds (so that the user
      * can see the result, or cancel the automatic closing of the dialog).
-     *
      */
     private void closeWhenOverClicked()
     {
@@ -553,7 +537,7 @@
       {
         Thread t = new Thread(new Runnable()
         {
-          /** {@inheritDoc} */
+          @Override
           public void run()
           {
             try
@@ -561,6 +545,7 @@
               Thread.sleep(2000);
               SwingUtilities.invokeLater(new Runnable()
               {
+                @Override
                 public void run()
                 {
                   if (closeWhenOver.isSelected() && taskIsOver)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
index 4adf49b..e13681e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -56,9 +56,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.opends.guitools.controlpanel.util.ViewPositions;
 
-/**
- * The panel that appears when the user wants to rebuild indexes.
- */
+/** The panel that appears when the user wants to rebuild indexes. */
 public class RebuildIndexPanel extends StatusGenericPanel implements IndexModifiedListener
 {
   private static final long serialVersionUID = -4805445967165643375L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
index 631cf6f..75595db 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -33,7 +33,6 @@
 /**
  * The panel that displays the refresh options of the control panel.  Basically
  * it allows to set the refreshing period used by the control panel.
- *
  */
 public class RefreshOptionsPanel extends StatusGenericPanel
 {
@@ -45,25 +44,20 @@
 
   private int MAX_VALUE = 5000;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public RefreshOptionsPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_REFRESH_PANEL_TITLE.get();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -103,24 +97,24 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.OK_CANCEL;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return period;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     isCanceled = true;
@@ -160,7 +154,7 @@
     return isCanceled;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
index e685b2f..5b1816e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -34,10 +34,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * Panel that appears when the user wants to change the password of a user.
- *
- */
+/** Panel that appears when the user wants to change the password of a user. */
 public class ResetUserPasswordPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 8733172823605832626L;
@@ -51,10 +48,7 @@
   private BasicNode node;
   private BrowserController controller;
 
-  /**
-   * Constructor of the panel.
-   *
-   */
+  /** Constructor of the panel. */
   public ResetUserPasswordPanel()
   {
     super();
@@ -83,13 +77,13 @@
     packParentDialog();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return password;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     final ArrayList<LocalizableMessage> errors = new ArrayList<>();
@@ -144,20 +138,18 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
index b2cb4d0..9497a6e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -46,10 +46,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.tools.RestoreDB;
 
-/**
- * The panel that appears when the user wants to restore from a backup.
- *
- */
+/** The panel that appears when the user wants to restore from a backup. */
 public class RestorePanel extends BackupListPanel
 implements BackupCreatedListener
 {
@@ -58,23 +55,20 @@
   private JLabel lBackupID;
   private JTextField backupID;
 
-  /**
-   * Constructor of the panel.
-   *
-   */
+  /** Constructor of the panel. */
   public RestorePanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_RESTORE_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void backupCreated(BackupCreatedEvent ev)
   {
     boolean refreshList = false;
@@ -98,6 +92,7 @@
       // opened.
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           refreshList();
@@ -106,14 +101,14 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
     info.addBackupCreatedListener(this);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -122,13 +117,13 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
     SwingUtilities.invokeLater(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         lBackupID.setVisible(!desc.isLocal());
@@ -141,7 +136,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void verifyBackupClicked()
   {
     LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<>();
@@ -174,9 +169,7 @@
     }
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -208,6 +201,7 @@
 
     listener = new ListSelectionListener()
     {
+      @Override
       public void valueChanged(ListSelectionEvent ev)
       {
         BackupDescriptor backup = getSelectedBackup();
@@ -219,13 +213,13 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void checkOKButtonEnable()
   {
     listener.valueChanged(null);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     setPrimaryValid(lPath);
@@ -309,7 +303,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     setPrimaryValid(lPath);
@@ -359,13 +353,13 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Type getType()
     {
       return Type.RESTORE;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTaskDescription()
     {
       if (verify)
@@ -378,7 +372,7 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -397,7 +391,7 @@
       return canLaunch;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void runTask()
     {
       state = State.RUNNING;
@@ -458,13 +452,13 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<>();
@@ -491,7 +485,7 @@
       return args;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected String getCommandLinePath()
     {
       return getCommandLinePath("restore");
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java
index 213f5d0..b8d51b7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RootMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -35,9 +35,7 @@
 import static org.opends.messages.AdminToolMessages.*;
 import static org.opends.messages.BackendMessages.*;
 
-/**
- * The panel displaying the root monitor panel.
- */
+/** The panel displaying the root monitor panel. */
 public class RootMonitoringPanel extends GeneralMonitoringPanel
 {
   private static final long serialVersionUID = 9031734563746269830L;
@@ -56,16 +54,13 @@
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return openConnections;
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -124,10 +119,7 @@
     setBorder(PANEL_BORDER);
   }
 
-  /**
-   * Updates the contents of the panel.
-   *
-   */
+  /** Updates the contents of the panel. */
   public void updateContents()
   {
     ServerDescriptor server = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
index df68299..a1c1679 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
@@ -38,10 +38,7 @@
 import org.opends.server.types.ObjectClass;
 import org.opends.server.types.Schema;
 
-/**
- * The panel on the right of the 'Manage Schema' panel.
- *
- */
+/** The panel on the right of the 'Manage Schema' panel. */
 public class SchemaBrowserRightPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 5294502011852239497L;
@@ -77,10 +74,7 @@
 
   private SchemaElementPanel schemaElementPanel;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public SchemaBrowserRightPanel()
   {
     super();
@@ -90,8 +84,8 @@
   /**
    * Displays a panel containing a message.
    * @param msg the message.
-   *
    */
+  @Override
   public void displayMessage(LocalizableMessage msg)
   {
     schemaElementPanel = null;
@@ -99,7 +93,7 @@
     ((CardLayout)mainPanel.getLayout()).show(mainPanel, NOTHING_SELECTED);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -139,6 +133,7 @@
    * Adds a configuration element created listener.
    * @param listener the listener.
    */
+  @Override
   public void addConfigurationElementCreatedListener(
       ConfigurationElementCreatedListener listener)
   {
@@ -153,6 +148,7 @@
    * Removes a configuration element created listener.
    * @param listener the listener.
    */
+  @Override
   public void removeConfigurationElementCreatedListener(
       ConfigurationElementCreatedListener listener)
   {
@@ -269,9 +265,7 @@
         attributeSyntaxPanel.getTitle().toString());
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -313,31 +307,31 @@
     add(mainPanel, gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_SCHEMA_BROWSER_RIGHT_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
index 31c3560..32c8a67 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -40,7 +40,6 @@
 /**
  * This is a class where the user can choose from a list of available object
  * classes one or more object classes.
- *
  */
 public class SelectObjectClassesPanel extends StatusGenericPanel
 {
@@ -50,9 +49,7 @@
   private Schema schema;
   private boolean isCanceled = true;
 
-  /**
-   * Default constructor of this panel.
-   */
+  /** Default constructor of this panel. */
   public SelectObjectClassesPanel()
   {
     createLayout();
@@ -82,7 +79,7 @@
 
     Comparator<ObjectClass> comparator = new Comparator<ObjectClass>()
     {
-      /** {@inheritDoc} */
+      @Override
       public int compare(ObjectClass oc1, ObjectClass oc2)
       {
         return oc1.getNameOrOID().toLowerCase().compareTo(
@@ -101,19 +98,19 @@
     add(addRemove, gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return addRemove;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_SUPERIOR_OBJECTCLASSES_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     isCanceled = true;
@@ -140,7 +137,7 @@
     return isCanceled;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -149,7 +146,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
index 7de6412..5bd81af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
@@ -47,10 +47,7 @@
 import org.opends.server.types.ObjectClass;
 import org.opends.server.types.Schema;
 
-/**
- * The panel that displays a standard attribute definition.
- *
- */
+/** The panel that displays a standard attribute definition. */
 public class StandardAttributePanel extends SchemaElementPanel
 {
   private static final long serialVersionUID = -7922968631524763675L;
@@ -72,41 +69,36 @@
   private JList requiredBy = new JList(new DefaultListModel());
   private JList optionalBy = new JList(new DefaultListModel());
 
-  /**
-   * Default constructor of the panel.
-   *
-   */
+  /** Default constructor of the panel. */
   public StandardAttributePanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_STANDARD_ATTRIBUTE_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return requiredBy;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   protected void createLayout()
   {
     createBasicLayout(this, new GridBagConstraints());
@@ -203,7 +195,7 @@
       final JList list = lists[i];
       MouseAdapter clickListener = new MouseAdapter()
       {
-        /** {@inheritDoc} */
+        @Override
         public void mouseClicked(MouseEvent ev)
         {
           if (ev.getClickCount() == 1)
@@ -216,7 +208,7 @@
 
       KeyAdapter keyListener = new KeyAdapter()
       {
-        /** {@inheritDoc} */
+        @Override
         public void keyTyped(KeyEvent ev)
         {
           if (ev.getKeyChar() == KeyEvent.VK_SPACE ||
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
index 4cc954c..ddf0f24 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
@@ -50,10 +50,7 @@
 import org.opends.server.types.ObjectClass;
 import org.opends.server.types.Schema;
 
-/**
- * The panel that displays a standard object class definition.
- *
- */
+/** The panel that displays a standard object class definition. */
 public class StandardObjectClassPanel extends SchemaElementPanel
 {
   private static final long serialVersionUID = 5561268287795223026L;
@@ -88,35 +85,29 @@
     createLayout();
   }
 
-  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_STANDARD_OBJECTCLASS_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return requiredAttributes;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   protected void createLayout()
   {
     createBasicLayout(this, new GridBagConstraints());
@@ -215,7 +206,6 @@
       final JList list = lists[i];
       MouseAdapter clickListener = new MouseAdapter()
       {
-        /** {@inheritDoc} */
         @Override
         public void mouseClicked(MouseEvent ev)
         {
@@ -229,7 +219,6 @@
 
       KeyAdapter keyListener = new KeyAdapter()
       {
-        /** {@inheritDoc} */
         @Override
         public void keyTyped(KeyEvent ev)
         {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 51c63d5..8c57c5a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -111,14 +111,10 @@
 {
   private static final long serialVersionUID = -9123358652232556732L;
 
-  /**
-   * The string to be used as combo separator.
-   */
+  /** The string to be used as combo separator. */
   public static final String COMBO_SEPARATOR = "----------";
 
-  /**
-   * The not applicable message.
-   */
+  /** The not applicable message. */
   protected static final LocalizableMessage NOT_APPLICABLE = INFO_NOT_APPLICABLE_LABEL.get();
 
   private static final LocalizableMessage AUTHENTICATE = INFO_AUTHENTICATE_BUTTON_LABEL.get();
@@ -242,9 +238,7 @@
     return true;
   }
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   protected StatusGenericPanel()
   {
     super(new GridBagLayout());
@@ -371,9 +365,7 @@
     p.add(errorPane, gbc);
   }
 
-  /**
-   * Creates the error pane.
-   */
+  /** Creates the error pane. */
   protected void createErrorPane()
   {
     errorPane = Utilities.makeHtmlPane("", ColorAndFontConstants.progressFont);
@@ -532,9 +524,7 @@
     comp.setFont(ColorAndFontConstants.defaultFont);
   }
 
-  /**
-   * Packs the parent dialog.
-   */
+  /** Packs the parent dialog. */
   protected void packParentDialog()
   {
     Window dlg = Utilities.getParentDialog(this);
@@ -966,7 +956,6 @@
           errorPane, title, ColorAndFontConstants.errorTitleFont, mb.toMessage(), ColorAndFontConstants.defaultFont);
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
         @Override
         public void run()
         {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
index 67f9aaf..607ca66 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
@@ -66,7 +66,6 @@
  * The panel displaying the general status of the server (started/stopped),
  * basic configuration (base DNs, connection listeners) and that allows to start
  * and stop the server.
- *
  */
 class StatusPanel extends StatusGenericPanel
 {
@@ -95,10 +94,7 @@
   private ConnectionHandlerTableModel connectionHandlerTableModel;
   private JTable connectionHandlersTable;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public StatusPanel()
   {
     super();
@@ -148,7 +144,7 @@
     inScrollPanel.add(Box.createVerticalGlue(), gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     if (startButton.isVisible())
@@ -162,7 +158,7 @@
   }
 
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresBorder()
   {
     return false;
@@ -175,13 +171,13 @@
     Utilities.updateTableSizes(connectionHandlersTable);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_STATUS_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(final ConfigurationChangeEvent ev)
   {
     if (SwingUtilities.isEventDispatchThread())
@@ -192,7 +188,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
+        @Override
         public void run()
         {
           updateContents(ev.getNewDescriptor());
@@ -201,7 +197,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
   }
@@ -520,7 +516,7 @@
     stopButton.setOpaque(false);
     stopButton.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         stopServer();
@@ -536,7 +532,7 @@
     statusPanel.add(startButton, gbc);
     startButton.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         startServer();
@@ -549,7 +545,7 @@
     restartButton.setOpaque(false);
     restartButton.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         restartServer();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
index ecc4ced..778f335 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -32,9 +32,7 @@
 import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
 import org.opends.guitools.controlpanel.util.Utilities;
 
-/**
- * The panel displaying the system information monitoring panel.
- */
+/** The panel displaying the system information monitoring panel. */
 public class SystemInformationMonitoringPanel extends GeneralMonitoringPanel
 {
   private static final long serialVersionUID = 9031734563298069830L;
@@ -55,24 +53,20 @@
     }
   }
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public SystemInformationMonitoringPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return monitoringLabels.get(0);
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -118,10 +112,7 @@
     setBorder(PANEL_BORDER);
   }
 
-  /**
-   * Updates the contents of the panel.
-   *
-   */
+  /** Updates the contents of the panel. */
   public void updateContents()
   {
     ServerDescriptor server = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
index 24c5a22..faf8ee7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -54,10 +54,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.backends.task.RecurringTask;
 
-/**
- * The panel that allows the user to specify when a task will be launched.
- *
- */
+/** The panel that allows the user to specify when a task will be launched. */
 public class TaskToSchedulePanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 6855081932432566784L;
@@ -151,9 +148,7 @@
     createLayout();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -204,6 +199,7 @@
 
     scheduleType.addItemListener(new ItemListener()
     {
+      @Override
       public void itemStateChanged(ItemEvent ev)
       {
         Object element = scheduleType.getSelectedItem();
@@ -265,7 +261,7 @@
     add(Box.createVerticalGlue(), gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     // Reset the schedule and the labels
@@ -288,13 +284,13 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_TASK_TO_SCHEDULE_TITLE.get(taskName);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     schedule = null;
@@ -715,12 +711,12 @@
     return schedule == null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return scheduleType;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
index e3eb5bf..75e3cd6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -41,27 +41,17 @@
  * It proposes the user to save the changes, do not save them or cancel the
  * action that make the dialog appear (for instance when the user is editing
  * an entry and clicks on another node, this dialog appears).
- *
  */
 public class UnsavedChangesDialog extends GenericDialog
 {
-  /**
-   * The different input that the user can provide.
-   *
-   */
+  /** The different input that the user can provide. */
   public enum Result
   {
-    /**
-     * The user asks to save the changes.
-     */
+    /** The user asks to save the changes. */
     SAVE,
-    /**
-     * The user asks to not to save the changes.
-     */
+    /** The user asks to not to save the changes. */
     DO_NOT_SAVE,
-    /**
-     * The user asks to cancel the operation that made this dialog to appear.
-     */
+    /** The user asks to cancel the operation that made this dialog to appear. */
     CANCEL
   }
   private static final long serialVersionUID = -4436794801035162388L;
@@ -95,7 +85,7 @@
     pack();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setVisible(boolean visible)
   {
     if (visible)
@@ -126,10 +116,7 @@
     return panel;
   }
 
-  /**
-   * The panel to be displayed inside the dialog.
-   *
-   */
+  /** The panel to be displayed inside the dialog. */
   private static class UnsavedChangesPanel extends StatusGenericPanel
   {
     private static final long serialVersionUID = -1528939816762604059L;
@@ -140,10 +127,7 @@
 
     private Result result;
 
-    /**
-     * Default constructor.
-     *
-     */
+    /** Default constructor. */
     public UnsavedChangesPanel()
     {
       super();
@@ -165,13 +149,13 @@
       add(createButtonsPanel(), gbc);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean requiresBorder()
     {
       return false;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean requiresScroll()
     {
       return false;
@@ -194,6 +178,7 @@
       buttonsPanel.add(doNotSaveButton, gbc);
       doNotSaveButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.DO_NOT_SAVE;
@@ -217,7 +202,7 @@
       buttonsPanel.add(cancelButton, gbc);
       cancelButton.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.CANCEL;
@@ -233,7 +218,7 @@
       buttonsPanel.add(saveButton, gbc);
       saveButton.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.SAVE;
@@ -247,35 +232,35 @@
       return buttonsPanel;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Component getPreferredFocusComponent()
     {
       return doNotSaveButton;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void okClicked()
     {
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTitle()
     {
       return INFO_CTRL_PANEL_UNSAVED_CHANGES_DIALOG_TITLE.get();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void configurationChanged(ConfigurationChangeEvent ev)
     {
     }
 
-    /** {@inheritDoc} */
+    @Override
     public GenericDialog.ButtonType getButtonType()
     {
       return GenericDialog.ButtonType.NO_BUTTON;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean isDisposeOnClose()
     {
       return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
index 4179c05..6b8987a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -63,9 +63,7 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.opends.guitools.controlpanel.util.ViewPositions;
 
-/**
- * The panel that appears when the user wants to verify an index.
- */
+/** The panel that appears when the user wants to verify an index. */
 public class VerifyIndexPanel extends StatusGenericPanel implements IndexModifiedListener
 {
   private static final long serialVersionUID = 5252070109221657041L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
index ae42721..d3e5732 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -43,11 +43,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.tools.ConfigureWindowsService;
 
-/**
- * The panel that displays the Windows Service panel configuration for the
- * server.
- *
- */
+/** The panel that displays the Windows Service panel configuration for the server. */
 public class WindowsServicePanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 6415350296295459469L;
@@ -59,25 +55,20 @@
 
   private boolean isWindowsServiceEnabled;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public WindowsServicePanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_WINDOWS_SERVICE_TITLE.get();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -130,7 +121,7 @@
 
     ActionListener listener = new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         updateWindowsService();
@@ -152,13 +143,13 @@
     addBottomGlue(gbc);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     if (!isWindowsServiceEnabled)
@@ -171,7 +162,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     boolean previousValue = isWindowsServiceEnabled;
@@ -183,7 +174,7 @@
       previousLocal = isLocal;
       SwingUtilities.invokeLater(new Runnable()
       {
-        /** {@inheritDoc} */
+        @Override
         public void run()
         {
           lState.setText(isWindowsServiceEnabled ?
@@ -207,7 +198,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // NO ok button
@@ -257,10 +248,7 @@
     }
   }
 
-  /**
-   * The task in charge of updating the windows service configuration.
-   *
-   */
+  /** The task in charge of updating the windows service configuration. */
   protected class WindowsServiceTask extends Task
   {
     Set<String> backendSet;
@@ -280,7 +268,7 @@
       backendSet = new HashSet<>();
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Type getType()
     {
       if (enableService)
@@ -293,7 +281,7 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public LocalizableMessage getTaskDescription()
     {
       if (enableService)
@@ -306,7 +294,7 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -322,7 +310,7 @@
       return true;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void runTask()
     {
       state = State.RUNNING;
@@ -363,13 +351,13 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<>();
@@ -386,7 +374,7 @@
       return args;
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected String getCommandLinePath()
     {
       return getCommandLinePath("windows-service");
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
index c79d8bc..43c11af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -32,9 +32,7 @@
 import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
 import org.opends.guitools.controlpanel.util.Utilities;
 
-/**
- * The panel displaying the work queue monitor panel.
- */
+/** The panel displaying the work queue monitor panel. */
 public class WorkQueueMonitoringPanel extends GeneralMonitoringPanel
 {
   private static final long serialVersionUID = 9031734563700069830L;
@@ -54,24 +52,20 @@
     }
   }
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public WorkQueueMonitoringPanel()
   {
     super();
     createLayout();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return monitoringLabels.get(0);
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -117,10 +111,7 @@
     setBorder(PANEL_BORDER);
   }
 
-  /**
-   * Updates the contents of the panel.
-   *
-   */
+  /** Updates the contents of the panel. */
   public void updateContents()
   {
     ServerDescriptor server = null;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
index 3e8f599..963f6d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.border;
@@ -34,17 +34,17 @@
   public AccordionElementBorder() {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Insets getBorderInsets(Component c) {
     return insets;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isBorderOpaque() {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void paintBorder(Component c, Graphics g, int x, int y, int width,
       int height) {
     g.setColor(ColorAndFontConstants.topAccordionBorderColor);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
index b0f7deb..49da067 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.border;
@@ -34,19 +34,19 @@
   public SelectedCategoryBorder() {
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Insets getBorderInsets(Component c)
   {
     return insets;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isBorderOpaque()
   {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void paintBorder(Component c, Graphics g, int x, int y, int width, int height)
   {
     // render shadow on bottom
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java
index 48c520a..6e751b0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ActionButton.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -208,7 +208,6 @@
     repaint();
   }
 
-  /** {@inheritDoc} */
   @Override
   public void updateUI() {
       super.updateUI();
@@ -216,7 +215,6 @@
       setBorder(buttonBorder);
   }
 
-  /** {@inheritDoc} */
   @Override
   protected void paintComponent(Graphics g) {
     setBorder(hasFocus() ? focusBorder : buttonBorder);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
index 12bd1dd..702d3f7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -124,19 +124,19 @@
 
     ListDataListener listDataListener = new ListDataListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void intervalRemoved(ListDataEvent ev)
       {
         updateButtonEnabling();
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void intervalAdded(ListDataEvent ev)
       {
         updateButtonEnabling();
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void contentsChanged(ListDataEvent ev)
       {
         updateButtonEnabling();
@@ -144,7 +144,7 @@
     };
     MouseAdapter doubleClickListener = new MouseAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void mouseClicked(MouseEvent e) {
         if (isEnabled() && e.getClickCount() == 2)
         {
@@ -209,7 +209,7 @@
     add.setOpaque(false);
     add.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         addClicked();
@@ -225,7 +225,7 @@
       addAll.setOpaque(false);
       addAll.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           selectedListModel.addAll(availableListModel.getData());
@@ -245,7 +245,7 @@
     remove.setOpaque(false);
     remove.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         removeClicked();
@@ -262,7 +262,7 @@
       removeAll.setOpaque(false);
       removeAll.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           availableListModel.addAll(selectedListModel.getData());
@@ -298,6 +298,7 @@
         ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     ListSelectionListener listener = new ListSelectionListener()
     {
+      @Override
       public void valueChanged(ListSelectionEvent ev)
       {
         updateButtonEnabling();
@@ -326,6 +327,7 @@
    * Enables the state of the components in the panel.
    * @param enable whether to enable the components in the panel or not.
    */
+  @Override
   public void setEnabled(boolean enable)
   {
     super.setEnabled(enable);
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 65d7508..68d8325 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -45,7 +45,6 @@
  * A simple panel used in the LDAP entry viewers to display a binary value.
  * It does not allow to edit the binary value.  It is used for instance in the
  * tables.
- *
  */
 public class BinaryCellPanel extends JPanel
 {
@@ -66,10 +65,7 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BinaryCellPanel()
   {
     super(new GridBagLayout());
@@ -274,10 +270,7 @@
     return value;
   }
 
-  /**
-   * Explicitly request the focus for the edit button of this panel.
-   *
-   */
+  /** Explicitly request the focus for the edit button of this panel. */
   public void requestFocusForButton()
   {
     editButton.requestFocusInWindow();
@@ -325,7 +318,7 @@
     deleteButton.removeActionListener(listener);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
       int condition, boolean pressed)
   {
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 f2628cd..92b6c77 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -39,7 +39,6 @@
  * A component that acts as a checkbox but uses some customized buttons to
  * indicate the selected and unselected states.  This component is used in the
  * 'Import LDIF' and 'Export LDIF' panels to hide parts of the dialog.
- *
  */
 class CategoryButton extends JCheckBox
 {
@@ -75,6 +74,7 @@
     setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
     addChangeListener(new ChangeListener()
     {
+      @Override
       public void stateChanged(ChangeEvent e)
       {
         setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
@@ -85,7 +85,7 @@
     setFont(ColorAndFontConstants.categoryFont);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void updateUI()
   {
     super.updateUI();
@@ -93,7 +93,7 @@
     setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void paintComponent(Graphics g) {
     setBackground(backgroundColor);
     g.setColor(backgroundColor);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
index 2742371..5fd1dce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -33,7 +33,6 @@
  * The panel representing a category.  It contains a CategoryButton and a panel
  * that is displayed when the CategoryButton is in a certain state.  They
  * are used on the left side of the main Control Panel.
- *
  */
 public class CategoryPanel extends JPanel {
   private static final long serialVersionUID = 8941374689175404431L;
@@ -118,7 +117,7 @@
     return expanded;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setForeground(Color foreground)
   {
     super.setForeground(foreground);
@@ -131,7 +130,7 @@
   /** The custom listener used to display the child component. */
   private class CollapseListener implements ChangeListener
   {
-    /** {@inheritDoc} */
+    @Override
     public void stateChanged(ChangeEvent event) {
       setExpanded(expandButton.isSelected());
     }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
index e7416a0..bb4fb5f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -41,7 +41,7 @@
     super(label.toString());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean processKeyBinding(KeyStroke ks, KeyEvent e,
       int condition, boolean pressed)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
index 9813eec..28b609f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -41,7 +41,6 @@
  * browser, index browser or the LDAP entries browser).  It renders in a
  * different manner than the default tree (selection takes the whole width
  * of the tree, in a similar manner as happens with trees in Mac OS).
- *
  */
 public class CustomTree extends JTree
 {
@@ -50,16 +49,13 @@
   private JPopupMenu popupMenu;
   private final int MAX_ICON_HEIGHT = 18;
 
-  /**
-   * Internal enumeration used to translate mouse events.
-   *
-   */
+  /** Internal enumeration used to translate mouse events. */
   private enum NewEventType
   {
     MOUSE_PRESSED, MOUSE_CLICKED, MOUSE_RELEASED
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void paintComponent(Graphics g)
   {
     int[] selectedRows = getSelectionRows();
@@ -131,7 +127,7 @@
     MouseListener mouseListener = new MouseAdapter()
     {
       private boolean ignoreEvents;
-      /** {@inheritDoc} */
+      @Override
       public void mousePressed(MouseEvent ev)
       {
         if (ignoreEvents)
@@ -180,7 +176,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void mouseReleased(MouseEvent ev)
       {
         if (ignoreEvents)
@@ -203,7 +199,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void mouseClicked(MouseEvent ev)
       {
         if (ignoreEvents)
@@ -282,7 +278,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void addMouseListener(MouseListener mouseListener)
   {
     super.addMouseListener(mouseListener);
@@ -293,7 +289,7 @@
     mouseListeners.add(mouseListener);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void removeMouseListener(MouseListener mouseListener)
   {
     super.removeMouseListener(mouseListener);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
index 2befd09..bb43547 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -135,19 +135,19 @@
 
     ListDataListener listDataListener = new ListDataListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void intervalRemoved(ListDataEvent ev)
       {
         listSelectionChanged();
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void intervalAdded(ListDataEvent ev)
       {
         listSelectionChanged();
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void contentsChanged(ListDataEvent ev)
       {
         listSelectionChanged();
@@ -155,7 +155,7 @@
     };
     MouseAdapter doubleClickListener = new MouseAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void mouseClicked(MouseEvent e) {
         if (isEnabled() && e.getClickCount() == 2)
         {
@@ -234,7 +234,7 @@
     add1.setOpaque(false);
     add1.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         addClicked(selectedListModel1);
@@ -251,6 +251,7 @@
       addAll1.setOpaque(false);
       addAll1.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(availableListModel, selectedListModel1);
@@ -265,6 +266,7 @@
     remove1.setOpaque(false);
     remove1.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         remove1Clicked();
@@ -282,7 +284,7 @@
       removeAll1.setOpaque(false);
       removeAll1.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(selectedListModel1, availableListModel);
@@ -311,7 +313,7 @@
     add2.setOpaque(false);
     add2.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         addClicked(selectedListModel2);
@@ -328,7 +330,7 @@
       addAll2.setOpaque(false);
       addAll2.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(availableListModel, selectedListModel2);
@@ -343,7 +345,7 @@
     remove2.setOpaque(false);
     remove2.addActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         remove2Clicked();
@@ -361,7 +363,7 @@
       removeAll2.setOpaque(false);
       removeAll2.addActionListener(new ActionListener()
       {
-        /** {@inheritDoc} */
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(selectedListModel2, availableListModel);
@@ -433,6 +435,7 @@
         ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
     ListSelectionListener listener = new ListSelectionListener()
     {
+      @Override
       public void valueChanged(ListSelectionEvent ev)
       {
         listSelectionChanged();
@@ -466,10 +469,7 @@
     selectedScroll2.setPreferredSize(d);
   }
 
-  /**
-   * Enables the state of the components in the panel.
-   * @param enable whether to enable the components in the panel or not.
-   */
+  @Override
   public void setEnabled(boolean enable)
   {
     super.setEnabled(enable);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
index 26dfe27..6e18a3c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -43,7 +43,6 @@
 /**
  * A text field with an icon with 'X' shape on the right.  When the user clicks
  * on that icon, the contents of the text field are cleared.
- *
  */
 public class FilterTextField extends JTextField
 {
@@ -60,9 +59,7 @@
   private boolean mousePressed;
   private boolean displayRefreshIcon;
 
-  /**
-   * The time during which the refresh icon is displayed by default.
-   */
+  /** The time during which the refresh icon is displayed by default. */
   public static long DEFAULT_REFRESH_ICON_TIME = 750;
 
   private LinkedHashSet<ActionListener> listeners = new LinkedHashSet<>();
@@ -84,13 +81,13 @@
     constructorBorderSet = true;
     getDocument().addDocumentListener(new DocumentListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void changedUpdate(DocumentEvent e)
       {
         insertUpdate(e);
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void insertUpdate(DocumentEvent e)
       {
         boolean displayIcon = getText().length() > 0;
@@ -100,6 +97,7 @@
           repaint();
         }
       }
+      @Override
       public void removeUpdate(DocumentEvent e)
       {
         insertUpdate(e);
@@ -108,7 +106,7 @@
 
     addMouseListener(new MouseAdapter()
     {
-      /** {@inheritDoc} */
+      @Override
       public void mousePressed(MouseEvent ev)
       {
         boolean p = getClearIconRectangle().contains(ev.getPoint());
@@ -119,7 +117,7 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void mouseReleased(MouseEvent ev)
       {
         if (mousePressed && getClearIconRectangle().contains(ev.getPoint()))
@@ -132,26 +130,19 @@
     });
   }
 
-  /**
-   * Adds an action listener to this text field.  When the user clicks on the
-   * 'X' shaped icon the listeners are notified.
-   * @param listener the action listener.
-   */
+  @Override
   public void addActionListener(ActionListener listener)
   {
     listeners.add(listener);
   }
 
-  /**
-   * Removes an action listener to this text field.
-   * @param listener the action listener.
-   */
+  @Override
   public void removeActionListener(ActionListener listener)
   {
     listeners.remove(listener);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void setBorder(Border border)
   {
     if (constructorBorderSet && border != null)
@@ -191,8 +182,7 @@
    * Displays a refresh icon on the text field (this is used for instance in
    * the browsers that use this text field to specify a filter: the refresh
    * icon is displayed to show that the filter is being displayed).
-   * @param time the time (in miliseconds) that the icon will be displayed.
-   *
+   * @param time the time (in milliseconds) that the icon will be displayed.
    */
   public void displayRefreshIcon(final long time)
   {
@@ -200,6 +190,7 @@
     repaint();
     Thread t = new Thread(new Runnable()
     {
+      @Override
       public void run()
       {
         try
@@ -213,6 +204,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
+            @Override
             public void run()
             {
               displayRefreshIcon = false;
@@ -245,13 +237,10 @@
         margin, icon.getIconWidth(), icon.getIconHeight());
   }
 
-  /**
-   * The border of this filter text field.
-   *
-   */
+  /** The border of this filter text field. */
   private class IconBorder implements Border
   {
-    /** {@inheritDoc} */
+    @Override
     public Insets getBorderInsets(Component c)
     {
       ImageIcon icon = getClearIcon();
@@ -267,7 +256,7 @@
       return new Insets(0, 0, 0, rightInsets);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
         int width, int height)
     {
@@ -294,7 +283,7 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean isBorderOpaque()
     {
       return false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
index 5dfcdc6..2dc7954 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -29,33 +29,26 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 
 /**
  * A panel containing a label an a help icon.  A customized tool tip is used,
  * the tool tip is also displayed when the user clicks on the help icon.
- *
  */
 public class LabelWithHelpIcon extends JPanel
 {
   private static final long serialVersionUID = 4502977901538910797L;
-  /**
-   * The label with the text.
-   */
+  /** The label with the text. */
   protected JLabel label = Utilities.createDefaultLabel();
-  /**
-   * The label with the icon.
-   */
+  /** The label with the icon. */
   protected JLabel iconLabel = new JLabel(icon);
   private static final ImageIcon icon =
     Utilities.createImageIcon("org/opends/quicksetup/images/help_small.gif");
 
 
-  /**
-   * The left inset of the help icon.
-   */
+  /** The left inset of the help icon. */
   protected final int INSET_WITH_ICON= 3;
 
   /**
@@ -121,10 +114,7 @@
     return label.getText();
   }
 
-  /**
-   * Sets the font to be used in this panel.
-   * @param font the font.
-   */
+  @Override
   public void setFont(Font font)
   {
     // This is call by the constructor of JPanel.
@@ -172,10 +162,7 @@
     }
   }
 
-  /**
-   * Sets the foreground color for the text in this panel.
-   * @param color the foreground color for the text in this panel.
-   */
+  @Override
   public void setForeground(Color color)
   {
     super.setForeground(color);
@@ -186,20 +173,12 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getToolTipText(MouseEvent ev)
   {
     int x = ev.getPoint().x;
     boolean display = x > label.getPreferredSize().width - 10;
-
-    if (display)
-    {
-      return getHelpTooltip();
-    }
-    else
-    {
-      return null;
-    }
+    return display ? getHelpTooltip() : null;
   }
 
   private void updateAccessibleContext()
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
index 7327db5..5500c88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -41,7 +41,7 @@
     this.maxSize = maxSize;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void insertString(DocumentFilter.FilterBypass fb, int offset,
       String text, AttributeSet attr)
   throws BadLocationException
@@ -73,7 +73,7 @@
     updateCaretPosition(fb);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void replace(DocumentFilter.FilterBypass fb, int offset,
       int length, String text, AttributeSet attr)
   throws BadLocationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
index ad9a420..c93f1fe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -43,7 +43,6 @@
  * values of an entry.  It displays the structural and auxiliary object classes.
  * It does not allow to edit directly the object class value.  It is used for
  * instance in the entry editors (simplified and table views).
- *
  */
 public class ObjectClassCellPanel extends JPanel
 {
@@ -56,10 +55,7 @@
   private ImageIcon lockIcon =
     Utilities.createImageIcon(IconPool.IMAGE_PATH+"/field-locked.png");
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public ObjectClassCellPanel()
   {
     super(new GridBagLayout());
@@ -124,10 +120,7 @@
     }
   }
 
-  /**
-   * Explicitly request the focus for the edit button of this panel.
-   *
-   */
+  /** Explicitly request the focus for the edit button of this panel. */
   public void requestFocusForButton()
   {
     editButton.requestFocusInWindow();
@@ -163,7 +156,7 @@
     editButton.setVisible(visible);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
       int condition, boolean pressed)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java
index 1ada4e8..2647816 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ScheduleSummaryPanel.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -109,6 +110,7 @@
     change = Utilities.createButton(INFO_CTRL_PANEL_CHANGE_SCHEDULE.get());
     change.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         changeButtonClicked();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
index bb2909e..d8899eb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -29,35 +29,28 @@
 import javax.swing.JPanel;
 import javax.swing.text.JTextComponent;
 
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 
 /**
  * A panel containing a label an a help icon.  A customized tool tip is used,
  * the tool tip is also displayed when the user clicks on the help icon.
  * The main difference with {@code LabelWithHelpIcon} is that this uses
  * a {@code JEditorPane} as label.
- *
  */
 public class SelectableLabelWithHelpIcon extends JPanel
 {
   private static final long serialVersionUID = 4502977901098910797L;
-  /**
-   * The label with the text.
-   */
+  /** The label with the text. */
   private JTextComponent label = Utilities.makeHtmlPane("",
       ColorAndFontConstants.defaultFont);
-  /**
-   * The label with the icon.
-   */
+  /** The label with the icon. */
   private JLabel iconLabel = new JLabel(icon);
   private static final ImageIcon icon =
     Utilities.createImageIcon("org/opends/quicksetup/images/help_small.gif");
 
-  /**
-   * The left inset of the help icon.
-   */
+  /** The left inset of the help icon. */
   private final int INSET_WITH_ICON= 3;
 
   /**
@@ -111,10 +104,7 @@
     return label.getText();
   }
 
-  /**
-   * Sets the font to be used in this panel.
-   * @param font the font.
-   */
+  @Override
   public void setFont(Font font)
   {
     // This is called by the constructor of JPanel.
@@ -161,10 +151,7 @@
     }
   }
 
-  /**
-   * Sets the foreground color for the text in this panel.
-   * @param color the foreground color for the text in this panel.
-   */
+  @Override
   public void setForeground(Color color)
   {
     super.setForeground(color);
@@ -175,19 +162,11 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getToolTipText(MouseEvent ev)
   {
     int x = ev.getPoint().x;
     boolean display = x > label.getPreferredSize().width - 10;
-
-    if (display)
-    {
-      return getHelpTooltip();
-    }
-    else
-    {
-      return null;
-    }
+    return display ? getHelpTooltip() : null;
   }
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
index 7fbbae6..beb6d56 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -52,9 +52,7 @@
 import org.opends.server.types.ObjectClass;
 import org.opends.server.types.Schema;
 
-/**
- * A panel that can be used to select one (or several) object classes.
- */
+/** A panel that can be used to select one (or several) object classes. */
 public class SuperiorObjectClassesEditor extends JPanel
 {
   private static final long serialVersionUID = 123123973933568L;
@@ -82,9 +80,7 @@
 
   private Schema schema;
 
-  /**
-   * Default constructor for this panel.
-   */
+  /** Default constructor for this panel. */
   public SuperiorObjectClassesEditor()
   {
     super(new CardLayout());
@@ -103,15 +99,14 @@
     updateWithSchema(schema);
   }
 
-  /**
-   * Creates the layout of this panel.
-   */
+  /** Creates the layout of this panel. */
   private void createLayout()
   {
     bSpecifyMultiple.setToolTipText(
         INFO_CTRL_PANEL_SPECIFY_MULTIPLE_SUPERIORS_TOOLTIP.get().toString());
     bSpecifyMultiple.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         specifyMultipleClicked();
@@ -121,6 +116,7 @@
         INFO_CTRL_PANEL_UPDATE_MULTIPLE_SUPERIORS_TOOLTIP.get().toString());
     bUpdateMultiple.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         updateMultipleClicked();
@@ -133,7 +129,7 @@
     singleSuperior.setRenderer(renderer);
     ItemListener itemListener = new ItemListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void itemStateChanged(ItemEvent ev)
       {
         notifyListeners();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
index aee2d67..743b3ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -21,10 +21,7 @@
 import javax.swing.text.DocumentFilter;
 import javax.swing.text.JTextComponent;
 
-/**
- * Document filter used to update properly a text component displaying a
- * time.
- */
+/** Document filter used to update properly a text component displaying a time. */
 public class TimeDocumentFilter extends DocumentFilter
 {
   private JTextComponent tf;
@@ -38,7 +35,7 @@
     this.tf = tf;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void insertString(DocumentFilter.FilterBypass fb, int offset,
       String text, AttributeSet attr)
   throws BadLocationException
@@ -48,7 +45,7 @@
     trimPosition(fb, text, offset, previousLength);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void remove(DocumentFilter.FilterBypass fb, int offset,
       int length)
   throws BadLocationException
@@ -74,7 +71,7 @@
     updateCaretPosition(fb);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void replace(DocumentFilter.FilterBypass fb, int offset,
       int length, String text, AttributeSet attr)
   throws BadLocationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
index b86adc1..c52a977 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -30,29 +30,20 @@
 import org.opends.guitools.controlpanel.ui.renderer.TreeCellRenderer;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * A basic panel containing a CustomTree.
- *
- */
+/** A basic panel containing a CustomTree. */
 public class TreePanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 5650902943430126109L;
   private JTree tree;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public TreePanel()
   {
     super();
     createLayout();
   }
 
-  /**
-   * Creates the layout of the panel (but the contents are not populated here).
-   *
-   */
+  /** Creates the layout of the panel (but the contents are not populated here). */
   private void createLayout()
   {
     GridBagConstraints gbc = new GridBagConstraints();
@@ -79,31 +70,31 @@
     return tree;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return tree;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
index 2644010..d30e703 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
@@ -12,16 +12,13 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-/**
- * Abstract class with some common methods for all the nodes in the
- * 'Manage Index' tree.
- */
+/** Abstract class with some common methods for all the nodes in the 'Manage Index' tree. */
 public abstract class AbstractIndexTreeNode extends DefaultMutableTreeNode
 {
   private static final long serialVersionUID = 8055748310817873273L;
@@ -46,14 +43,12 @@
     return name;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean isRoot()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean isLeaf()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
index 3b78c5a..12f9b7f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -20,11 +20,7 @@
 import org.forgerock.opendj.ldap.schema.Syntax;
 
 
-/**
- * Class of the nodes that represent an attribute syntax in the 'Manage Schema'
- * tree.
- *
- */
+/** Class of the nodes that represent an attribute syntax in the 'Manage Schema' tree. */
 public class AttributeSyntaxTreeNode extends SchemaElementTreeNode
 {
   private static final long serialVersionUID = 2439971368723239776L;
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 10e6dd6..7810925 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -21,10 +21,7 @@
 
 import org.opends.server.types.LDAPURL;
 
-/**
- * Interface used in the LDAP entries browser code to deal with entries.
- *
- */
+/** Interface used in the LDAP entries browser code to deal with entries. */
 public interface BrowserNodeInfo {
 
   /**
@@ -60,7 +57,6 @@
    * current server. An entry is declared 'remote' when the host/port of
    * getURL() is different from the host/port of the DirContext associated to
    * the browser controller. Returns <CODE>false</CODE> otherwise.
-   *
    */
   boolean isRemote();
 
@@ -140,9 +136,7 @@
    */
   String[] getObjectClassValues();
 
-  /**
-   * Error types
-   */
+  /** Error types. */
   /** No error happened. */
   int ERROR_NONE          = 0;
   /** And error reading the entry occurred. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
index ca77d71..1a05629 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -25,7 +25,6 @@
  * The tree node that is used to represent a category.  It is used for instance
  * in the browse index tree to separate categories (index type) from the actual
  * index nodes.
- *
  */
 public class CategoryTreeNode extends DefaultMutableTreeNode
 {
@@ -40,13 +39,13 @@
     super(name);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isRoot()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isLeaf()
   {
     return getChildCount() == 0;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
index bfcc695..c32a685 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/ConfigurationObjectClassTreeNode.java
@@ -12,17 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import org.opends.server.types.ObjectClass;
 
-/**
- * Class of the nodes that represent a configuration object class in the 'Manage
- * Schema' tree.
- *
- */
+/** Class of the nodes that represent a configuration object class in the 'Manage Schema' tree. */
 public class ConfigurationObjectClassTreeNode extends SchemaElementTreeNode
 {
   private static final long serialVersionUID = 9121561141135641060L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
index e856e82..79bfe5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CustomObjectClassTreeNode.java
@@ -12,17 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import org.opends.server.types.ObjectClass;
 
-/**
- * Class of the nodes that represent a custom object class in the 'Manage
- * Schema' tree.
- *
- */
+/** Class of the nodes that represent a custom object class in the 'Manage Schema' tree. */
 public class CustomObjectClassTreeNode extends SchemaElementTreeNode
 {
   private static final long serialVersionUID = -3525236184507876077L;
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 7c17d0b..4958a07 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.nodes;
 
@@ -40,18 +40,16 @@
   /** The component that contains the nodes. */
   private Component parent;
 
-  /**
+  /*
    * Transferable implementation
    * ============================================
    */
 
-  /** {@inheritDoc} */
   @Override
   public boolean isDataFlavorSupported(DataFlavor df) {
     return df.equals(INFO_FLAVOR);
   }
 
-  /** {@inheritDoc} */
   @Override
   public Object getTransferData(DataFlavor df)
   throws UnsupportedFlavorException, IOException {
@@ -61,7 +59,6 @@
     return this;
   }
 
-  /** {@inheritDoc} */
   @Override
   public DataFlavor[] getTransferDataFlavors() {
     return FLAVORS;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
index 6288c1e..782bd66 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
@@ -12,17 +12,13 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-/**
- * Abstract class with some common methods for all the nodes in the
- * 'General Information' tree.
- *
- */
+/** Abstract class with some common methods for all the nodes in the 'General Information' tree. */
 public class GeneralMonitoringTreeNode extends DefaultMutableTreeNode
 {
   private static final long serialVersionUID = 7896765876669863639L;
@@ -64,13 +60,13 @@
     return identifier;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isRoot()
   {
     return isRoot;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isLeaf()
   {
     return getChildCount() == 0;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
index f915039..46cb428 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/IndexTreeNode.java
@@ -12,16 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import org.opends.guitools.controlpanel.datamodel.IndexDescriptor;
 
-/**
- * A node representing a 'normal' index.  It is used in the 'Manage Index' tree.
- *
- */
+/** A node representing a 'normal' index. It is used in the 'Manage Index' tree. */
 public class IndexTreeNode extends AbstractIndexTreeNode
 {
   private static final long serialVersionUID = -3527916032758373700L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
index 3023322..65b9f68 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/MatchingRuleTreeNode.java
@@ -12,18 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import org.forgerock.opendj.ldap.schema.MatchingRule;
 
-/**
- * Class of the nodes that represent a matching rule in the 'Manage Schema'
- * tree.
- *
- */
+/** Class of the nodes that represent a matching rule in the 'Manage Schema' tree. */
 public class MatchingRuleTreeNode extends SchemaElementTreeNode
 {
   private static final long serialVersionUID = 75800988643731136L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
index d54c114..eea1a4e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/RootNode.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -19,16 +20,12 @@
 /**
  * The root node of the tree in the 'Manage Entries...' tree.  It represents
  * the root entry of the directory.
- *
  */
 public class RootNode extends SuffixNode {
 
   private static final long serialVersionUID = 9030738910898224866L;
 
-  /**
-   * Constructor of the node.
-   *
-   */
+  /** Constructor of the node. */
   public RootNode() {
     super("");
     setLeaf(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
index e4e98c1..752799e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
@@ -12,18 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
-/**
- * Abstract class with some common methods for all the nodes in the
- * 'Manage Schema' tree.
- *
- */
+/** Abstract class with some common methods for all the nodes in the 'Manage Schema' tree. */
 public abstract class SchemaElementTreeNode extends DefaultMutableTreeNode
 {
   private static final long serialVersionUID = 5832209952457633471L;
@@ -61,13 +57,13 @@
     return schemaElement;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isRoot()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isLeaf()
   {
     return true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
index 1167d9c..76cf805 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/StandardObjectClassTreeNode.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -19,11 +20,7 @@
 import org.opends.server.types.ObjectClass;
 
 
-/**
- * Class of the nodes that represent a standard object class in the 'Manage
- * Schema' tree.
- *
- */
+/** Class of the nodes that represent a standard object class in the 'Manage Schema' tree. */
 public class StandardObjectClassTreeNode extends SchemaElementTreeNode
 {
   private static final long serialVersionUID = 3266062905133766539L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
index 8498128..388a70e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SuffixNode.java
@@ -12,14 +12,12 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
-/**
- * Represents a suffix in the tree in the 'Manage Entries...' tree.
- *
- */
+/** Represents a suffix in the tree in the 'Manage Entries...' tree. */
 public class SuffixNode extends BasicNode {
 
   private static final long serialVersionUID = -58392395417985255L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
index 6435159..e33e241 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/VLVIndexTreeNode.java
@@ -12,16 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
 
-/**
- * A node representing a VLV index.  It is used in the 'Manage Index' tree.
- *
- */
+/** A node representing a VLV index. It is used in the 'Manage Index' tree. */
 public class VLVIndexTreeNode extends AbstractIndexTreeNode
 {
   private static final long serialVersionUID = -4067198828465569689L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java
index 58ccac6..f38bf81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/package-info.java
@@ -12,12 +12,10 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 
 
-/**
- * Contains the panels and dialogs displayed in the Control Panel.
- *
- */
+/** Contains the panels and dialogs displayed in the Control Panel. */
 package org.opends.guitools.controlpanel.ui;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
index c2714eb..6bc9925 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.renderer;
 
@@ -23,9 +23,7 @@
 
 import org.opends.guitools.controlpanel.util.Utilities;
 
-/**
- * Class used to have components that provide a valid accessible name.
- */
+/** Class used to have components that provide a valid accessible name. */
 public class AccessibleTableHeaderRenderer implements TableCellRenderer
 {
   private TableCellRenderer renderer;
@@ -39,7 +37,7 @@
     this.renderer = renderer;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
index 96e7b6f..89d8d43 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -40,11 +40,7 @@
 import org.opends.guitools.controlpanel.ui.components.ObjectClassCellPanel;
 import org.opends.guitools.controlpanel.util.Utilities;
 
-/**
- * The cell editor used in the 'Attribute' View of the entries in the LDAP
- * entry browser.
- *
- */
+/** The cell editor used in the 'Attribute' View of the entries in the LDAP entry browser. */
 public class AttributeCellEditor extends AbstractCellEditor
 implements TableCellEditor
 {
@@ -78,16 +74,13 @@
   private String attrName;
 
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public AttributeCellEditor()
   {
     textField = Utilities.createTextField();
     textField.getDocument().addDocumentListener(new DocumentListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void changedUpdate(DocumentEvent ev)
       {
         if (!textField.hasFocus())
@@ -96,13 +89,13 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -111,7 +104,7 @@
     passwordField = Utilities.createPasswordField();
     passwordField.getDocument().addDocumentListener(new DocumentListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void changedUpdate(DocumentEvent ev)
       {
         if (!passwordField.hasFocus())
@@ -120,13 +113,13 @@
         }
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
 
-      /** {@inheritDoc} */
+      @Override
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -137,7 +130,7 @@
     binaryPanel = new BinaryCellPanel();
     binaryPanel.addEditActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         if (editBinaryDlg == null)
@@ -184,7 +177,7 @@
     ocPanel = new ObjectClassCellPanel();
     ocPanel.addEditActionListener(new ActionListener()
     {
-      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         if (editOcDlg == null)
@@ -214,7 +207,7 @@
     });
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTableCellEditorComponent(JTable table, Object value,
                    boolean isSelected, int row, int column)
   {
@@ -277,7 +270,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getCellEditorValue()
   {
     if (binaryValue != null)
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 acda9e2..1fb33ef 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -35,7 +35,6 @@
 /**
  * Renderer of the table that contains the list of backups (it is used in the
  * tables of the verify backup and restore panels).
- *
  */
 public class BackupTableCellRenderer extends DefaultTableCellRenderer
 {
@@ -49,10 +48,7 @@
   private static final Border incrementalBorder =
     BorderFactory.createEmptyBorder(4, 4, 4, 4);
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BackupTableCellRenderer()
   {
     setForeground(ColorAndFontConstants.tableForeground);
@@ -69,7 +65,7 @@
     this.backupParentPath = backupParentPath;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
index a4eea4b..2faa66f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
@@ -12,9 +12,8 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.guitools.controlpanel.ui.renderer;
 
 import java.awt.Component;
@@ -24,22 +23,18 @@
 import org.opends.guitools.controlpanel.datamodel.BaseDNTableModel;
 import org.opends.guitools.controlpanel.util.Utilities;
 
-/**
- * Class used to render the base DN table cells.
- */
+/** Class used to render the base DN table cells. */
 public class BaseDNCellRenderer extends CustomCellRenderer
 {
   private static final long serialVersionUID = -256719167426289735L;
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public BaseDNCellRenderer()
   {
     super();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column) {
     String text = (String)value;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
index 5042845..ef519fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -26,10 +26,7 @@
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
 
-/**
- * The renderer used to render the nodes in the LDAP entry browser.
- *
- */
+/** The renderer used to render the nodes in the LDAP entry browser. */
 public class BrowserCellRenderer extends TreeCellRenderer {
 
   private static final long serialVersionUID = 6756291700611741513L;
@@ -52,7 +49,7 @@
     inspectedNode = node;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTreeCellRendererComponent(
       JTree tree,
       Object value,
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 dfc08e4..e86dea6 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -31,31 +31,23 @@
 import org.opends.guitools.controlpanel.util.Utilities;
 import org.forgerock.i18n.LocalizableMessage;
 
-/**
- * Class used to render the tables.
- */
+/** Class used to render the tables. */
 public class CustomCellRenderer extends LabelWithHelpIcon
 implements TableCellRenderer
 {
   private static final long serialVersionUID = -8604332267021523835L;
-  /**
-   * The border of the first column.
-   */
+  /** The border of the first column. */
   protected static final Border column0Border =
     BorderFactory.createCompoundBorder(
       BorderFactory.createMatteBorder(0, 1, 0, 0,
           ColorAndFontConstants.gridColor),
           BorderFactory.createEmptyBorder(4, 4, 4, 4));
-  /**
-   * The default border.
-   */
+  /** The default border. */
   public static final Border defaultBorder =
     BorderFactory.createEmptyBorder(4, 4, 4, 4);
   private static Border defaultFocusBorder;
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public CustomCellRenderer()
   {
     super(LocalizableMessage.EMPTY, null);
@@ -66,7 +58,7 @@
     setForeground(ColorAndFontConstants.treeForeground);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column) {
     if (value instanceof String)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
index d4fbbc5..5ba6897 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
@@ -12,9 +12,8 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.guitools.controlpanel.ui.renderer;
 
 import java.awt.BorderLayout;
@@ -35,25 +34,15 @@
  * A renderer used in the Control Panel that deals with
  * CategorizedComboBoxElement elements.  It can be used to render JList and
  * JComboBoxes.
- *
  */
 public class CustomListCellRenderer implements ListCellRenderer
 {
   private ListCellRenderer defaultRenderer;
-
-  /**
-   * The separator used to render a non-selectable separator in the combo box.
-   */
+  /** The separator used to render a non-selectable separator in the combo box. */
   protected Component separator;
-
-  /**
-   * The default font.
-   */
+  /** The default font. */
   protected Font defaultFont;
-
-  /**
-   * The category font.
-   */
+  /** The category font. */
   protected Font categoryFont;
 
   /**
@@ -84,7 +73,7 @@
     ((JPanel)separator).setBorder(new EmptyBorder(5, 3, 5, 3));
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
index eec2c22..5a3ad9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -30,7 +30,6 @@
 /**
  * The renderer to be used to render AbstractIndexDescriptor objects in a list.
  * It marks the indexes that require to be rebuilt with a '*' character.
- *
  */
 public class IndexCellRenderer extends CustomListCellRenderer
 {
@@ -47,7 +46,7 @@
     this.info = info;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
index b972050..05a357e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexComboBoxCellRenderer.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -27,7 +28,6 @@
  * The renderer to be used to render CategorizedComboBoxElement objects whose
  * values are AbstraceIndexDescriptor objects.  It can be used with combo
  * boxes.
- *
  */
 public class IndexComboBoxCellRenderer extends CustomListCellRenderer
 {
@@ -45,6 +45,7 @@
    * @param desc the combo box element.
    * @return the String value for a given CategorizedComboBoxElement.
    */
+  @Override
   protected String getStringValue(CategorizedComboBoxElement desc)
   {
     String v;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
index c309a90..3816b61 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.renderer;
 
@@ -41,7 +41,7 @@
     super(combo);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 9455167..f609888 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.renderer;
 
@@ -29,9 +29,7 @@
 import org.opends.server.types.CommonSchemaElements;
 import org.forgerock.opendj.ldap.schema.ObjectClassType;
 
-/**
- * The cell renderer to be used to render schema elements in a combo box.
- */
+/** The cell renderer to be used to render schema elements in a combo box. */
 public class SchemaElementComboBoxCellRenderer extends CustomListCellRenderer
 {
   /**
@@ -52,7 +50,7 @@
     super(list);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
index c367407..16cdd3f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -31,7 +31,6 @@
  * A table cell renderer that updates the rendering of the cells when the user
  * moves the mouse over the table.  This is done to provide a visual hint that
  * the table can be selected.
- *
  */
 public class SelectableTableCellRenderer extends CustomCellRenderer
 {
@@ -60,7 +59,6 @@
   {
     MouseAdapter mouseListener = new MouseAdapter()
     {
-      /** {@inheritDoc} */
       @Override
       public void mousePressed(MouseEvent ev)
       {
@@ -68,14 +66,12 @@
         table.repaint();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void mouseReleased(MouseEvent ev)
       {
         isBeingPressed = false;
       }
 
-      /** {@inheritDoc} */
       @Override
       public void mouseExited(MouseEvent ev)
       {
@@ -84,7 +80,6 @@
         table.repaint();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void mouseEntered(MouseEvent ev)
       {
@@ -101,7 +96,6 @@
     };
     MouseMotionAdapter mouseMotionAdapter = new MouseMotionAdapter()
     {
-      /** {@inheritDoc} */
       @Override
       public void mouseMoved(MouseEvent ev)
       {
@@ -109,7 +103,6 @@
         table.repaint();
       }
 
-      /** {@inheritDoc} */
       @Override
       public void mouseDragged(MouseEvent ev)
       {
@@ -121,7 +114,6 @@
     table.addMouseMotionListener(mouseMotionAdapter);
   }
 
-  /** {@inheritDoc} */
   @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column)
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 e1ccf78..6ba32b4 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -26,29 +26,20 @@
 
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 
-/**
- * Class used to render the task tables.
- */
+/** Class used to render the task tables. */
 public class TaskCellRenderer extends DefaultTableCellRenderer
 {
   private static final long serialVersionUID = -84332267021523835L;
-  /**
-   * The border of the first column.
-   * TODO: modify CustomCellRenderer to make this public.
-   */
+  /** The border of the first column. TODO: modify CustomCellRenderer to make this public. */
   protected static final Border column0Border =
     BorderFactory.createCompoundBorder(
       BorderFactory.createMatteBorder(0, 1, 0, 0,
           ColorAndFontConstants.gridColor),
           BorderFactory.createEmptyBorder(4, 4, 4, 4));
-  /**
-   * The default border.
-   */
+  /** The default border. */
   public static final Border defaultBorder = CustomCellRenderer.defaultBorder;
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public TaskCellRenderer()
   {
     setFont(ColorAndFontConstants.tableFont);
@@ -57,7 +48,7 @@
     setForeground(ColorAndFontConstants.treeForeground);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column) {
     super.getTableCellRendererComponent(table, value, isSelected, hasFocus,
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
index e5d9a53..f86b30f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -30,23 +30,18 @@
 /**
  * An extension of the DefaultTreeCellRenderer that uses a customized border,
  * foreground and background.
- *
  */
 public class TreeCellRenderer extends DefaultTreeCellRenderer
 {
   private static final long serialVersionUID = 4045260951231311206L;
 
-  /**
-   * Background when the cell is not selected.
-   */
+  /** Background when the cell is not selected. */
   public static final Color nonselectionBackground =
     ColorAndFontConstants.background;
   private static final Color nonselectionForeground =
     ColorAndFontConstants.foreground;
 
-  /**
-   * Background when the cell is selected.
-   */
+  /** Background when the cell is selected. */
   public static final Color selectionBackground =
     ColorAndFontConstants.mouseOverBackground;
 
@@ -67,7 +62,7 @@
     setFont(ColorAndFontConstants.treeFont);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getTreeCellRendererComponent(JTree tree, Object value,
       boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
       boolean hasFocus)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
index f34eeea..0189167 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -27,10 +27,7 @@
 import org.forgerock.i18n.LocalizableMessageDescriptor.Arg1;
 import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
 
-/**
- * Class used to render elements of the class VLVSortOrder.
- *
- */
+/** Class used to render elements of the class VLVSortOrder. */
 public class VLVSortOrderRenderer implements ListCellRenderer
 {
   private ListCellRenderer defaultRenderer;
@@ -44,7 +41,7 @@
     this.defaultRenderer = list.getCellRenderer();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
index 8565a88..d7b5db2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -43,7 +43,6 @@
     super(new ByteArrayOutputStream(), true);
   }
 
-  /** {@inheritDoc} */
   @Override
   public void println(String msg)
   {
@@ -51,7 +50,6 @@
     logger.info(LocalizableMessage.raw(msg));
   }
 
-  /** {@inheritDoc} */
   @Override
   public void write(byte[] b, int off, int len)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
index ac7b410..1f1464c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
@@ -12,9 +12,8 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.guitools.controlpanel.util;
 
 import javax.swing.SwingUtilities;
@@ -41,6 +40,7 @@
  }
 
  /** Performs the processing associated with the background task. */
+ @Override
  public void run()
  {
    try
@@ -48,7 +48,7 @@
      final T returnValue = backgroundTask.processBackgroundTask();
      SwingUtilities.invokeLater(new Runnable()
      {
-       /** {@inheritDoc} */
+       @Override
        public void run()
        {
          backgroundTask.backgroundTaskCompleted(returnValue, null);
@@ -61,7 +61,7 @@
      {
        SwingUtilities.invokeLater(new Runnable()
        {
-         /** {@inheritDoc} */
+         @Override
          public void run()
          {
            backgroundTask.backgroundTaskCompleted(null, t);
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
index d2e64f3..3a403ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
@@ -12,52 +12,45 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.util;
 
-import java.security.cert.X509Certificate;
-
 import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 
 import org.opends.admin.ads.util.ApplicationTrustManager;
 
-/**
- * An application trust manager that accepts all the certificates.
- *
- */
+/** An application trust manager that accepts all the certificates. */
 public class BlindApplicationTrustManager extends ApplicationTrustManager
 {
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public BlindApplicationTrustManager()
   {
     super(null);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void checkClientTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
+    // no-op
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void checkServerTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
+    // no-op
   }
 
-  /** {@inheritDoc} */
+  @Override
   public X509Certificate[] getAcceptedIssuers()
   {
     return new X509Certificate[0];
   }
 
-  /**
-   * Creates a copy of this ApplicationTrustManager.
-   * @return a copy of this ApplicationTrustManager.
-   */
+  @Override
   public BlindApplicationTrustManager createCopy()
   {
     return new BlindApplicationTrustManager();
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
index f0147cb..2c26dbd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -16,6 +16,8 @@
  */
 package org.opends.guitools.controlpanel.util;
 
+import static org.opends.messages.AdminToolMessages.*;
+
 import java.io.File;
 import java.net.InetAddress;
 import java.util.ArrayList;
@@ -27,22 +29,20 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
 import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
 import org.opends.guitools.controlpanel.datamodel.ConnectionHandlerDescriptor;
 import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
 import org.opends.guitools.controlpanel.task.OfflineUpdateException;
-import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.tools.tasks.TaskEntry;
-import org.forgerock.opendj.ldap.DN;
 import org.opends.server.types.DirectoryEnvironmentConfig;
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.InitializationException;
 import org.opends.server.types.OpenDsException;
 import org.opends.server.types.Schema;
 
-import static org.opends.messages.AdminToolMessages.*;
-
 /**
  * An abstract class providing some common interface for the class that read
  * the configuration (and if the server is running, the monitoring information).
@@ -56,10 +56,7 @@
    */
   public static String configFile;
 
-  /**
-   * The error that occurred when setting the environment (null if no error
-   * occurred).
-   */
+  /** The error that occurred when setting the environment (null if no error occurred). */
   protected static OpenDsException environmentSettingException;
   static
   {
@@ -92,65 +89,36 @@
     logger.info(LocalizableMessage.raw("Environment initialized."));
   }
 
-  /**
-   * The exceptions that occurred reading the configuration.
-   */
+  /** The exceptions that occurred reading the configuration. */
   protected List<Exception> exceptions = Collections.emptyList();
 
-  /**
-   * Whether the configuration has already been read or not.
-   */
+  /** Whether the configuration has already been read or not. */
   protected boolean configRead;
 
-  /**
-   * The set of connection listeners.
-   */
+  /** The set of connection listeners. */
   protected Set<ConnectionHandlerDescriptor> listeners = Collections.emptySet();
-
-  /**
-   * The administration connector.
-   */
+  /** The administration connector. */
   protected ConnectionHandlerDescriptor adminConnector;
 
-  /**
-   * The set of backend descriptors.
-   */
+  /** The set of backend descriptors. */
   protected Set<BackendDescriptor> backends = Collections.emptySet();
-
-  /**
-   * The set of administrative users.
-   */
+  /** The set of administrative users. */
   protected Set<DN> administrativeUsers = Collections.emptySet();
 
-  /**
-   * The replication serve port (-1 if the replication server port is not
-   * defined).
-   */
+  /** The replication serve port (-1 if the replication server port is not defined). */
   protected int replicationPort = -1;
-
-  /**
-   * The java version used to run the server.
-   */
+  /** The java version used to run the server. */
   protected String javaVersion;
 
-  /**
-   * The number of connections opened on the server.
-   */
+  /** The number of connections opened on the server. */
   protected int numberConnections;
 
-  /**
-   * Whether the schema checking is enabled or not.
-   */
+  /** Whether the schema checking is enabled or not. */
   protected boolean isSchemaEnabled;
-
-  /**
-   * The schema used by the server.
-   */
+  /** The schema used by the server. */
   protected Schema schema;
 
-  /**
-   * The task entries.
-   **/
+  /** The task entries. */
   protected Set<TaskEntry> taskEntries = Collections.emptySet();
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
index c908b35..9e97f1f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -34,7 +34,6 @@
  * A class that reads an entry on the background.  This is used in the LDAP
  * entries browser.  When the entry is read it notifies to the EntryReadListener
  * objects that have been registered.
- *
  */
 public class LDAPEntryReader extends BackgroundTask<CustomSearchResult>
 {
@@ -56,7 +55,6 @@
     this.notifyListeners = true;
   }
 
-  /** {@inheritDoc} */
   @Override
   public CustomSearchResult processBackgroundTask() throws Throwable
   {
@@ -94,7 +92,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public void backgroundTaskCompleted(CustomSearchResult sr,
       Throwable throwable)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
index cfc0ddd..8e5a80d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -25,7 +25,7 @@
  */
 public class LowerCaseComparator implements Comparator<String>
 {
-  /** {@inheritDoc} */
+  @Override
   public int compare(String s1, String s2)
   {
     if (s1 != null && s2 != null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
index dd6bd76..1c6ccc2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -22,10 +22,7 @@
 import java.io.InputStreamReader;
 import java.io.PrintStream;
 
-/**
- * Class used to write the output and error of a given process in a printstream.
- *
- */
+/** Class used to write the output and error of a given process in a printstream. */
 public class ProcessReader
 {
   private BufferedReader reader;
@@ -58,7 +55,7 @@
 
     readerThread = new Thread(new Runnable()
     {
-      /** {@inheritDoc} */
+      @Override
       public void run()
       {
         String line;
@@ -78,10 +75,7 @@
     });
   }
 
-  /**
-   * Starts reading the output (or error) of the process.
-   *
-   */
+  /** Starts reading the output (or error) of the process. */
   public void startReading()
   {
     readerThread.start();
@@ -90,7 +84,6 @@
   /**
    * Interrupts the reading of the output (or error) of the process.  The method
    * does not return until the reading is over.
-   *
    */
   public void interrupt()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 3c52167..93ca6df 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -127,9 +127,7 @@
 import org.opends.server.util.ServerConstants;
 import org.opends.server.util.StaticUtils;
 
-/**
- * A static class that provides miscellaneous functions.
- */
+/** A static class that provides miscellaneous functions. */
 public class Utilities
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -273,7 +271,6 @@
    * @param msg the message to be displayed.
    * @return  <CODE>true</CODE> if the user accepts the message and
    * <CODE>false</CODE> otherwise.
-   *
    */
   public static boolean displayConfirmationDialog(Component parentComponent,
       LocalizableMessage title, LocalizableMessage msg)
@@ -1230,7 +1227,6 @@
    *
    * @param comp the component to be centered.
    * @param ref the component to be used as reference.
-   *
    */
   public static void centerGoldenMean(Window comp, Component ref)
   {
@@ -1525,7 +1521,6 @@
    * @param dn the DN as a String.
    * @return a Name object representing the DN.
    * @throws InvalidNameException if the provided DN value is not valid.
-   *
    */
   public static Name getJNDIName(String dn) throws InvalidNameException
   {
@@ -2804,9 +2799,7 @@
     }
   }
 
-  /**
-   * Initialize the configuration framework.
-   */
+  /** Initialize the configuration framework. */
   public static void initializeConfigurationFramework()
   {
     if (!ConfigurationFramework.getInstance().isInitialized())
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java
index a0682f3..390054b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ViewPositions.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.util;
 
@@ -24,7 +24,6 @@
 /**
  * A class used to be able to update the scroll position in different panels.
  * It basically contains two lists of scrollbars and points.
- *
  */
 public class ViewPositions
 {
@@ -51,10 +50,7 @@
     points.add(p);
   }
 
-  /**
-   * Clears the contents of both lists.
-   *
-   */
+  /** Clears the contents of both lists. */
   public void clear()
   {
     scrolls.clear();
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 e450acf..4ade2ef 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
@@ -14,7 +14,6 @@
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
  */
-
 package org.opends.guitools.uninstaller;
 
 import static org.opends.messages.AdminToolMessages.*;
@@ -81,7 +80,7 @@
     initializeParser();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void launch() {
     //  Validate user provided data
     try
@@ -109,9 +108,7 @@
     }
   }
 
-  /**
-   * Initialize the contents of the argument parser.
-   */
+  /** Initialize the contents of the argument parser. */
   protected void initializeParser()
   {
     argParser = new UninstallerArgumentParser(getClass().getName(),
@@ -136,47 +133,37 @@
                                   : ERR_UNINSTALL_LAUNCHER_GUI_LAUNCHED_FAILED.get());
   }
 
-  /** {@inheritDoc} */
+  @Override
   public ArgumentParser getArgumentParser() {
     return this.argParser;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected void willLaunchGui() {
     System.out.println(INFO_UNINSTALL_LAUNCHER_LAUNCHING_GUI.get());
     System.setProperty("org.opends.quicksetup.Application.class",
             org.opends.guitools.uninstaller.Uninstaller.class.getName());
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected CliApplication createCliApplication() {
     return new Uninstaller();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getFrameTitle() {
     return Utils.getCustomizedObject("INFO_FRAME_UNINSTALL_TITLE",
         INFO_FRAME_UNINSTALL_TITLE.get(DynamicConstants.PRODUCT_NAME),
         LocalizableMessage.class);
   }
 
-  /**
-   * Indicates whether or not the launcher should print a usage
-   * statement based on the content of the arguments passed into
-   * the constructor.
-   * @return boolean where true indicates usage should be printed
-   */
+  @Override
   protected boolean shouldPrintUsage() {
     return argParser.isUsageArgumentPresent() &&
     !argParser.usageOrVersionDisplayed();
   }
 
-  /**
-   * Indicates whether or not the launcher should print a usage
-   * statement based on the content of the arguments passed into
-   * the constructor.
-   * @return boolean where true indicates usage should be printed
-   */
+  @Override
   protected boolean isQuiet() {
     return argParser.isQuiet();
   }
@@ -191,27 +178,14 @@
     return !argParser.isInteractive();
   }
 
-  /**
-   * Indicates whether or not the launcher should print a version
-   * statement based on the content of the arguments passed into
-   * the constructor.
-   * @return boolean where true indicates version should be printed
-   */
+  @Override
   protected boolean shouldPrintVersion() {
     return argParser.isVersionArgumentPresent() &&
     !argParser.usageOrVersionDisplayed();
   }
 
-  /**
-   * Indicates whether the launcher will launch a command line versus
-   * a graphical application based on the contents of the arguments
-   * passed into the constructor.
-   *
-   * @return boolean where true indicates that a CLI application
-   *         should be launched
-   */
+  @Override
   protected boolean isCli() {
     return argParser.isCli();
   }
-
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
index c2fcd82..d094589 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.guitools.uninstaller;
 
@@ -46,7 +46,7 @@
   /** Installation finished with an error. */
   FINISHED_WITH_ERROR;
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isLast() {
     return this == FINISHED_SUCCESSFULLY ||
     this == FINISHED_WITH_ERROR ||
@@ -54,7 +54,7 @@
     this == FINISHED_WITH_ERROR_DELETING;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isError() {
     return this.equals(FINISHED_WITH_ERROR);
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
index 5fd0221..40ef44e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.opends.guitools.uninstaller.ui;
@@ -43,7 +43,6 @@
  * This is the panel displayed when the user is uninstalling Open DS.  It is
  * basically a panel with the text informing of the consequences of uninstalling
  * the server and asking for confirmation.
- *
  */
 public class ConfirmUninstallPanel extends QuickSetupStepPanel
 {
@@ -60,7 +59,6 @@
    * The constructor of this class.
    * @param application Application this panel represents
    * @param installStatus the object describing the current installation status.
-   *
    */
   public ConfirmUninstallPanel(GuiApplication application,
                                CurrentInstallStatus installStatus)
@@ -68,7 +66,6 @@
     super(application);
   }
 
-  /** {@inheritDoc} */
   @Override
   public Object getFieldValue(FieldName fieldName)
   {
@@ -97,14 +94,12 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_CONFIRM_UNINSTALL_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   protected Component createInputPanel()
   {
@@ -227,7 +222,6 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getInstructions()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java
index 4e095b3..f141857 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/LoginDialog.java
@@ -138,7 +138,6 @@
     return isCanceled;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void setVisible(boolean visible)
   {
@@ -356,10 +355,7 @@
     return p;
   }
 
-  /**
-   * Method called when user clicks on cancel.
-   *
-   */
+  /** Method called when user clicks on cancel. */
   private void cancelClicked()
   {
     isCanceled = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
index 78e7df7..014fd22 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
@@ -714,19 +714,14 @@
    * The class just reads what is written to the standard error, obtains an
    * formatted representation of it and then notifies the
    * ProgressUpdateListeners with the formatted messages.
-   *
    */
   public class ErrorPrintStream extends ApplicationPrintStream {
 
-    /**
-     * Default constructor.
-     *
-     */
+    /** Default constructor. */
     public ErrorPrintStream() {
       super();
     }
 
-    /** {@inheritDoc} */
     @Override
     protected LocalizableMessage formatString(String s) {
       return getFormattedLogError(LocalizableMessage.raw(s));
@@ -743,20 +738,15 @@
    * The class just reads what is written to the standard output, obtains an
    * formatted representation of it and then notifies the
    * ProgressUpdateListeners with the formatted messages.
-   *
    */
   public class OutputPrintStream extends ApplicationPrintStream
   {
 
-    /**
-     * Default constructor.
-     *
-     */
+    /** Default constructor. */
     public OutputPrintStream() {
       super();
     }
 
-    /** {@inheritDoc} */
     @Override
     protected LocalizableMessage formatString(String s) {
       return getFormattedLog(LocalizableMessage.raw(s));
@@ -779,17 +769,13 @@
      */
     protected abstract LocalizableMessage formatString(String string);
 
-    /**
-     * Default constructor.
-     *
-     */
+    /** Default constructor. */
     public ApplicationPrintStream()
     {
       super(new ByteArrayOutputStream(), true);
       isFirstLine = true;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void println(String msg)
     {
@@ -806,7 +792,6 @@
       isFirstLine = false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void write(byte[] b, int off, int len)
     {
@@ -826,26 +811,19 @@
 
 
 
-  /**
-   * Class used to add points periodically to the end of the logs.
-   */
+  /** Class used to add points periodically to the end of the logs. */
   protected class PointAdder implements Runnable
   {
     private Thread t;
     private boolean stopPointAdder;
     private boolean pointAdderStopped;
 
-    /**
-     * Default constructor.
-     */
+    /** Default constructor. */
     public PointAdder()
     {
     }
 
-    /**
-     * Starts the PointAdder: points are added at the end of the logs
-     * periodically.
-     */
+    /** Starts the PointAdder: points are added at the end of the logs periodically. */
     public void start()
     {
       LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
@@ -862,10 +840,7 @@
       t.start();
     }
 
-    /**
-     * Stops the PointAdder: points are no longer added at the end of the logs
-     * periodically.
-     */
+    /** Stops the PointAdder: points are no longer added at the end of the logs periodically. */
     public synchronized void stop()
     {
       stopPointAdder = true;
@@ -884,7 +859,6 @@
       }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void run()
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
index 8b9ab25..6abcbc8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
@@ -15,8 +15,8 @@
  * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup;
-import org.forgerock.i18n.LocalizableMessage;
 
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.server.types.OpenDsException;
 
 /**
@@ -37,11 +37,9 @@
    * @param e Exception cause
    * @return ApplicationException with Type property being FILE_SYSTEM_ERROR
    */
-  public static ApplicationException createFileSystemException(LocalizableMessage msg,
-      Exception e)
+  public static ApplicationException createFileSystemException(LocalizableMessage msg, Exception e)
   {
-    return new ApplicationException(ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
-        msg, e);
+    return new ApplicationException(ReturnCode.FILE_SYSTEM_ACCESS_ERROR, msg, e);
   }
 
   /**
@@ -70,7 +68,7 @@
     return type;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String toString()
   {
     return getMessage();
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 06ebb0d..4c2fdd4 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 package org.opends.quicksetup;
 
@@ -303,7 +303,6 @@
     return values.get(REVISION);
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
@@ -319,7 +318,6 @@
     return sb.toString();
   }
 
-  /** {@inheritDoc} */
   @Override
   public int compareTo(BuildInformation bi) {
     if (getMajorVersion().equals(bi.getMajorVersion())) {
@@ -342,7 +340,6 @@
     return 1;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -353,7 +350,6 @@
         && compareTo((BuildInformation)o) == 0;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode() {
     int hc = 11;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java
index e013d67..f79f51c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ButtonName.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup;
@@ -22,33 +23,19 @@
  */
 public enum ButtonName
 {
-  /**
-   * The Next button.
-   */
+  /** The Next button. */
   NEXT,
-  /**
-   * The Previous button.
-   */
+  /** The Previous button. */
   PREVIOUS,
-  /**
-   * The Quit button.
-   */
+  /** The Quit button. */
   QUIT,
-  /**
-   * The Continue with install button.
-   */
+  /** The Continue with install button. */
   CONTINUE_INSTALL,
-  /**
-   * The Close button.
-   */
+  /** The Close button. */
   CLOSE,
-  /**
-   * The Finish button.
-   */
+  /** The Finish button. */
   FINISH,
-  /**
-   * The Launch Status Panel button.
-   */
+  /** The Launch Status Panel button. */
   LAUNCH_STATUS_PANEL,
   /**
    * Input panel button.  This is used to identify generic buttons inside
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
index 5b3ab13..5b5d41a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CliUserInteraction.java
@@ -12,31 +12,29 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup;
 
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.LocalizableMessageBuilder;
+import static com.forgerock.opendj.cli.Utils.*;
 
 import static org.opends.messages.AdminToolMessages.*;
-import static com.forgerock.opendj.cli.Utils.wrapText;
 
+import java.util.List;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.opends.quicksetup.util.Utils;
+
 import com.forgerock.opendj.cli.ClientException;
 import com.forgerock.opendj.cli.ConsoleApplication;
 import com.forgerock.opendj.cli.Menu;
 import com.forgerock.opendj.cli.MenuBuilder;
 import com.forgerock.opendj.cli.MenuResult;
 
-import java.util.List;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-/**
- * Supports user interactions for a command line driven application.
- */
+/** Supports user interactions for a command line driven application. */
 public class CliUserInteraction extends ConsoleApplication
         implements UserInteraction {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -54,14 +52,14 @@
     isForceOnError = ud != null && ud.isForceOnError();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object confirm(LocalizableMessage summary, LocalizableMessage details,
                         LocalizableMessage title, MessageType type, LocalizableMessage[] options,
                         LocalizableMessage def) {
     return confirm(summary, details, null, title, type, options, def, null);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object confirm(LocalizableMessage summary, LocalizableMessage details, LocalizableMessage fineDetails,
                         LocalizableMessage title, MessageType type, LocalizableMessage[] options,
                         LocalizableMessage def, LocalizableMessage viewDetailsOption) {
@@ -138,12 +136,12 @@
     return returnValue;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String createUnorderedList(List<?> list) {
     StringBuilder sb = new StringBuilder();
     if (list != null) {
       for (Object o : list) {
-        sb.append(/*bullet=*/"* ");
+        sb.append("* ");
         sb.append(o);
         sb.append(Constants.LINE_SEPARATOR);
       }
@@ -158,44 +156,43 @@
     getErrorStream().println(text);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isAdvancedMode() {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isInteractive() {
     return isInteractive;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean isMenuDrivenMode() {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isQuiet() {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isScriptFriendly() {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isVerbose() {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isCLI()
   {
     return true;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isForceOnError() {
     return isForceOnError;
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
index b8813a3..3f563c6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/JavaArguments.java
@@ -27,9 +27,7 @@
 import static org.forgerock.util.Utils.*;
 import static org.opends.messages.QuickSetupMessages.*;
 
-/**
- * A class used to describe the java arguments for a given command-line.
- */
+/** A class used to describe the java arguments for a given command-line. */
 public class JavaArguments
 {
   private int maxMemory = -1;
@@ -99,7 +97,6 @@
     this.additionalArguments = additionalArguments;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o)
   {
@@ -117,7 +114,6 @@
     return false;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
@@ -129,7 +125,6 @@
     return hashCode;
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString()
   {
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 6920e0f..391bf7b 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
@@ -75,9 +75,8 @@
   public abstract ArgumentParser getArgumentParser();
 
   /**
-   * Indicates whether or not the launcher should print a usage
-   * statement based on the content of the arguments passed into
-   * the constructor.
+   * Indicates whether the launcher should print a usage statement
+   * based on the content of the arguments passed into the constructor.
    * @return boolean where true indicates usage should be printed
    */
   protected boolean shouldPrintUsage() {
@@ -94,9 +93,8 @@
   }
 
   /**
-   * Indicates whether or not the launcher should print a usage
-   * statement based on the content of the arguments passed into
-   * the constructor.
+   * Indicates whether the launcher should print a usage statement
+   * based on the content of the arguments passed into the constructor.
    * @return boolean where true indicates usage should be printed
    */
   protected boolean isQuiet() {
@@ -113,9 +111,8 @@
   }
 
   /**
-   * Indicates whether or not the launcher should print a version
-   * statement based on the content of the arguments passed into
-   * the constructor.
+   * Indicates whether the launcher should print a version statement
+   * based on the content of the arguments passed into the constructor.
    * @return boolean where true indicates version should be printed
    */
   protected boolean shouldPrintVersion() {
@@ -191,6 +188,7 @@
       { -1 };
     Thread t = new Thread(new Runnable()
     {
+      @Override
       public void run()
       {
         try
@@ -234,8 +232,7 @@
     }
     catch (InterruptedException ie)
     {
-      /* An error occurred, so the return value will be -1.  We got nothing to
-      do with this exception. */
+      /* An error occurred, so the return value will be -1. We got nothing to do with this exception. */
     }
     System.setErr(printStream);
     return returnValue[0];
@@ -276,9 +273,7 @@
     return returnValue.getReturnCode();
   }
 
-  /**
-   * Prints the version statement to standard output terminal.
-   */
+  /** Prints the version statement to standard output terminal. */
   protected void printVersion()
   {
     System.out.print(PRINTABLE_VERSION_STRING);
@@ -324,9 +319,7 @@
   /** Called if launching of the GUI failed. */
   protected abstract void guiLaunchFailed();
 
-  /**
-   * The main method which is called by the command lines.
-   */
+  /** The main method which is called by the command lines. */
   public void launch() {
     if (shouldPrintVersion()) {
       ArgumentParser parser = getArgumentParser();
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 51d2988..cc49924 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup;
@@ -20,14 +20,12 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 
 import org.opends.quicksetup.util.Utils;
 import org.opends.server.util.ServerConstants;
-import org.opends.server.util.StaticUtils;
 
 /**
  * Represents information about the license file. NOTE: the license file
@@ -37,25 +35,14 @@
 public class LicenseFile
 {
   private static final String INSTALL_ROOT_SYSTEM_PROPERTY = "INSTALL_ROOT";
-
-  /**
-   * The license file name in Legal directory.
-   */
+  /** The license file name in Legal directory. */
   private static final String LICENSE_FILE_NAME = "Forgerock_License.txt";
-
-  /**
-   * The Legal folder which contains license file.
-   */
+  /** The Legal folder which contains license file. */
   private static final String LEGAL_FOLDER_NAME = "legal-notices";
-
-  /**
-   * The accepted license file name.
-   */
+  /** The accepted license file name. */
   private static final String ACCEPTED_LICENSE_FILE_NAME = "licenseAccepted";
 
-  /**
-   * Get the directory in which legal files are stored.
-   */
+  /** Get the directory in which legal files are stored. */
   private static String getInstallDirectory() {
     String installDirName = System.getProperty(INSTALL_ROOT_SYSTEM_PROPERTY);
     if (installDirName == null)
@@ -69,9 +56,7 @@
     return installDirName;
   }
 
-  /**
-   * Get the directory in which approved legal files are stored.
-   */
+  /** Get the directory in which approved legal files are stored. */
   private static String getInstanceLegalDirectory()
   {
     String instanceLegalDirName = Utils.getInstancePathFromInstallPath(getInstallDirectory())
@@ -84,34 +69,24 @@
     return instanceLegalDirName;
   }
 
-  /**
-   * The File object related to the license file.
-   */
-  private static File licFile;
-
-  /**
-   * The license file approval state.
-   */
+  /** The File object related to the license file. */
+  private static File licenceFile;
+  /** The license file approval state. */
   private static boolean approved;
-
-  /**
-   * Returns the license file name.
-   */
+  /** Returns the license file name. */
   private static String getName()
   {
     return getInstallDirectory() + File.separator + LEGAL_FOLDER_NAME + File.separator + LICENSE_FILE_NAME;
   }
 
-  /**
-   * Returns the license file object.
-   */
+  /** Returns the license file object. */
   private static File getFile()
   {
-    if (licFile == null)
+    if (licenceFile == null)
     {
-      licFile = new File(getName());
+      licenceFile = new File(getName());
     }
-    return licFile;
+    return licenceFile;
   }
 
   /**
@@ -133,39 +108,24 @@
    */
   public static String getText()
   {
-    InputStream input;
-    try
-    {
-      input = new FileInputStream(getFile());
-    }
-    catch (FileNotFoundException e)
-    {
-      // Should not happen
-      return "";
-    }
-
     // Reads the inputstream content.
-    final StringBuilder sb = new StringBuilder();
-    try
+    try (InputStream input = new FileInputStream(getFile());
+        BufferedReader br = new BufferedReader(new InputStreamReader(input));)
     {
-      final BufferedReader br = new BufferedReader(new InputStreamReader(input));
-      String read = br.readLine();
-
-      while (read != null)
+      final StringBuilder sb = new StringBuilder();
+      String read;
+      while ((read = br.readLine()) != null)
       {
         sb.append(read);
         sb.append(ServerConstants.EOL);
-        read = br.readLine();
       }
+      return sb.toString();
     }
     catch (IOException ioe)
     {
       // Should not happen
       return "";
     }
-    StaticUtils.close(input);
-
-    return sb.toString();
   }
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java
index 170f673..02de2e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/QuickSetupCli.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup;
@@ -29,10 +29,7 @@
 import org.opends.quicksetup.event.ProgressUpdateEvent;
 import com.forgerock.opendj.cli.ClientException;
 
-/**
- * Class used by Launcher to start a CLI application.
- *
- */
+/** Class used by Launcher to start a CLI application. */
 public class QuickSetupCli {
 
   /** Arguments passed in the command line. */
@@ -85,6 +82,7 @@
         if (!userData.isQuiet()) {
           cliApp.addProgressUpdateListener(
                   new ProgressUpdateListener() {
+                    @Override
                     public void progressUpdate(ProgressUpdateEvent ev) {
                       LocalizableMessage newLogs = ev.getNewLogs();
                       if (newLogs != null) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
index d6aa059..3af990e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
@@ -12,103 +12,53 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
-
 package org.opends.quicksetup;
 
-/**
- * This class defines enumeration of application return code.
- */
+/** This class defines enumeration of application return code. */
 public class ReturnCode {
 
-  /**
-   * Return code: Application successful.
-   */
+  /** Return code: Application successful. */
   public static final ReturnCode SUCCESSFUL = new ReturnCode(0);
-
-  /**
-   * Return code: User Cancelled operation.
-   */
+  /** Return code: User Cancelled operation. */
   public static final ReturnCode CANCELED = new ReturnCode(0);
-
-  /**
-   * Return code: User provided invalid data.
-   */
+  /** Return code: User provided invalid data. */
   public static final ReturnCode USER_DATA_ERROR = new ReturnCode(2);
-
-  /**
-   * Return code: Error accessing file system (reading/writing).
-   */
+  /** Return code: Error accessing file system (reading/writing). */
   public static final ReturnCode FILE_SYSTEM_ACCESS_ERROR = new ReturnCode(3);
-
-  /**
-   * Error during the configuration of the Directory Server.
-   */
+  /** Error during the configuration of the Directory Server. */
   public static final ReturnCode CONFIGURATION_ERROR = new ReturnCode(5);
-
   /**
    * Error during the import of data (base entry, from LDIF file or
    * automatically generated data).
    */
-
   public static final ReturnCode IMPORT_ERROR = new ReturnCode(6);
-
-  /**
-   * Error starting the Open DS server.
-   */
+  /** Error starting the Open DS server. */
   public static final ReturnCode START_ERROR = new ReturnCode(7);
-
-  /**
-   * Error stopping the Open DS server.
-   */
+  /** Error stopping the Open DS server. */
   public static final ReturnCode STOP_ERROR = new ReturnCode(8);
-
-  /**
-   * Error enabling the Windows service.
-   */
+  /** Error enabling the Windows service. */
   public static final ReturnCode WINDOWS_SERVICE_ERROR = new ReturnCode(9);
-
-  /**
-   * Application specific error.
-   */
+  /** Application specific error. */
   public static final ReturnCode APPLICATION_ERROR = new ReturnCode(10);
-
-  /**
-   * Error invoking an OpenDS tool.
-   */
+  /** Error invoking an OpenDS tool. */
   public static final ReturnCode TOOL_ERROR = new ReturnCode(11);
-
-  /**
-   * Return code: Bug.
-   */
+  /** Return code: Bug. */
   public static final ReturnCode BUG = new ReturnCode(12);
-
-  /**
-   * Return code: java version non-compatible.
-   */
+  /** Return code: java version non-compatible. */
   public static final ReturnCode JAVA_VERSION_INCOMPATIBLE = new ReturnCode(13);
-
-  /**
-   * Return code: user provided invalid input.
-   */
+  /** Return code: user provided invalid input. */
   public static final ReturnCode USER_INPUT_ERROR = new ReturnCode(14);
-
-  /**
-   * Return code: Print Version.
-   */
+  /** Return code: Print Version. */
   public static final ReturnCode PRINT_VERSION = new ReturnCode(50);
-
-  /**
-   * Return code for errors that are non-specified.
-   */
+  /** Return code for errors that are non-specified. */
   public static final ReturnCode UNKNOWN = new ReturnCode(100);
 
-
   private int code;
 
   /**
-   * Creates a new parametrized instance.
+   * Creates a new parameterized instance.
    *
    * @param code to return
    */
@@ -124,5 +74,4 @@
   public int getReturnCode() {
     return code;
   }
-
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java
index ddc6030..fcd8d00 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SecurityOptions.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.quicksetup;
 
@@ -21,10 +21,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
-/**
- * Class used to describe the Security Options specified by the user.
- *
- */
+/** Class used to describe the Security Options specified by the user. */
 public class SecurityOptions
 {
   private boolean enableSSL;
@@ -37,34 +34,20 @@
   /** Alias of a self-signed certificate using elliptic curve. */
   public static final String SELF_SIGNED_EC_CERT_ALIAS = SELF_SIGNED_CERT_ALIAS + "-ec";
 
-  /**
-   * The different type of security options that we can have.
-   */
+  /** The different type of security options that we can have. */
   public enum CertificateType
   {
-    /**
-     * No certificate to be used (and so no SSL and no Start TLS).
-     */
+    /** No certificate to be used (and so no SSL and no Start TLS). */
     NO_CERTIFICATE,
-    /**
-     * Use a newly created Self Signed Certificate.
-     */
+    /** Use a newly created Self Signed Certificate. */
     SELF_SIGNED_CERTIFICATE,
-    /**
-     * Use an existing JKS key store.
-     */
+    /** Use an existing JKS key store. */
     JKS,
-    /**
-     * Use an existing JCEKS key store.
-     */
+    /** Use an existing JCEKS key store. */
     JCEKS,
-    /**
-     * Use an existing PKCS#11 key store.
-     */
+    /** Use an existing PKCS#11 key store. */
     PKCS11,
-    /**
-     * Use an existing PKCS#12 key store.
-     */
+    /** Use an existing PKCS#12 key store. */
     PKCS12
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
index 5fe7b17..db8f861 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
@@ -71,13 +71,13 @@
     screen.display(args);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void update(Graphics g)
   {
     paint(g);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void paint(Graphics g)
   {
     g.drawImage(image, 0, 0, this);
@@ -118,6 +118,7 @@
       final String[] fArgs = args;
       Thread t = new Thread(new Runnable()
       {
+        @Override
         public void run()
         {
           mainOutsideEventThread(fArgs);
@@ -169,6 +170,7 @@
     {
       SwingUtilities.invokeAndWait(new Runnable()
       {
+        @Override
         public void run()
         {
           setVisible(true);
@@ -217,6 +219,7 @@
     {
       SwingUtilities.invokeAndWait(new Runnable()
       {
+        @Override
         public void run()
         {
           try
@@ -247,6 +250,7 @@
     {
       SwingUtilities.invokeAndWait(new Runnable()
       {
+        @Override
         public void run()
         {
           setVisible(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java
index ae667fa..d712f57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Step.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup;
 
@@ -79,21 +79,22 @@
    * @return String message key used to access a message catalog to
    * retrieve this step's display name
    */
+  @Override
   public LocalizableMessage getDisplayMessage() {
     return msg;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isProgressStep() {
     return this == PROGRESS;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isFinishedStep() {
     return this == FINISHED;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean isLicenseStep() {
     return this == LICENSE;
   }
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 c7de89a..ddad227 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
@@ -74,20 +74,12 @@
 
   private int connectTimeout = CliConstants.DEFAULT_LDAP_CONNECT_TIMEOUT;
 
-  /**
-   * The script name to be used to get and set the java arguments for the
-   * server runtime.
-   */
+  /** The script name to be used to get and set the java arguments for the server runtime. */
   public final static String SERVER_SCRIPT_NAME = "start-ds";
-  /**
-   * The script name to be used to get and set the java arguments for the
-   * (off-line) import.
-   */
+  /** The script name to be used to get and set the java arguments for the (off-line) import. */
   public final static String IMPORT_SCRIPT_NAME = "import-ldif.offline";
 
-  /**
-   * Creates a user data object with default values.
-   */
+  /** Creates a user data object with default values. */
   public UserData() {
     interactive = true;
     startServer = true;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java
index 2190dec..55eab46 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserDataCertificateException.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup;
@@ -25,7 +25,6 @@
  * be asked to accept it or not.
  * It will be thrown by the class that is in charge of validating the user data
  * (the Application class).
- *
  */
 public class UserDataCertificateException extends UserDataException
 {
@@ -34,19 +33,12 @@
   private X509Certificate[] chain;
   private String authType;
   private Type type;
-  /**
-   * The enumeration for the different types of the exception.
-   */
+  /** The enumeration for the different types of the exception. */
   public enum Type
   {
-    /**
-     * The certificate was not trusted.
-     */
+    /** The certificate was not trusted. */
     NOT_TRUSTED,
-    /**
-     * The certificate's subject DN's value and the host name we tried to
-     * connect to do not match.
-     */
+    /** The certificate's subject DN's value and the host name we tried to connect to do not match. */
     HOST_NAME_MISMATCH
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java
index 6ab1be2..ebf5b33 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/BrowseActionListener.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.event;
@@ -36,7 +36,6 @@
  *
  * The class is used generally by adding it as ActionListener of a 'Browse'
  * button.
- *
  */
 public class BrowseActionListener implements ActionListener
 {
@@ -48,28 +47,16 @@
 
   private BrowseType type;
 
-  /**
-   * Enumeration used to specify which kind of file browser dialog must be
-   * displayed.
-   *
-   */
+  /** Enumeration used to specify which kind of file browser dialog must be displayed. */
   public enum BrowseType
   {
-    /**
-     * The Browser is used to retrieve a directory.
-     */
+    /** The Browser is used to retrieve a directory. */
     LOCATION_DIRECTORY,
-    /**
-     * The Browser is used to retrieve an LDIF file.
-     */
+    /** The Browser is used to retrieve an LDIF file. */
     OPEN_LDIF_FILE,
-    /**
-     * The Browser is used to retrieve a .zip file.
-     */
+    /** The Browser is used to retrieve a .zip file. */
     OPEN_ZIP_FILE,
-    /**
-     * The Browser is used to retrieve a generic file.
-     */
+    /** The Browser is used to retrieve a generic file. */
     GENERIC_FILE
   }
 
@@ -144,8 +131,8 @@
    * dialog.
    *
    * @param e the ActionEvent we receive.
-   *
    */
+  @Override
   public void actionPerformed(ActionEvent e)
   {
     int returnVal;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java
index 1a85dfb..e227fa0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/event/MinimumSizeComponentListener.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.event;
@@ -27,7 +28,6 @@
  * just create the object and then we add it as ComponentListener of the object.
  *
  * This is used basically by the QuickSetupDialog dialog.
- *
  */
 public class MinimumSizeComponentListener implements ComponentListener
 {
@@ -44,13 +44,11 @@
    * @param minWidth the minimum width for the component
    * @param minHeight the minimum height for the component
    */
-  public MinimumSizeComponentListener(Component comp, int minWidth,
-      int minHeight)
+  public MinimumSizeComponentListener(Component comp, int minWidth, int minHeight)
   {
     this.comp = comp;
     this.minWidth = minWidth + 2;
-    // It seems that we must add two points to the minWidth (the border of
-    // the frame)
+    // It seems that we must add two points to the minWidth (the border of the frame)
     if (comp instanceof Window)
     {
       this.minWidth += 2;
@@ -61,12 +59,13 @@
 
   /**
    * ComponentListener implementation.
-   *
+   * <p>
    * When the method is called check the size and if it is below the minimum
    * size specified in the constructor, resize it to the minimum size.
    *
    * @param ev the component event.
    */
+  @Override
   public void componentResized(ComponentEvent ev)
   {
     int width = comp.getWidth();
@@ -88,33 +87,21 @@
     }
   }
 
-  /**
-   * ComponentListener implementation.
-   *
-   * Empty implementation.
-   * @param ev the component event.
-   */
+  @Override
   public void componentMoved(ComponentEvent ev)
   {
+    // no-op
   }
 
-  /**
-   * ComponentListener implementation.
-   *
-   * Empty implementation.
-   * @param ev the component event.
-   */
+  @Override
   public void componentShown(ComponentEvent ev)
   {
+    // no-op
   }
 
-  /**
-   * ComponentListener implementation.
-   *
-   * Empty implementation.
-   * @param ev the component event.
-   */
+  @Override
   public void componentHidden(ComponentEvent ev)
   {
+    // no-op
   }
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
index 001ddb8..e00d2fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/DataReplicationOptions.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer;
 
@@ -31,17 +31,11 @@
    */
   public enum Type
   {
-    /**
-     * Standalone server.
-     */
+    /** Standalone server. */
     STANDALONE,
-    /**
-     * Replicate Contents and this is the first server in topology..
-     */
+    /** Replicate Contents and this is the first server in topology.. */
     FIRST_IN_TOPOLOGY,
-    /**
-     * Replicate Contents of the new Suffix with existing server.
-     */
+    /** Replicate Contents of the new Suffix with existing server. */
     IN_EXISTING_TOPOLOGY
   }
 
@@ -54,9 +48,7 @@
     authenticationData.setPort(4444);
   }
 
-  /**
-   * Private constructor for the DataReplicationOptions object.
-   */
+  /** Private constructor for the DataReplicationOptions object. */
   private DataReplicationOptions()
   {
   }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
index 2536f75..b27a378 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
@@ -23,61 +23,42 @@
 
   /** Install not started. */
   NOT_STARTED,
-
   /** Configuring server. */
   CONFIGURING_SERVER(5),
-
   /** Creating base entry for the suffix. */
   CREATING_BASE_ENTRY(10),
-
   /** Importing the contents of an LDIF file into the suffix. */
   IMPORTING_LDIF(20),
-
   /** Importing generated data into the suffix. */
   IMPORTING_AUTOMATICALLY_GENERATED(20),
-
   /** Configuring replication. */
   CONFIGURING_REPLICATION(10),
-
   /** Starting Open DS server. */
   STARTING_SERVER(10),
-
   /** Stopping Open DS server. */
   STOPPING_SERVER(5),
-
   /** Initialize Replicated Suffixes. */
   INITIALIZE_REPLICATED_SUFFIXES(25),
-
   /** Configuring ADS. */
   CONFIGURING_ADS(5),
-
   /** Enabling Windows service. */
   ENABLING_WINDOWS_SERVICE,
-
-  /**
-   * User is waiting for current task to finish
-   * so that the operation can be canceled.
-   */
+  /** User is waiting for current task to finish so that the operation can be canceled. */
   WAITING_TO_CANCEL,
-
   /** Canceling install. */
   CANCELING,
-
   /** Installation finished successfully. */
   FINISHED_SUCCESSFULLY,
-
   /** User canceled installation. */
   FINISHED_CANCELED,
-
   /** Installation finished with an error. */
   FINISHED_WITH_ERROR;
 
   /**
-   * Contains the relative time that takes for the task to be
-   * accomplished.
-   * For instance if downloading takes twice the time of
-   * extracting, the value for downloading will be the double of the value for
-   * extracting.
+   * Contains the relative time that takes for the task to be accomplished.
+   * <p>
+   * For instance if downloading takes twice the time of extracting,
+   * the value for downloading will be the double of the value for extracting.
    */
   private final int relativeDuration;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 27ad183..cf3532b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -234,7 +234,7 @@
 
   private ApplicationException applicationException;
 
-  /** Actually performs the install in this thread.  The thread is blocked. */
+  /** Actually performs the install in this thread. The thread is blocked. */
   @Override
   public void run()
   {
@@ -469,7 +469,7 @@
     try
     {
       File newConfig = fm.copy(installation.getBaseConfigurationFile(),
-          installation.getConfigurationDirectory(), /*overwrite=*/ true);
+          installation.getConfigurationDirectory(), true);
       fm.rename(newConfig, installation.getCurrentConfigurationFile());
     }
     catch (ApplicationException ae)
@@ -864,16 +864,10 @@
       final QuickSetupDialog fDlg = dlg;
       errPanel.addButtonActionListener(new ButtonActionListener()
       {
-        /**
-         * ButtonActionListener implementation. It assumes that we are called in
-         * the event thread.
-         *
-         * @param ev
-         *          the ButtonEvent we receive.
-         */
         @Override
         public void buttonActionPerformed(ButtonEvent ev)
         {
+          // assumes that we are called in the event thread.
           // Simulate a close button event
           fDlg.notifyButtonEvent(ButtonName.QUIT);
         }
@@ -2682,12 +2676,6 @@
         notifyListeners(getFormattedWithPoints(INFO_PROGRESS_CREATING_ADS.get()));
       }
       localConn = createLocalConnection();
-      //      if (isRemoteServer)
-      //      {
-      //        /* Create an empty ADS suffix on the local server. */
-      //        ADSContext localAdsContext = new ADSContext(localCtx);
-      //        localAdsContext.createAdministrationSuffix(null);
-      //      }
       if (!isRemoteServer)
       {
         /* Configure local server to have an ADS */
@@ -2802,8 +2790,7 @@
    * Tells whether we must create a suffix that we are not going to replicate
    * with other servers or not.
    *
-   * @return <CODE>true</CODE> if we must create a new suffix and
-   *         <CODE>false</CODE> otherwise.
+   * @return {@code true} if we must create a new suffix and {@code false} otherwise.
    */
   protected boolean createNotReplicatedSuffix()
   {
@@ -2817,11 +2804,9 @@
   }
 
   /**
-   * Returns <CODE>true</CODE> if we must configure replication and
-   * <CODE>false</CODE> otherwise.
+   * Returns whether we must configure replication.
    *
-   * @return <CODE>true</CODE> if we must configure replication and
-   *         <CODE>false</CODE> otherwise.
+   * @return {@code true} if we must configure replication and {@code false} otherwise.
    */
   protected boolean mustConfigureReplication()
   {
@@ -2829,11 +2814,9 @@
   }
 
   /**
-   * Returns <CODE>true</CODE> if we must create the ADS and <CODE>false</CODE>
-   * otherwise.
+   * Returns whether we must create the ADS.
    *
-   * @return <CODE>true</CODE> if we must create the ADS and <CODE>false</CODE>
-   *         otherwise.
+   * @return {@code true} if we must create the ADS and {@code false} otherwise.
    */
   protected boolean mustCreateAds()
   {
@@ -2841,11 +2824,9 @@
   }
 
   /**
-   * Returns <CODE>true</CODE> if we must start the server and
-   * <CODE>false</CODE> otherwise.
+   * Returns whether we must start the server.
    *
-   * @return <CODE>true</CODE> if we must start the server and
-   *         <CODE>false</CODE> otherwise.
+   * @return {@code true} if we must start the server and {@code false} otherwise.
    */
   protected boolean mustStart()
   {
@@ -2853,13 +2834,12 @@
   }
 
   /**
-   * Returns <CODE>true</CODE> if the start server must be launched in verbose
-   * mode and <CODE>false</CODE> otherwise. The verbose flag is not enough
-   * because in the case where many entries have been imported, the startup
-   * phase can take long.
+   * Returns whether the start server must be launched in verbose mode.
+   * <p>
+   * The verbose flag is not enough because in the case where many entries have been imported,
+   * the startup phase can take long.
    *
-   * @return <CODE>true</CODE> if the start server must be launched in verbose
-   *         mode and <CODE>false</CODE> otherwise.
+   * @return {@code true} if the start server must be launched in verbose mode and {@code false} otherwise.
    */
   protected boolean isStartVerbose()
   {
@@ -2896,13 +2876,12 @@
   }
 
   /**
-   * Returns <CODE>true</CODE> if we must stop the server and <CODE>false</CODE>
-   * otherwise. The server might be stopped if the user asked not to start it at
-   * the end of the installation and it was started temporarily to update its
-   * configuration.
+   * Returns whether we must stop the server.
+   * <p>
+   * The server might be stopped if the user asked not to start it at the end
+   * of the installation and it was started temporarily to update its configuration.
    *
-   * @return <CODE>true</CODE> if we must stop the server and <CODE>false</CODE>
-   *         otherwise.
+   * @return {@code true} if we must stop the server and {@code false} otherwise.
    */
   protected boolean mustStop()
   {
@@ -2910,11 +2889,9 @@
   }
 
   /**
-   * Returns <CODE>true</CODE> if we must initialize suffixes and
-   * <CODE>false</CODE> otherwise.
+   * Returns whether we must initialize suffixes.
    *
-   * @return <CODE>true</CODE> if we must initialize suffixes and
-   *         <CODE>false</CODE> otherwise.
+   * @return {@code true} if we must initialize suffixes and {@code false} otherwise.
    */
   protected boolean mustInitializeSuffixes()
   {
@@ -3924,10 +3901,7 @@
     return validBaseDn;
   }
 
-  /**
-   * Update the userData object according to the content of the runtime options
-   * panel.
-   */
+  /** Update the userData object according to the content of the runtime options panel. */
   private void updateUserDataForRuntimeOptionsPanel(QuickSetup qs)
   {
     getUserData().setJavaArguments(UserData.SERVER_SCRIPT_NAME,
@@ -4703,17 +4677,15 @@
 }
 
 /** Class used to be able to cancel long operations. */
-abstract class InvokeThread extends Thread implements Runnable
+abstract class InvokeThread extends Thread
 {
   protected boolean isOver;
   protected ApplicationException ae;
 
   /**
-   * Returns <CODE>true</CODE> if the thread is over and <CODE>false</CODE>
-   * otherwise.
+   * Returns whether the thread is over.
    *
-   * @return <CODE>true</CODE> if the thread is over and <CODE>false</CODE>
-   *         otherwise.
+   * @return {@code true} if the thread is over and {@code false} otherwise.
    */
   public boolean isOver()
   {
@@ -4730,7 +4702,6 @@
     return ae;
   }
 
-  /** Runnable implementation. */
   @Override
   public abstract void run();
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java
index 691711d..89cadeb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/NewSuffixOptions.java
@@ -12,17 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer;
 
 import java.util.LinkedList;
 import java.util.List;
 
-/**
- * This class is used to provide a data model for the Data Options panel of the
- * installer.
- */
+/** This class is used to provide a data model for the Data Options panel of the installer. */
 public class NewSuffixOptions
 {
   /**
@@ -31,21 +28,13 @@
    */
   public enum Type
   {
-    /**
-     * Create base entry.
-     */
+    /** Create base entry. */
     CREATE_BASE_ENTRY,
-    /**
-     * Do not add any entry to the suffix.
-     */
+    /** Do not add any entry to the suffix. */
     LEAVE_DATABASE_EMPTY,
-    /**
-     * Import data from an LDIF file.
-     */
+    /** Import data from an LDIF file. */
     IMPORT_FROM_LDIF_FILE,
-    /**
-     * Generate data and import it to the suffix.
-     */
+    /** Generate data and import it to the suffix. */
     IMPORT_AUTOMATICALLY_GENERATED_DATA
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
index e3e49b4..dd7ddeb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
@@ -81,7 +81,7 @@
     addActionListeners();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getFieldValue(FieldName fieldName)
   {
     Object value = null;
@@ -118,7 +118,7 @@
     return value;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void displayFieldInvalid(FieldName fieldName, boolean invalid)
   {
     JLabel label = getLabel(fieldName);
@@ -138,7 +138,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = new JPanel(new GridBagLayout());
@@ -249,19 +249,19 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return INFO_DATA_REPLICATION_OPTIONS_PANEL_INSTRUCTIONS.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_DATA_REPLICATION_OPTIONS_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void endDisplay()
   {
     if (lastFocusComponent != null)
@@ -270,7 +270,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTextForIcon(UIFactory.IconType iconType)
   {
     if (iconType == UIFactory.IconType.WAIT &&
@@ -329,9 +329,7 @@
     return null;
   }
 
-  /**
-   * Creates the components and populates the Maps with them.
-   */
+  /** Creates the components and populates the Maps with them. */
   private void populateComponentMaps()
   {
     HashMap<FieldName, LabelFieldDescriptor> hm = new HashMap<>();
@@ -420,9 +418,7 @@
     checkEnablingState();
   }
 
-  /**
-   * Adds all the required document listeners to the fields.
-   */
+  /** Adds all the required document listeners to the fields. */
   private void addDocumentListeners()
   {
     FieldName[] fields = {
@@ -434,6 +430,7 @@
     for (FieldName field : fields) {
       JTextComponent tf = getField(field);
       tf.getDocument().addDocumentListener(new DocumentListener() {
+        @Override
         public void changedUpdate(DocumentEvent ev) {
           if (!rbReplicated.isSelected()) {
             rbReplicated.setSelected(true);
@@ -443,10 +440,12 @@
           }
         }
 
+        @Override
         public void insertUpdate(DocumentEvent ev) {
           changedUpdate(ev);
         }
 
+        @Override
         public void removeUpdate(DocumentEvent ev) {
           changedUpdate(ev);
         }
@@ -454,13 +453,12 @@
     }
   }
 
-  /**
-   * Adds the required focus listeners to the fields.
-   */
+  /** Adds the required focus listeners to the fields. */
   private void addFocusListeners()
   {
     final FocusListener l = new FocusListener()
     {
+      @Override
       public void focusGained(FocusEvent e)
       {
         lastFocusComponent = e.getComponent();
@@ -474,6 +472,7 @@
         }
       }
 
+      @Override
       public void focusLost(FocusEvent e)
       {
       }
@@ -491,13 +490,12 @@
     lastFocusComponent = rbStandalone;
   }
 
-  /**
-   * Adds the required focus listeners to the fields.
-   */
+  /** Adds the required focus listeners to the fields. */
   private void addActionListeners()
   {
     final ActionListener l = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         checkEnablingState();
@@ -511,6 +509,7 @@
     cbTopologyExists.addActionListener(l);
     cbTopologyExists.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         if (cbTopologyExists.isSelected())
@@ -521,9 +520,7 @@
     });
   }
 
-  /**
-   * Enables/disables the fields.
-   */
+  /** Enables/disables the fields. */
   private void checkEnablingState()
   {
     boolean enableFields = rbReplicated.isSelected() &&
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
index d05b3f9..ab645a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/GlobalAdministratorPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer.ui;
 
@@ -39,9 +39,7 @@
 import org.opends.quicksetup.ui.QuickSetupStepPanel;
 import org.opends.quicksetup.ui.UIFactory;
 
-/**
- * This class is used to set the global administrator parameters.
- */
+/** This class is used to set the global administrator parameters. */
 public class GlobalAdministratorPanel extends QuickSetupStepPanel
 {
   private static final long serialVersionUID = 4266485298770553875L;
@@ -66,7 +64,7 @@
     addFocusListeners();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getFieldValue(FieldName fieldName)
   {
     Object value = null;
@@ -78,7 +76,7 @@
     return value;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void displayFieldInvalid(FieldName fieldName, boolean invalid)
   {
     JLabel label = getLabel(fieldName);
@@ -96,7 +94,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = new JPanel(new GridBagLayout());
@@ -159,19 +157,19 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return INFO_GLOBAL_ADMINISTRATOR_PANEL_INSTRUCTIONS.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_GLOBAL_ADMINISTRATOR_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void endDisplay()
   {
     if (lastFocusComponent != null)
@@ -211,9 +209,7 @@
     return value;
   }
 
-  /**
-   * Creates the components and populates the Maps with them.
-   */
+  /** Creates the components and populates the Maps with them. */
   private void populateLabelAndFieldMaps()
   {
     HashMap<FieldName, LabelFieldDescriptor> hm = new HashMap<>();
@@ -273,18 +269,18 @@
     return hmFields.get(fieldName);
   }
 
-  /**
-   * Adds the required focus listeners to the fields.
-   */
+  /** Adds the required focus listeners to the fields. */
   private void addFocusListeners()
   {
     final FocusListener l = new FocusListener()
     {
+      @Override
       public void focusGained(FocusEvent e)
       {
         lastFocusComponent = e.getComponent();
       }
 
+      @Override
       public void focusLost(FocusEvent e)
       {
       }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
index 4f149e8..f956269 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallLicensePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer.ui;
 
@@ -32,10 +32,7 @@
 import org.opends.quicksetup.LicenseFile;
 import org.opends.quicksetup.ButtonName;
 
-/**
- * This panel is used to show a welcome message.
- *
- */
+/** This panel is used to show a welcome message. */
 public class InstallLicensePanel extends QuickSetupStepPanel
 {
   private static final long serialVersionUID = 6209217138897900860L;
@@ -49,13 +46,13 @@
     super(app);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_LICENSE_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return null;
@@ -63,7 +60,7 @@
 
   private JCheckBox acceptCheck;
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     // No input in this panel
@@ -115,19 +112,18 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * Adds the required action listeners to the fields.
-   */
+  /** Adds the required action listeners to the fields. */
   private void addActionListeners()
   {
     final ActionListener l = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         // Enable or disable Next button as user clicks approval button
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index 5c2a542..5e0a4a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -65,10 +65,7 @@
 import java.util.Map;
 import java.util.TreeSet;
 
-/**
- * This is the panel that contains the Review Panel.
- *
- */
+/** This is the panel that contains the Review Panel. */
 public class InstallReviewPanel extends ReviewPanel {
 
   private static final long serialVersionUID = -7356174829193265699L;
@@ -102,7 +99,6 @@
     populateLabelAndFieldsMap();
   }
 
-  /** {@inheritDoc} */
   @Override
   public void beginDisplay(UserData userData)
   {
@@ -185,14 +181,12 @@
     return instructionsPanel;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected boolean requiresScroll()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected Component createInputPanel()
   {
@@ -218,7 +212,6 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
   @Override
   public Object getFieldValue(FieldName fieldName)
   {
@@ -234,14 +227,12 @@
     return null;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getInstructions()
   {
     return INFO_REVIEW_PANEL_INSTRUCTIONS.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getTitle()
   {
@@ -526,7 +517,6 @@
     return equivalentCommandPane;
   }
 
-  /** {@inheritDoc} */
   @Override
   protected JComponent getBottomComponent()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
index 90ced13..bdcb974 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer.ui;
 
@@ -29,9 +29,7 @@
 import org.opends.quicksetup.ui.QuickSetupStepPanel;
 import org.opends.quicksetup.util.Utils;
 
-/**
- * This panel is used to show a welcome message.
- */
+/** This panel is used to show a welcome message. */
 public class InstallWelcomePanel extends QuickSetupStepPanel
 {
   private static final long serialVersionUID = 6209217138897900860L;
@@ -45,13 +43,13 @@
     super(app);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_WELCOME_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     /*
@@ -69,7 +67,7 @@
           LocalizableMessage.class);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     // No input in this panel
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 06aa9f1..9e312af 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
@@ -407,6 +407,7 @@
     buttonsPanel.add(okButton, gbc);
     okButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         okClicked();
@@ -421,6 +422,7 @@
     buttonsPanel.add(cancelButton, gbc);
     cancelButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         cancelClicked();
@@ -430,20 +432,14 @@
     return buttonsPanel;
   }
 
-  /**
-   * Method called when user clicks on cancel.
-   *
-   */
+  /** Method called when user clicks on cancel. */
   private void cancelClicked()
   {
     isCanceled = true;
     dispose();
   }
 
-  /**
-   * Method called when user clicks on OK.
-   *
-   */
+  /** Method called when user clicks on OK. */
   private void okClicked()
   {
     BackgroundTask<ArrayList<LocalizableMessage>> worker =
@@ -599,11 +595,7 @@
     toFront();
   }
 
-  /**
-   * Updates the widgets on the dialog with the contents of the securityOptions
-   * object.
-   *
-   */
+  /** Updates the widgets on the dialog with the contents of the securityOptions object. */
   private void updateContents()
   {
     if (javaArguments.getInitialMemory() > 0)
@@ -653,6 +645,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         UIFactory.setTextStyle(comp,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
index 10cbfeb..228e2c9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RemoteReplicationPortsPanel.java
@@ -76,7 +76,7 @@
     super(application);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getFieldValue(FieldName fieldName)
   {
     Object value = null;
@@ -102,7 +102,7 @@
     return value;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void displayFieldInvalid(FieldName fieldName, boolean invalid)
   {
     if (fieldName == FieldName.REMOTE_REPLICATION_PORT)
@@ -143,19 +143,19 @@
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected boolean requiresScroll()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public int compare(ServerDescriptor desc1, ServerDescriptor desc2)
   {
     return desc1.getHostPort(true).toString().compareTo(desc2.getHostPort(true).toString());
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = new JPanel(new GridBagLayout());
@@ -178,19 +178,19 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return INFO_REMOTE_REPLICATION_PORT_INSTRUCTIONS.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_REMOTE_REPLICATION_PORT_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void beginDisplay(UserData data)
   {
     TreeSet<ServerDescriptor> array = orderServers(
@@ -205,11 +205,13 @@
       // Adds the required focus listeners to the fields.
       final FocusListener l = new FocusListener()
       {
+        @Override
         public void focusGained(FocusEvent e)
         {
           lastFocusComponent = e.getComponent();
         }
 
+        @Override
         public void focusLost(FocusEvent e)
         {
         }
@@ -285,7 +287,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void endDisplay()
   {
     if (lastFocusComponent != null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
index 0e2405b..cef93aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer.ui;
 
@@ -49,10 +49,7 @@
 import org.opends.quicksetup.ui.UIFactory;
 import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
 
-/**
- * The panel where the user specifies the runtime settings.
- *
- */
+/** The panel where the user specifies the runtime settings. */
 public class RuntimeOptionsPanel extends QuickSetupStepPanel
 {
   private static final long serialVersionUID = -8303034619200476754L;
@@ -91,7 +88,7 @@
     addFocusListeners();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = new JPanel(new GridBagLayout());
@@ -171,19 +168,18 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
   @Override
   public Object getFieldValue(FieldName fieldName)
   {
@@ -199,7 +195,6 @@
     return value;
   }
 
-  /** {@inheritDoc} */
   @Override
   public void beginDisplay(UserData uData)
   {
@@ -237,7 +232,7 @@
     updateWarningMessage(uData);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void endDisplay()
   {
     if (lastFocusComponent != null)
@@ -246,24 +241,24 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * Adds the required focus listeners to the fields.
-   */
+  /** Adds the required focus listeners to the fields. */
   private void addFocusListeners()
   {
     FocusListener l = new FocusListener()
     {
+      @Override
       public void focusGained(FocusEvent e)
       {
         lastFocusComponent = e.getComponent();
       }
 
+      @Override
       public void focusLost(FocusEvent e)
       {
       }
@@ -322,6 +317,7 @@
         INFO_JAVA_RUNTIME_CHANGE_SERVER_TOOLTIP.get());
     bServer.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         changeServerClicked();
@@ -334,6 +330,7 @@
         INFO_JAVA_RUNTIME_CHANGE_IMPORT_TOOLTIP.get());
     bImport.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         changeImportClicked();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
index 547da87..8b233ae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java
@@ -12,10 +12,8 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
-
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
-
 package org.opends.quicksetup.installer.ui;
 
 import java.awt.Component;
@@ -340,6 +338,7 @@
 
     ActionListener l = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         updateEnablingState();
@@ -619,6 +618,7 @@
     buttonsPanel.add(okButton, gbc);
     okButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         okClicked();
@@ -633,6 +633,7 @@
     buttonsPanel.add(cancelButton, gbc);
     cancelButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         cancelClicked();
@@ -642,20 +643,14 @@
     return buttonsPanel;
   }
 
-  /**
-   * Method called when user clicks on cancel.
-   *
-   */
+  /** Method called when user clicks on cancel. */
   private void cancelClicked()
   {
     isCanceled = true;
     dispose();
   }
 
-  /**
-   * Method called when user clicks on OK.
-   *
-   */
+  /** Method called when user clicks on OK. */
   private void okClicked()
   {
     BackgroundTask<ArrayList<LocalizableMessage>> worker =
@@ -752,11 +747,7 @@
     toFront();
   }
 
-  /**
-   * Updates the widgets on the dialog with the contents of the securityOptions
-   * object.
-   *
-   */
+  /** Updates the widgets on the dialog with the contents of the securityOptions object. */
   private void updateContents()
   {
     cbEnableSSL.setSelected(securityOptions.getEnableSSL());
@@ -1091,6 +1082,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
         UIFactory.setTextStyle(comp,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
index 375fafc..e3f2377 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/SelectAliasDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.installer.ui;
@@ -71,6 +71,7 @@
 
     addWindowListener(new WindowAdapter()
     {
+      @Override
       public void windowClosing(WindowEvent e)
       {
         cancelClicked();
@@ -177,6 +178,7 @@
           INFO_SELECT_ALIAS_OK_BUTTON_TOOLTIP.get());
     okButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         okClicked();
@@ -193,6 +195,7 @@
     p2.add(cancelButton, gbc);
     cancelButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         cancelClicked();
@@ -213,20 +216,14 @@
     return p;
   }
 
-  /**
-   * Method called when user clicks on cancel.
-   *
-   */
+  /** Method called when user clicks on cancel. */
   private void cancelClicked()
   {
     isCanceled = true;
     dispose();
   }
 
-  /**
-   * Method called when user clicks on OK.
-   *
-   */
+  /** Method called when user clicks on OK. */
   private void okClicked()
   {
     isCanceled = false;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
index 03a360e..c16efeb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.installer.ui;
 
@@ -50,7 +50,6 @@
 /**
  * This is the panel that contains the Server Settings: the port, the Directory
  * Manager DN, etc.
- *
  */
 public class ServerSettingsPanel extends QuickSetupStepPanel
 {
@@ -92,7 +91,7 @@
     addFocusListeners();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object getFieldValue(FieldName fieldName)
   {
     Object value = null;
@@ -133,7 +132,7 @@
     return value;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void displayFieldInvalid(FieldName fieldName, boolean invalid)
   {
     JLabel label = getLabel(fieldName);
@@ -151,7 +150,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = new JPanel(new GridBagLayout());
@@ -274,19 +273,19 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_SERVER_SETTINGS_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void endDisplay()
   {
     if (lastFocusComponent != null)
@@ -363,9 +362,7 @@
     return value;
   }
 
-  /**
-   * Creates the components and populates the Maps with them.
-   */
+  /** Creates the components and populates the Maps with them. */
   private void populateLabelAndFieldMaps()
   {
     HashMap<FieldName, LabelFieldDescriptor> hm = new HashMap<>();
@@ -507,6 +504,7 @@
 
       secureAccessButton.addActionListener(new ActionListener()
       {
+        @Override
         public void actionPerformed(ActionEvent ev)
         {
           getConfigureSecureAccessDialog().display(securityOptions);
@@ -544,18 +542,18 @@
     return hmFields.get(fieldName);
   }
 
-  /**
-   * Adds the required focus listeners to the fields.
-   */
+  /** Adds the required focus listeners to the fields. */
   private void addFocusListeners()
   {
     final FocusListener l = new FocusListener()
     {
+      @Override
       public void focusGained(FocusEvent e)
       {
         lastFocusComponent = e.getComponent();
       }
 
+      @Override
       public void focusLost(FocusEvent e)
       {
       }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java
index c62b446..df371db 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ButtonsPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.ui;
 
@@ -35,7 +35,6 @@
  * This class contains the buttons in the bottom of the Install/Uninstall
  * dialog.  There is only one of this instances for the QuickSetupDialog.
  * The layout is updated calling setCurrentStep method.
- *
  */
 public class ButtonsPanel extends QuickSetupPanel
 {
@@ -181,10 +180,7 @@
 
   }
 
-  /**
-   * Do the layout of the panel.
-   *
-   */
+  /** Do the layout of the panel. */
   private void layoutButtons()
   {
     setLayout(new GridBagLayout());
@@ -276,6 +272,7 @@
 
     ActionListener actionListener = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         ButtonEvent be = new ButtonEvent(ev.getSource(), fButtonName);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java
index 91d24a6..f46993d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CurrentStepPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -41,7 +41,6 @@
  * There is only one instance of this class for a given QuickSetupDialog (and
  * there are only 1 instance of each of the panels that are contained in its
  * CardLayout).
- *
  */
 public class CurrentStepPanel extends QuickSetupPanel
 {
@@ -176,9 +175,11 @@
       // taske a while to initialize.
       cl.show(this, LOADING_PANEL);
       new Thread(new Runnable() {
+        @Override
         public void run() {
           getPanel(step).beginDisplay(userData);
           SwingUtilities.invokeLater(new Runnable() {
+            @Override
             public void run() {
               cl.show(CurrentStepPanel.this, step.toString());
               getPanel(step).endDisplay();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
index 1aab06c..1dcd7da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CustomHTMLEditorKit.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -29,23 +29,19 @@
 import javax.swing.text.html.FormView;
 import javax.swing.text.html.HTMLEditorKit;
 
-/**
- * Class used to be able to detect events in the button inside an HTML pane.
- */
+/** Class used to be able to detect events in the button inside an HTML pane. */
 public class CustomHTMLEditorKit extends HTMLEditorKit
 {
   private HashSet<ActionListener> listeners = new HashSet<>();
   private static final long serialVersionUID = 298103926252426388L;
 
-  /**
-   * Default constructor.
-   */
+  /** Default constructor. */
   public CustomHTMLEditorKit()
   {
     super();
   }
 
-  /** {@inheritDoc} */
+  @Override
   public ViewFactory getViewFactory()
   {
     return new MyHTMLFactory();
@@ -69,12 +65,10 @@
     listeners.remove(l);
   }
 
-  /**
-   * Class used to be able to detect events in the button inside an HTML pane.
-   */
+  /** Class used to be able to detect events in the button inside an HTML pane. */
   class MyHTMLFactory extends HTMLFactory
   {
-    /** {@inheritDoc} */
+    @Override
     public View create(Element elem)
     {
       View v = super.create(elem);
@@ -86,9 +80,7 @@
     }
   }
 
-  /**
-   * Class used to be able to detect events in the button inside an HTML pane.
-   */
+  /** Class used to be able to detect events in the button inside an HTML pane. */
   class MyFormView extends FormView
   {
     /**
@@ -101,7 +93,7 @@
       super(elem);
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void actionPerformed(ActionEvent ev)
     {
       if (ev != null && ev.getWhen() != lastActionWhen) {
@@ -113,7 +105,7 @@
       }
     }
 
-    /** {@inheritDoc} */
+    @Override
     protected Component createComponent()
     {
       Component comp = super.createComponent();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
index 9edb11b..dcf53ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
@@ -12,140 +12,99 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
-
 package org.opends.quicksetup.ui;
 
 /**
  * This is an enumeration used to identify the different fields that we have
  * in the Installation wizard.
- *
+ * <p>
  * Note that each field is not necessarily associated
  * with a single Swing component (for instance we have two text fields for
  * the server location).  This enumeration is used to retrieve information from
  * the panels without having any knowledge of the actual graphical layout.
- *
  */
 public enum FieldName
 {
   /** The value associated with this is a String. */
   ADMIN_CONNECTOR_PORT,
-
   /** The value associated with this is a data options.Type. */
   DATA_OPTIONS,
-
-  /** The value associated with this is a String. **/
+  /** The value associated with this is a String. */
   BACKEND_TYPE,
-
   /** The value associated with this is a String. */
   DIRECTORY_BASE_DN,
-
   /** The value associated with this is a String. */
   DIRECTORY_MANAGER_DN,
-
   /** The value associated with this is a String. */
   DIRECTORY_MANAGER_PWD,
-
   /** The value associated with this is a String. */
   DIRECTORY_MANAGER_PWD_CONFIRM,
-
   /** The value associated with this is a Boolean. */
   ENABLE_WINDOWS_SERVICE,
-
   /** The value associated with this is a Set of String. */
   EXTERNAL_DB_DIRECTORIES,
-
   /** The value associated with this is a Set of String. */
   EXTERNAL_LOG_FILES,
-
   /** The value associated with this is a String. */
   GLOBAL_ADMINISTRATOR_PWD,
-
   /** The value associated with this is a String. */
   GLOBAL_ADMINISTRATOR_PWD_CONFIRM,
-
   /** The value associated with this is a String. */
   GLOBAL_ADMINISTRATOR_UID,
-
   /** The value associated with this is a String. */
   HOST_NAME,
-
   /** The value associated with this is a JavaArguments object. */
   IMPORT_JAVA_ARGUMENTS,
-
   /** The value associated with this is a String. */
   LDIF_PATH,
-
   /** The value associated with this is a String. */
   NUMBER_ENTRIES,
-
   /** The value associated with this is a Map<String, String>. */
   REMOTE_REPLICATION_PORT,
-
   /** The value associated with this is a Map<String, Boolean>. */
   REMOTE_REPLICATION_SECURE,
-
   /** The value associated with this is a String. */
   REMOTE_SERVER_DN,
-
   /** The value associated with this is a String. */
   REMOTE_SERVER_HOST,
-
   /** The value associated with this is a String. */
   REMOTE_SERVER_PORT,
-
   /** The value associated with this is a String. */
   REMOTE_SERVER_PWD,
-
   /** The value associated with this is a Boolean. */
   REMOVE_BACKUPS,
-
   /** The value associated with this is a Boolean. */
   REMOVE_CONFIGURATION_AND_SCHEMA,
-
   /** The value associated with this is a Boolean. */
   REMOVE_DATABASES,
-
   /** The value associated with this is a Boolean. */
   REMOVE_LDIFS,
-
   /** The value associated with this is a Boolean. */
   REMOVE_LIBRARIES_AND_TOOLS,
-
   /** The value associated with this is a Boolean. */
   REMOVE_LOGS,
-
   /** The value associated with this is a DataReplicationOptions.Type. */
   REPLICATION_OPTIONS,
-
   /** The value associated with this is a String. */
   REPLICATION_PORT,
-
   /** The value associated with this is a Boolean. */
   REPLICATION_SECURE,
-
   /** The value associated with this is a SecurityOptions object. */
   SECURITY_OPTIONS,
-
   /** The value associated with this is a JavaArguments object. */
   SERVER_JAVA_ARGUMENTS,
-
   /** The value associated with this is a String. */
   SERVER_LOCATION,
-
   /** The value associated with this is a String. */
   SERVER_PORT,
-
   /** The value associated with this is a Boolean. */
   SERVER_START_INSTALLER,
-
   /** The value associated with this is a Set of SuffixDescriptor. */
   SUFFIXES_TO_REPLICATE,
-
   /** The value associated with this is a Map with String keys and BackendTypeUIAdapter values. */
   SUFFIXES_TO_REPLICATE_BACKEND_TYPE,
-
   /** The value associated with this is a SuffixesToReplicateOptions.Type. */
   SUFFIXES_TO_REPLICATE_OPTIONS
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java
index 2e3a225..a20fc11 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FinishedPanel.java
@@ -12,16 +12,14 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.ui;
 
 import org.forgerock.i18n.LocalizableMessage;
 import static org.opends.messages.QuickSetupMessages.*;
 
-/**
- * This panel is used to show the application is finished.
- */
+/** This panel is used to show the application is finished. */
 public class FinishedPanel extends ProgressPanel
 {
   private static final long serialVersionUID = 8129325068133356170L;
@@ -35,7 +33,7 @@
     super(application);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_FINISHED_PANEL_TITLE.get();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java
index 1f86dea..92e58da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FramePanel.java
@@ -12,8 +12,8 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
-
 package org.opends.quicksetup.ui;
 
 import java.awt.AlphaComposite;
@@ -32,26 +32,22 @@
  * This class is the panel that is displayed in the QuickSetupDialog.  It
  * contains 3 panels that are passed in the constructor: the steps panel,
  * the buttons panel and the current step panel (the main panel of the three).
- *
+ * <p>
  * The only remarkable thing of this class is that is responsible for
  * implementing the background.  The three subpanels are transparent and
- * this class sets a background (with the Open DS logo) and uses some basic
+ * this class sets a background (with the OpenDJ logo) and uses some basic
  * transparency effects.
- *
  */
 public class FramePanel extends JPanel
 {
   private static final long serialVersionUID = 7733658951410876078L;
 
   private Icon backgroundIcon;
-
   private Component stepsPanel;
-
   private Component buttonsPanel;
-
   private int buttonsPanelVerticalInsets;
-
   private int stepsPanelHorizontalInsets;
+
   /**
    * The constructor of the FramePanel.
    * @param stepsPanel the steps panel that on the top-left side of the
@@ -140,8 +136,9 @@
    * {@inheritDoc}
    *
    * This method has been overwritten to be able to have a transparency effect
-   * with the OpenDS logo background.
+   * with the OpenDJ logo background.
    */
+  @Override
   protected void paintComponent(Graphics g)
   {
       // paint background
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java
index a5416d2..b2d4aae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/LabelFieldDescriptor.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -43,38 +43,26 @@
   /**
    * This enum contains the different type of labels that can be associated with
    * this LabelFieldDescriptor.
-   *
    */
   public enum LabelType
   {
-    /**
-     * Primary label.
-     */
+    /** Primary label. */
     PRIMARY,
-    /**
-     * Secondary label.
-     */
+    /** Secondary label. */
     SECONDARY
   }
 
   /**
    * This enum contains the different type of fields that can be associated with
    * this LabelFieldDescriptor.
-   *
    */
   public enum FieldType
   {
-    /**
-     * Editable text field.
-     */
+    /** Editable text field. */
     TEXTFIELD,
-    /**
-     * Password field.
-     */
+    /** Password field. */
     PASSWORD,
-    /**
-     * Read only field.
-     */
+    /** Read only field. */
     READ_ONLY
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java
index cdc48d7..4983719 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -42,10 +42,7 @@
 import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
 import org.opends.quicksetup.util.ProgressMessageFormatter;
 
-/**
- * This panel is used to show the progress of the start/stop/restart operations.
- *
- */
+/** This panel is used to show the progress of the start/stop/restart operations. */
 public class ProgressDialog extends JDialog
 {
   private static final long serialVersionUID = 8635080171100378470L;
@@ -79,15 +76,11 @@
     createLayout();
   }
 
-  /**
-   * Prepares size for this dialog.
-   *
-   */
+  /** Prepares size for this dialog. */
+  @Override
   public void pack()
   {
-    /*
-     * TODO: find a way to calculate this dynamically.
-     */
+    /* TODO: find a way to calculate this dynamically. */
     setPreferredSize(new Dimension(500, 300));
     addComponentListener(new MinimumSizeComponentListener(this, 500, 300));
     super.pack();
@@ -163,10 +156,7 @@
     return formatter;
   }
 
-  /**
-   * Creates the layout of the dialog panel.
-   *
-   */
+  /** Creates the layout of the dialog panel. */
   private void createLayout()
   {
     /* Create title panel */
@@ -227,6 +217,7 @@
         UIFactory.CURRENT_STEP_PANEL_BACKGROUND);
     detailsTextArea.addHyperlinkListener(new HyperlinkListener()
     {
+      @Override
       public void hyperlinkUpdate(HyperlinkEvent e)
       {
         if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
@@ -266,6 +257,7 @@
     buttonsPanel.add(closeButton, gbc);
     closeButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         dispose();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java
index 918a9bf..df86626 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ProgressPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.ui;
 
@@ -35,10 +35,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import static org.opends.messages.QuickSetupMessages.*;
 
-/**
- * This panel is used to show the progress of the application.
- *
- */
+/** This panel is used to show the progress of the application. */
 public class ProgressPanel extends QuickSetupStepPanel
 {
   private static final long serialVersionUID = 8129425068163357170L;
@@ -64,7 +61,7 @@
     super(application);
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = new JPanel(new GridBagLayout());
@@ -88,6 +85,7 @@
     CustomHTMLEditorKit htmlEditor = new CustomHTMLEditorKit();
     htmlEditor.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         // Assume is the authentication button.
@@ -123,6 +121,7 @@
         UIFactory.CURRENT_STEP_PANEL_BACKGROUND);
     detailsTextArea.addHyperlinkListener(new HyperlinkListener()
     {
+      @Override
       public void hyperlinkUpdate(HyperlinkEvent e)
       {
         if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
@@ -150,25 +149,25 @@
     return panel;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getInstructions()
   {
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_PROGRESS_PANEL_TITLE.get();
   }
 
-  /** {@inheritDoc} */
+  @Override
   protected boolean requiresScroll()
   {
     return false;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void endDisplay()
   {
     if (lastFocusComponent != null)
@@ -177,7 +176,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void displayProgress(ProgressDescriptor descriptor)
   {
     ProgressStep status = descriptor.getProgressStep();
@@ -222,6 +221,7 @@
                     INFO_CANCEL_BUTTON_LABEL.get(),
                     INFO_CANCEL_BUTTON_TOOLTIP.get());
     btnCancel.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         GuiApplication app = getApplication();
         QuickSetup qs = getQuickSetup();
@@ -266,18 +266,18 @@
     return panel;
   }
 
-  /**
-   * Adds the required focus listeners to the fields.
-   */
+  /** Adds the required focus listeners to the fields. */
   private void addFocusListeners()
   {
     final FocusListener l = new FocusListener()
     {
+      @Override
       public void focusGained(FocusEvent e)
       {
         lastFocusComponent = e.getComponent();
       }
 
+      @Override
       public void focusLost(FocusEvent e)
       {
       }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
index 410510e..53c3370 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
@@ -125,10 +125,7 @@
     setCurrentStep(application.getFirstWizardStep());
   }
 
-  /**
-   * This method displays the setup dialog.
-   * This method must be called from the event thread.
-   */
+  /** This method displays the setup dialog. This method must be called from the event thread. */
   public void display()
   {
     getDialog().packAndShow();
@@ -141,6 +138,7 @@
    * @param ev
    *          the ButtonEvent we receive.
    */
+  @Override
   public void buttonActionPerformed(ButtonEvent ev)
   {
     switch (ev.getButtonName())
@@ -183,6 +181,7 @@
    *          the ProgressUpdateEvent we receive.
    * @see #runDisplayUpdater()
    */
+  @Override
   public void progressUpdate(ProgressUpdateEvent ev)
   {
     synchronized (this)
@@ -231,6 +230,7 @@
 
             SwingUtilities.invokeLater(new Runnable()
             {
+              @Override
               public void run()
               {
                 if (application.isFinished() && !getCurrentStep().isFinishedStep())
@@ -261,6 +261,7 @@
   {
     BackgroundTask<?> worker = new BackgroundTask<Object>()
     {
+      @Override
       public Object processBackgroundTask() throws UserDataException
       {
         try
@@ -278,6 +279,7 @@
         return null;
       }
 
+      @Override
       public void backgroundTaskCompleted(Object returnValue, Throwable throwable)
       {
         getDialog().workerFinished();
@@ -364,6 +366,7 @@
   {
     BackgroundTask<Object> worker = new BackgroundTask<Object>()
     {
+      @Override
       public Object processBackgroundTask() throws UserDataException
       {
         try
@@ -418,6 +421,7 @@
         return null;
       }
 
+      @Override
       public void backgroundTaskCompleted(Object returnValue, Throwable throwable)
       {
         getDialog().getFrame().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
@@ -473,6 +477,7 @@
     new Thread(application, "Application Thread").start();
     Thread t = new Thread(new Runnable()
     {
+      @Override
       public void run()
       {
         runDisplayUpdater();
@@ -642,10 +647,7 @@
     return new ProgressDescriptor(status, ratio, newProgressLabel, LocalizableMessage.raw(progressDetails.toString()));
   }
 
-  /**
-   * This is a class used when the user clicks on next and that extends
-   * BackgroundTask.
-   */
+  /** This is a class used when the user clicks on next and that extends BackgroundTask. */
   private class NextClickedBackgroundTask extends BackgroundTask<Object>
   {
     private WizardStep cStep;
@@ -655,6 +657,7 @@
       this.cStep = cStep;
     }
 
+    @Override
     public Object processBackgroundTask() throws UserDataException
     {
       try
@@ -672,6 +675,7 @@
       return null;
     }
 
+    @Override
     public void backgroundTaskCompleted(Object returnValue, Throwable throwable)
     {
       getDialog().workerFinished();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java
index 6f2b2d6..4acac22 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -44,7 +44,6 @@
  *
  * If we are installing Open DS and the server has already been installed it
  * will display an error message.  In the other cases it will display a wizard.
- *
  */
 public class QuickSetupDialog
 {
@@ -88,6 +87,7 @@
     frame = new JFrame(String.valueOf(application.getFrameTitle()));
     frame.getContentPane().add(getFramePanel());
     frame.addWindowListener(new WindowAdapter() {
+      @Override
       public void windowClosing(WindowEvent e) {
         application.windowClosing(QuickSetupDialog.this, e);
       }
@@ -96,10 +96,7 @@
     Utilities.setFrameIcon(frame);
   }
 
-  /**
-   * Packs and displays this dialog.
-   *
-   */
+  /** Packs and displays this dialog. */
   public void packAndShow()
   {
     frame.pack();
@@ -243,12 +240,12 @@
    *
    * This method can be called from the event thread or outside the event
    * thread.
-   *
    */
   public void workerStarted()
   {
     Runnable r = new Runnable()
     {
+      @Override
       public void run()
       {
         displayWorkingProgressImage(true);
@@ -266,12 +263,12 @@
    *
    * This method can be called from the event thread or outside the event
    * thread.
-   *
    */
   public void workerFinished()
   {
     Runnable r = new Runnable()
     {
+      @Override
       public void run()
       {
         displayWorkingProgressImage(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
index 25736dc..b500588 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupErrorPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -39,7 +39,6 @@
  * This class is a panel that contains an error message and a quit button.
  * It is used for instance when we try to install Open DS but it is already
  * installed.
- *
  */
 public class QuickSetupErrorPanel extends QuickSetupPanel
 {
@@ -110,6 +109,7 @@
 
     ActionListener quitListener = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         ButtonEvent be = new ButtonEvent(ev.getSource(), fQuitButtonName);
@@ -128,6 +128,7 @@
 
     ActionListener continueListener = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         ButtonEvent be = new ButtonEvent(ev.getSource(), fContinueButtonName);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java
index 52452dc..86d3477 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupPanel.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -24,10 +25,7 @@
 
 import org.opends.quicksetup.UserData;
 
-/**
- * This class is an abstract class that provides some commodity methods.
- *
- */
+/** This class is an abstract class that provides some commodity methods. */
 abstract class QuickSetupPanel extends JPanel
 {
   private static final long serialVersionUID = 2096518919339628055L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
index 60dba71..28f39c2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.ui;
 
@@ -46,7 +46,6 @@
  * the CardLayout of CurrentStepPanel.  All the panels that appear on the
  * top-right side of the dialog extend this class: WelcomePane, ReviewPanel,
  * etc.
- *
  */
 public abstract class QuickSetupStepPanel extends QuickSetupPanel
 implements HyperlinkListener
@@ -96,9 +95,7 @@
   {
   }
 
-  /**
-   * Called just after the panel is shown: used to set focus properly.
-   */
+  /** Called just after the panel is shown: used to set focus properly. */
   public void endDisplay()
   {
   }
@@ -129,6 +126,7 @@
    *
    * @param e the HyperlinkEvent.
    */
+  @Override
   public void hyperlinkUpdate(HyperlinkEvent e)
   {
     if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
@@ -136,10 +134,7 @@
       String url = e.getURL().toString();
       if (!isURLWorkerRunning(url))
       {
-        /*
-         * Only launch the worker if there is not already a worker trying to
-         * display this URL.
-         */
+        /* Only launch the worker if there is not already a worker trying to display this URL. */
         URLWorker worker = new URLWorker(this, url);
         startWorker(worker);
       }
@@ -270,10 +265,7 @@
       l.buttonActionPerformed(ev);
     }
   }
-  /**
-   * Creates the layout of the panel.
-   *
-   */
+  /** Creates the layout of the panel. */
   protected void createLayout()
   {
     setLayout(new GridBagLayout());
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java
index d7f08cc..786fafd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/ReviewPanel.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.ui;
 
@@ -41,7 +41,7 @@
    */
   protected abstract JPanel createFieldsPanel();
 
-  /** {@inheritDoc} */
+  @Override
   protected Component createInputPanel()
   {
     JPanel panel = UIFactory.makeJPanel();
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 562f224..89cf901 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.ui;
 
@@ -70,167 +70,117 @@
 
   /** Specifies the horizontal insets between buttons. */
   public static final int HORIZONTAL_INSET_BETWEEN_BUTTONS = 5;
-
   /** Specifies the top inset for the steps. */
   public static final int TOP_INSET_STEP = 15;
-
   /** Specifies the left inset for the steps. */
   public static final int LEFT_INSET_STEP = 5;
-
   /** Specifies the extra left inset for the sub-steps. */
   public static final int LEFT_INSET_SUBSTEP = 20;
+
   /** Specifies the top inset for the instructions sub panel. */
   public static final int TOP_INSET_INSTRUCTIONS_SUBPANEL = 5;
-
   /** Specifies the top inset for input subpanel. */
   public static final int TOP_INSET_INPUT_SUBPANEL = 10;
-
   /** Specifies the top inset for a primary field. */
   public static final int TOP_INSET_PRIMARY_FIELD = 10;
-
   /** Specifies the top inset for a secondary field. */
   public static final int TOP_INSET_SECONDARY_FIELD = 5;
-
   /** Specifies the top inset for a radio button. */
   public static final int TOP_INSET_RADIOBUTTON = 0;
-
   /** Specifies the top inset for a radio button subordinate panel. */
   public static final int TOP_INSET_RADIO_SUBORDINATE = 0;
-
   /** Specifies the top inset for the progress bar. */
   public static final int TOP_INSET_PROGRESS_BAR = 5;
-
   /** Specifies the top inset for the progress text area. */
   public static final int TOP_INSET_PROGRESS_TEXTAREA = 4;
-
   /** Specifies the top inset for the background image. */
   public static final int TOP_INSET_BACKGROUND = 70;
-
   /** Specifies the top inset for the error message. */
   public static final int TOP_INSET_ERROR_MESSAGE = 10;
-
   /** Specifies the top inset for the browse button. */
   public static final int TOP_INSET_BROWSE = 5;
 
   /** Specifies the right inset for background image. */
   public static final int RIGHT_INSET_BACKGROUND = 20;
-
   /** Specifies the left inset for the primary field. */
   public static final int LEFT_INSET_PRIMARY_FIELD = 10;
-
   /** Specifies the left inset for the browse button. */
   public static final int LEFT_INSET_BROWSE = 10;
-
   /** Specifies the left inset for radio subordinate panel. */
   public static final int LEFT_INSET_RADIO_SUBORDINATE = 35;
-
   /** Specifies the left inset for the secondary field. */
   public static final int LEFT_INSET_SECONDARY_FIELD = 5;
-
   /** Specifies the left inset for the background image. */
   public static final int LEFT_INSET_BACKGROUND = 20;
-
   /** Specifies the left inset for the copy url button. */
   public static final int LEFT_INSET_COPY_BUTTON = 10;
-
   /** Specifies the left inset for a subordinate subpanel. */
   public static final int LEFT_INSET_SUBPANEL_SUBORDINATE = 30;
 
   /** Specifies the left inset for the progress bar. */
   public static final int BOTTOM_INSET_PROGRESS_BAR = 10;
-
   /** Specifies the bottom inset for the background image. */
   public static final int BOTTOM_INSET_BACKGROUND = 30;
-
   /** Specifies the top inset for a secondary field. */
   public static final int BOTTOM_INSET_SECONDARY_FIELD = 5;
 
   /** Specifies the number of columns of a text field for a path. */
   public static final int PATH_FIELD_SIZE = 20;
-
   /** Specifies the number of columns of a text field for a relative path. */
   public static final int RELATIVE_PATH_FIELD_SIZE = 10;
-
   /** Specifies the number of columns of a text field for a host name. */
   public static final int HOST_FIELD_SIZE = 20;
-
   /** Specifies the number of columns of a text field for a UID. */
   public static final int UID_FIELD_SIZE = 15;
-
   /** Specifies the number of columns of a text field for a port. */
   public static final int PORT_FIELD_SIZE = 5;
-
   /** Specifies the number of columns of a text field for a dn. */
   public static final int DN_FIELD_SIZE = 20;
-
   /** Specifies the number of columns of a text field for a password. */
   public static final int PASSWORD_FIELD_SIZE = 15;
-
-  /**
-   * Specifies the number of columns of a text field for the number of entries.
-   */
+  /** Specifies the number of columns of a text field for the number of entries. */
   public static final int NUMBER_ENTRIES_FIELD_SIZE = 7;
-
   /** Specifies the number of points for the width of the progress bar. */
   public static final int PROGRESS_BAR_SIZE = 220;
 
-  /**
-   * Specifies the number of extra points that we add to the minimum size of the
-   * dialog.
-   */
+  /** Specifies the number of extra points that we add to the minimum size of the dialog. */
   public static final int EXTRA_DIALOG_HEIGHT = 75;
 
   private static final Insets BUTTONS_PANEL_INSETS = new Insets(5, 0, 5, 10);
-
   private static final Insets STEPS_PANEL_INSETS = new Insets(15, 10, 5, 10);
-
   private static final Insets CURRENT_STEP_PANEL_INSETS = new Insets(15, 15, 15, 15);
-
   private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
 
   /** Specifies the default background color. */
   public static final Color DEFAULT_BACKGROUND = getColor(INFO_DEFAULT_BACKGROUND_COLOR.get());
-
   /** Specifies the current step background color. */
   public static final Color CURRENT_STEP_PANEL_BACKGROUND = getColor(INFO_CURRENT_STEP_PANEL_BACKGROUND_COLOR.get());
-
   /** Specifies the default label color. */
   public static final Color DEFAULT_LABEL_COLOR = getColor(INFO_DEFAULT_LABEL_COLOR.get());
-
   /** Specifies the valid field color. */
   public static final Color FIELD_VALID_COLOR = getColor(INFO_FIELD_VALID_COLOR.get());
-
   /** Specifies the invalid field color. */
   public static final Color FIELD_INVALID_COLOR = getColor(INFO_FIELD_INVALID_COLOR.get());
-
   /** Specifies the read only text color. */
   public static final Color READ_ONLY_COLOR = getColor(INFO_READ_ONLY_COLOR.get());
-
   /** Specifies the check box text color. */
   public static final Color CHECKBOX_COLOR = getColor(INFO_CHECKBOX_COLOR.get());
-
   /** Specifies the progress text color. */
   public static final Color PROGRESS_COLOR = getColor(INFO_PROGRESS_COLOR.get());
-
   /** Specifies the instructions text color. */
   public static final Color INSTRUCTIONS_COLOR = getColor(INFO_INSTRUCTIONS_COLOR.get());
-
   /** Specifies the text field text color. */
   public static final Color TEXTFIELD_COLOR = getColor(INFO_TEXTFIELD_COLOR.get());
-
   /** Specifies the password field text color. */
   public static final Color PASSWORDFIELD_COLOR = getColor(INFO_PASSWORDFIELD_COLOR.get());
-
   /** Specifies the in-line help text color. */
   public static final Color INLINE_HELP_COLOR = getColor(INFO_INLINE_HELP_COLOR.get());
-
   /** Specifies the panel border color. */
   public static final Color PANEL_BORDER_COLOR = getColor(INFO_PANEL_BORDER_COLOR.get());
 
   /** Specifies the current step panel border. */
   public static final Border CURRENT_STEP_PANEL_BORDER =
       BorderFactory.createMatteBorder(0, 2, 2, 0, PANEL_BORDER_COLOR);
-
   /** Specifies the text area border. */
   public static final Border TEXT_AREA_BORDER =
       BorderFactory.createMatteBorder(1, 1, 1, 1, getColor(INFO_TEXT_AREA_BORDER_COLOR.get()));
@@ -251,86 +201,56 @@
     }
   }
 
-  /**
-   * Specifies the font for the step which is not the current one in the steps
-   * panel.
-   */
+  /** Specifies the font for the step which is not the current one in the steps panel. */
   public static final Font NOT_CURRENT_STEP_FONT = DEFAULT_FONT.deriveFont(14f);
-
-  /**
-   * Specifies the font for the step which is the current one in the steps
-   * panel.
-   */
+  /** Specifies the font for the step which is the current one in the steps panel. */
   public static final Font CURRENT_STEP_FONT = DEFAULT_FONT.deriveFont(14f).deriveFont(Font.BOLD);
-
   /** Specifies the font for the title of the current panel. */
   public static final Font TITLE_FONT = DEFAULT_FONT.deriveFont(14f).deriveFont(Font.BOLD);
-
   /** Specifies the font for the instructions of the current panel. */
   public static final Font INSTRUCTIONS_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the instructions of the current panel. */
   public static final Font INSTRUCTIONS_MONOSPACE_FONT = Font.decode("Monospaced-PLAIN-14");
-
   /** Specifies the font for the primary valid field. */
   public static final Font PRIMARY_FIELD_VALID_FONT = DEFAULT_FONT.deriveFont(Font.BOLD);
-
   /** Specifies the font for the secondary valid field. */
   public static final Font SECONDARY_FIELD_VALID_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the primary invalid field. */
   public static final Font PRIMARY_FIELD_INVALID_FONT = DEFAULT_FONT.deriveFont(Font.BOLD | Font.ITALIC);
-
   /** Specifies the font for the secondary invalid field. */
   public static final Font SECONDARY_FIELD_INVALID_FONT = DEFAULT_FONT.deriveFont(Font.ITALIC);
-
   /** Specifies the font for the secondary status field. */
   public static final Font SECONDARY_STATUS_FONT = DEFAULT_FONT.deriveFont(Font.ITALIC);
-
   /** Specifies the font for read only text. */
   public static final Font READ_ONLY_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the check box text. */
   public static final Font CHECKBOX_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the progress text. */
   public static final Font PROGRESS_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the text field text. */
   public static final Font TEXTFIELD_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the password field text. */
   public static final Font PASSWORD_FIELD_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the points '....' in the progress panel. */
   public static final Font PROGRESS_POINTS_FONT = DEFAULT_FONT.deriveFont(Font.BOLD);
-
   /** Specifies the font for the done text 'Done' in the progress panel. */
   public static final Font PROGRESS_DONE_FONT = PROGRESS_POINTS_FONT;
-
   /** Specifies the font for the log messages in the progress panel. */
   public static final Font PROGRESS_LOG_FONT = Font.decode("Monospaced-PLAIN-12");
-
   /** Specifies the font for the error log messages in the progress panel. */
   public static final Font PROGRESS_LOG_ERROR_FONT = Font.decode("Monospaced-PLAIN-12");
-
   /** Specifies the font for the error messages in the progress panel. */
   public static final Font PROGRESS_ERROR_FONT = DEFAULT_FONT.deriveFont(Font.BOLD);
-
   /** Specifies the font for the warning messages in the progress panel. */
   public static final Font PROGRESS_WARNING_FONT = DEFAULT_FONT.deriveFont(Font.BOLD);
-
   /** Specifies the font for the stack trace in the progress panel. */
   public static final Font STACK_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the text in the WebBrowserErrorDialog. */
   public static final Font ERROR_DIALOG_FONT = DEFAULT_FONT;
-
   /** Specifies the font for the text in the in-line help. */
   public static final Font INLINE_HELP_FONT = DEFAULT_FONT.deriveFont((float) (DEFAULT_FONT.getSize() - 2));
 
   private static final String SPAN_CLOSE = "</span>";
-
   private static final String DIV_CLOSE = "</div>";
 
   private static final String DIV_OPEN_ERROR_BACKGROUND =
@@ -1543,10 +1463,7 @@
   }
 }
 
-/**
- * A class used to be able to select the contents of the text field when it gets
- * the focus.
- */
+/** A class used to be able to select the contents of the text field when it gets the focus. */
 class TextFieldFocusListener implements FocusListener
 {
   private final JTextField tf;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
index f4f1c5d..057b9ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -44,7 +44,6 @@
  * to copy it to the system clipboard.  This way (even if not ideal) the user
  * can view the contents of the URL we display by pasting manually the URL
  * in his/her browser.
- *
  */
 public class WebBrowserErrorDialog extends JDialog
 {
@@ -68,10 +67,7 @@
     getContentPane().add(createPanel());
   }
 
-  /**
-   * Packs and displays this dialog.
-   *
-   */
+  /** Packs and displays this dialog. */
   public void packAndShow()
   {
     pack();
@@ -118,6 +114,7 @@
             INFO_ERROR_BROWSER_COPY_BUTTON_TOOLTIP.get());
     copyButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         StringSelection s = new StringSelection(url);
@@ -148,6 +145,7 @@
     p2.add(closeButton, gbc);
     closeButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         dispose();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java
index f751a3d..4d5f8e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/BackgroundTaskThread.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.util;
 
@@ -42,11 +42,8 @@
     this.backgroundTask = backgroundTask;
   }
 
-
-
-  /**
-   * Performs the processing associated with the background task.
-   */
+  /** Performs the processing associated with the background task. */
+  @Override
   public void run()
   {
     try
@@ -54,6 +51,7 @@
       final T returnValue = backgroundTask.processBackgroundTask();
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           backgroundTask.backgroundTaskCompleted(returnValue, null);
@@ -64,6 +62,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
+        @Override
         public void run()
         {
           backgroundTask.backgroundTaskCompleted(null, t);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java
index 0c9252f..3641708 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ExtensionFileFilter.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.util;
 
@@ -42,7 +42,7 @@
     this.description = description;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public boolean accept(File f)
   {
     boolean accept = false;
@@ -63,7 +63,7 @@
     return accept;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public String getDescription()
   {
     return description;
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 795188e..1a36124 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.util;
@@ -22,9 +22,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
 
-/**
-   * This class is used to read an input stream and process ouput.
- */
+/** This class is used to read an input stream and process ouput. */
 public abstract class OutputReader {
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -42,6 +40,7 @@
    */
   public OutputReader(final BufferedReader reader) {
     Thread t = new Thread(new Runnable() {
+      @Override
       public void run() {
         try {
           String line;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
index 6cdb732..f6b84e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/PlainTextProgressMessageFormatter.java
@@ -12,142 +12,79 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.util;
 
+import static org.opends.messages.QuickSetupMessages.*;
+
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.LocalizableMessageBuilder;
-
 import org.opends.quicksetup.Constants;
 
-import static org.opends.messages.QuickSetupMessages.*;
-
 /**
  * This is an implementation of the ProgressMessageFormatter class that
  * provides format in plain text.
  */
-public class PlainTextProgressMessageFormatter
-implements ProgressMessageFormatter
+public class PlainTextProgressMessageFormatter implements ProgressMessageFormatter
 {
   private LocalizableMessage doneText;
   private LocalizableMessage errorText;
 
-  /**
-   * The space in plain text.
-   */
+  /** The space in plain text. */
   private static String SPACE = " ";
 
-  /**
-   * Returns the text representation of the text without providing any style.
-   * @param text the source text from which we want to get the text
-   * representation
-   * @return the text representation for the given text.
-   */
+  @Override
   public LocalizableMessage getFormattedText(LocalizableMessage text)
   {
     return text;
   }
 
-  /**
-   * Returns the plain text representation of the text that is the summary of
-   * the installation process (the one that goes in the UI next to the progress
-   * bar).
-   * @param text the source text from which we want to get the formatted
-   * representation
-   * @return the text representation of the summary for the given text.
-   */
+  @Override
   public LocalizableMessage getFormattedSummary(LocalizableMessage text)
   {
     return text;
   }
 
-  /**
-   * Returns the plain text representation of an error for a given text.
-   * @param text the source text from which we want to get the plain text
-   * representation
-   * @param applyMargin specifies whether we apply a margin or not to the
-   * resulting formatted text.
-   * @return the plain text representation of an error for the given text.
-   */
+  @Override
   public LocalizableMessage getFormattedError(LocalizableMessage text, boolean applyMargin)
   {
-    LocalizableMessage result;
     if (applyMargin)
     {
-      result = new LocalizableMessageBuilder().append(Constants.LINE_SEPARATOR)
-              .append(text).toMessage();
-    } else
-    {
-      result = text;
+      return new LocalizableMessageBuilder().append(Constants.LINE_SEPARATOR).append(text).toMessage();
     }
-    return result;
+    return text;
   }
 
-  /**
-   * Returns the plain text representation of a warning for a given text.
-   * @param text the source text from which we want to get the plain text
-   * representation
-   * @param applyMargin specifies whether we apply a margin or not to the
-   * resulting formatted text.
-   * @return the plain text representation of a warning for the given text.
-   */
+  @Override
   public LocalizableMessage getFormattedWarning(LocalizableMessage text, boolean applyMargin)
   {
-    LocalizableMessage result;
     if (applyMargin)
     {
-      result = new LocalizableMessageBuilder(Constants.LINE_SEPARATOR)
-              .append(text).toMessage();
-    } else
-    {
-      result = text;
+      return new LocalizableMessageBuilder(Constants.LINE_SEPARATOR).append(text).toMessage();
     }
-    return result;
+    return text;
   }
 
-  /**
-   * Returns the plain text representation of a success message for a given
-   * text.
-   * @param text the source text from which we want to get the plain text
-   * representation
-   * @return the plain text representation of a success message for the given
-   * text.
-   */
+  @Override
   public LocalizableMessage getFormattedSuccess(LocalizableMessage text)
   {
     return text;
   }
 
-  /**
-   * Returns the plain text representation of a log error message for a given
-   * text.
-   * @param text the source text from which we want to get the plain text
-   * representation
-   * @return the plain text representation of a log error message for the given
-   * text.
-   */
+  @Override
   public LocalizableMessage getFormattedLogError(LocalizableMessage text)
   {
     return text;
   }
 
-
-  /**
-   * Returns the plain text representation of a log message for a given text.
-   * @param text the source text from which we want to get the plain text
-   * representation
-   * @return the plain text representation of a log message for the given text.
-   */
+  @Override
   public LocalizableMessage getFormattedLog(LocalizableMessage text)
   {
     return text;
   }
 
-  /**
-   * Returns the plain text representation of the 'Done' text string.
-   * @return the plain text representation of the 'Done' text string.
-   */
+  @Override
   public LocalizableMessage getFormattedDone()
   {
     if (doneText == null)
@@ -157,10 +94,7 @@
     return doneText;
   }
 
-  /**
-   * Returns the plain text representation of the 'Error' text string.
-   * @return the plain text representation of the 'Error' text string.
-   */
+  @Override
   public LocalizableMessage getFormattedError()
   {
     if (errorText == null)
@@ -170,61 +104,32 @@
     return errorText;
   }
 
-  /**
-   * Returns the plain text representation of the argument text to which we add
-   * points.  For instance if we pass as argument 'Configuring Server' the
-   * return value will be 'Configuring Server .....'.
-   * @param text the String to which add points.
-   * @return the plain text representation of the '.....' text string.
-   */
+  @Override
   public LocalizableMessage getFormattedWithPoints(LocalizableMessage text)
   {
     return new LocalizableMessageBuilder(text).append(SPACE)
             .append(INFO_PROGRESS_POINTS.get()).append(SPACE).toMessage();
   }
 
-  /**
-   * Returns the formatted representation of a point.
-   * @return the formatted representation of the '.' text string.
-   */
+  @Override
   public LocalizableMessage getFormattedPoint()
   {
     return LocalizableMessage.raw(".");
   }
 
-  /**
-   * Returns the formatted representation of a space.
-   * @return the formatted representation of the ' ' text string.
-   */
+  @Override
   public LocalizableMessage getSpace()
   {
     return LocalizableMessage.raw(SPACE);
   }
 
-  /**
-   * Returns the formatted representation of a progress message for a given
-   * text.
-   * @param text the source text from which we want to get the formatted
-   * representation
-   * @return the formatted representation of a progress message for the given
-   * text.
-   */
+  @Override
   public LocalizableMessage getFormattedProgress(LocalizableMessage text)
   {
     return text;
   }
 
-  /**
-   * Returns the plain text representation of an error message for a given
-   * throwable.
-   * This method applies a margin if the applyMargin parameter is
-   * <CODE>true</CODE>.
-   * @param t the exception.
-   * @param applyMargin specifies whether we apply a margin or not to the
-   * resulting plain text.
-   * @return the plain text representation of an error message for the given
-   * exception.
-   */
+  @Override
   public LocalizableMessage getFormattedError(Throwable t, boolean applyMargin)
   {
     String msg = t.getMessage();
@@ -243,28 +148,19 @@
     return LocalizableMessage.raw(result);
   }
 
-  /**
-   * Returns the line break in plain text.
-   * @return the line break in plain text.
-   */
+  @Override
   public LocalizableMessage getLineBreak()
   {
     return LocalizableMessage.raw(Constants.LINE_SEPARATOR);
   }
 
-  /**
-   * Returns the tab in plain text.
-   * @return the tab in plain text.
-   */
+  @Override
   public LocalizableMessage getTab()
   {
     return LocalizableMessage.raw("     ");
   }
 
-  /**
-   * Returns the task separator in plain text.
-   * @return the task separator in plain text.
-   */
+  @Override
   public LocalizableMessage getTaskSeparator()
   {
     return LocalizableMessage.raw(
@@ -273,12 +169,11 @@
         Constants.LINE_SEPARATOR+Constants.LINE_SEPARATOR);
   }
 
-  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getFormattedAfterUrlClick(String url, LocalizableMessage lastText)
   {
     throw new IllegalStateException(
         "PlainTextProgressMessageFormatter.getFormattedAfterUrlClick must not "+
         "be called");
   }
-
 }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
index d3e8367..62a980c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.util;
 
@@ -42,9 +42,7 @@
 import static org.opends.admin.ads.util.ConnectionUtils.*;
 import static org.opends.messages.QuickSetupMessages.*;
 
-/**
- * Class used to manipulate an OpenDS server.
- */
+/** Class used to manipulate an OpenDS server. */
 public class ServerController {
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
@@ -180,9 +178,7 @@
             new BufferedReader(
                 new InputStreamReader(process.getInputStream()));
 
-          /* Create these objects to resend the stop process output to the
-           * details area.
-           */
+          /* Create these objects to resend the stop process output to the details area. */
           new StopReader(err, true);
           new StopReader(out, false);
 
@@ -242,10 +238,7 @@
           } else if (returnValue != 0) {
             if (stopTries <= 0)
             {
-              /*
-               * The return code is not the one expected, assume the server
-               * could not be stopped.
-               */
+              /* The return code is not the one expected, assume the server could not be stopped. */
               throw new ApplicationException(
                   ReturnCode.STOP_ERROR,
                   INFO_ERROR_STOPPING_SERVER_CODE.get(returnValue),
@@ -600,7 +593,6 @@
    *
    * When a new log message is found notifies the ProgressUpdateListeners
    * of it. If an error occurs it also notifies the listeners.
-   *
    */
   private class StartReader
   {
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 b1238c2..37fd555 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
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.util;
@@ -21,10 +21,7 @@
 import java.io.IOException;
 import java.io.PrintStream;
 
-/**
- * Tool for suppressing and unsuppressing output to standard
- * output streams.
- */
+/** Tool for suppressing and unsuppressing output to standard output streams. */
 public class StandardOutputSuppressor {
 
   private static Token token;
@@ -74,12 +71,10 @@
     return token != null;
   }
 
-  /**
-   * PrintWriter for suppressing stream.
-   */
+  /** PrintWriter for suppressing stream. */
   private static class NullOutputStream extends OutputStream {
 
-    /** {@inheritDoc} */
+    @Override
     public void write(int b) throws IOException {
       // do nothing;
     }
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
index e18011d..1a24e92 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/UIKeyStore.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.util;
@@ -32,18 +32,13 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
 
-/**
- * Class used to get the KeyStore that the graphical utilities use.
- *
- */
+/** Class used to get the KeyStore that the graphical utilities use. */
 public class UIKeyStore extends KeyStore
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
   private static KeyStore keyStore;
 
-  /**
-   * This should never be called.
-   */
+  /** This should never be called. */
   private UIKeyStore()
   {
     super(null, null, null);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java
index 896852b..0d4809e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/URLWorker.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.quicksetup.util;
 import org.forgerock.i18n.LocalizableMessage;
@@ -33,7 +33,6 @@
  *
  * When is finished (successfully or unsuccessfully) it notifies the
  * QuickSetupStepPanel passed in the constructor.
- *
  */
 public class URLWorker extends BackgroundTask<Object>
 {
@@ -53,7 +52,7 @@
     this.url = url;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public Object processBackgroundTask() throws WebBrowserException
   {
     try
@@ -67,7 +66,7 @@
     return null;
   }
 
-  /** {@inheritDoc} */
+  @Override
   public void backgroundTaskCompleted(Object returnValue,
       Throwable throwable)
   {

--
Gitblit v1.10.0