From e917dea27d1803843aeca89382b2b40867149699 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 23 Mar 2015 14:44:05 +0000
Subject: [PATCH] AutoRefactored javadocs

---
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java                                  |   38 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java                   |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java                               |   42 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java                          |   20 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java                                  |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java                           |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java                           |   12 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java                              |   42 
 opendj-sdk/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java                                             |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java                 |   28 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java                 |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java                        |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java                             |   11 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java                     |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java                          |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java                       |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java                          |   63 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java                  |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java                      |   12 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java                   |    6 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java                  |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java                |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java                |    8 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java                            |   73 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java             |   40 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java                           |  176 -
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java                             |   56 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java                      |   30 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java                       |   24 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java                    |    8 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java       |    8 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java                                            |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java                |   34 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java                               |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java                         |   48 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java                                                  |   14 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java                          |   58 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java                  |    8 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java                     |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java                              |   78 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java                             |   36 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java                  |   41 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java                                |   60 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java                             |   95 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java           |   16 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java                              |   16 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java                                |   24 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java |    7 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java                    |   33 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java       |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java                      |   36 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java                         |   23 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java              |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java                      |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java                              |   58 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java                                  |    6 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java                               |   62 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java                       |   23 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java                          |   20 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java                       |   10 
 opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java                                            |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java                       |   16 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java                                  |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java             |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java                   |   60 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java                 |   40 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java                      |   12 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java              |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java                          |   18 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java                                |  105 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java                                 |   28 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java                            |   44 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java                      |   72 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java                             |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java                |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java         |   41 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java                          |   30 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java                  |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java                        |   48 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java                                  |   76 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java                                           |    6 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java                  |   13 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java                   |   79 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java                            |   45 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java                                  |    6 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java                            |   36 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java                             |   42 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java                |   13 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java                  |   17 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java                       |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java                     |   15 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java                                |   56 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java                          |  121 -
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java          |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java                            |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java                |   11 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java                                      |   15 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java                    |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java                                   |   22 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java               |   16 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java                                   |   88 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java                      |   47 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java                               |   15 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java               |   13 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java                            |   33 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java                     |   97 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java  |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java                        |   12 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java                    |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java                                 |   77 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java             |   44 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java                       |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java                              |   35 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java                         |   27 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java       |    6 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java                            |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java                  |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java                   |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java                     |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java                               |   96 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java                 |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java                         |   28 
 opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java                                                  |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java                              |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java                           |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java             |   36 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java                    |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java                               |   20 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java                              |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java              |   40 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java                   |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java                       |   23 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java                        |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java                 |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java                        |   32 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java                                         |   10 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java                            |   28 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java                      |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java                        |   52 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java                  |    9 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java                               |   21 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java                         |   22 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java                                 |   40 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java              |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java            |    8 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java                        |   30 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java                        |   75 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java                            |   18 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java                     |    8 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java   |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java                   |   36 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java                |   23 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java                        |   16 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java                  |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java             |    5 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java                  |   42 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java                                   |   34 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java                 |   52 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java                                |   81 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java                             |   83 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java                      |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java                               |    4 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java                             |   72 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java                                    |    6 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java                       |   18 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java                     |   26 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java                             |   18 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java                          |   44 
 opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java                       |   19 
 169 files changed, 1,354 insertions(+), 3,511 deletions(-)

diff --git a/opendj-sdk/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java b/opendj-sdk/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
index 7870483..7ea8947 100644
--- a/opendj-sdk/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
+++ b/opendj-sdk/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
@@ -24,9 +24,10 @@
  *      Copyright 2006-2008 Sun Microsystems, Inc.
  *      Portions Copyright 2015 ForgeRock AS
  */
-
 package javax.jnlp;
 
+import java.net.URL;
+
 /**
  * This is the interface definition of DownloadServiceListener.
  * 
@@ -43,8 +44,6 @@
  * we are not providing the javaws-stub.jar during runtime: it is used only
  * for compilation.
  */
-import java.net.URL;
-
 public interface DownloadServiceListener {
   void downloadFailed(URL url, String version);
   void progress(URL url, String version, long readSoFar, long total, int overallPercent);
diff --git a/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java b/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java
index e14f544..e08f7dc 100644
--- a/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java
+++ b/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/ByteStringUtility.java
@@ -21,14 +21,13 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2012-2014 ForgeRock AS.
+ *      Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.dsml.protocol;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.nio.charset.Charset;
 
 import org.forgerock.opendj.ldap.ByteString;
 import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -40,9 +39,6 @@
  */
 public class ByteStringUtility
 {
-  // Non-lossy UTF-8 converter object.
-  private static final Charset UTF8 = Charset.forName("UTF-8");
-
   /**
    * Returns a ByteString from a DsmlValue Object.
    *
@@ -52,8 +48,7 @@
    *         or if it could not be converted.
    * @throws IOException if any problems occurred retrieving an anyURI value.
    */
-  public static ByteString convertValue(Object obj)
-      throws IOException
+  public static ByteString convertValue(Object obj) throws IOException
   {
     ByteString bs = null;
     if (obj != null)
diff --git a/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index bc42504..911758a 100644
--- a/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj-sdk/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -139,9 +139,11 @@
   private MessageFactory messageFactorySOAP_1_2;
   private String contentType;
 
-  // this extends the default handler of SAX parser. It helps to retrieve the
-  // requestID value when the xml request is malformed and thus unparsable
-  // using SOAP or JAXB.
+  /**
+   * This extends the default handler of SAX parser. It helps to retrieve the
+   * requestID value when the xml request is malformed and thus unparsable
+   * using SOAP or JAXB.
+   */
   private DSMLContentHandler contentHandler;
 
   private String hostName;
@@ -814,7 +816,7 @@
    */
   private static class DSMLContentHandler extends DefaultHandler {
     private String requestID;
-    /*
+    /**
      * This function fetches the requestID value of the batchRequest xml
      * element and call the default implementation (super).
      */
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index 4dfad8d..11fda9b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -400,7 +400,7 @@
     return nameToAdminUserProperty.get(name);
   }
 
-  // The context used to retrieve information
+  /** The context used to retrieve information. */
   private final InitialLdapContext dirContext;
 
 
@@ -1176,7 +1176,7 @@
     createAdminDataContainers();
   }
 
-  // Create container entries.
+  /** Create container entries. */
   private void createAdminDataContainers() throws ADSContextException
   {
     // Create the DIT below the administration suffix
@@ -2226,14 +2226,11 @@
    */
   private static String getRdn(String rdnName) throws ADSContextException
   {
-    CompositeName nameObj;
-    String rdn;
-    //
     // Transform the JNDI name into a RDN string
-    //
     try {
-      nameObj = new CompositeName(rdnName);
-      rdn = nameObj.get(0);
+      CompositeName nameObj = new CompositeName(rdnName);
+      String rdn = nameObj.get(0);
+      return rdn;
     }
     catch (InvalidNameException x)
     {
@@ -2241,7 +2238,6 @@
       throw new ADSContextException(
           ADSContextException.ErrorType.ERROR_UNEXPECTED, x);
     }
-    return rdn;
   }
 
   /**
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
index fda831d..e14588b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextException.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.admin.ads;
@@ -177,9 +177,7 @@
     return embeddedException;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void printStackTrace()
   {
     super.printStackTrace();
@@ -191,9 +189,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String toString()
   {
     return toString;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
index 43f88c8..572cc7b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/SuffixDescriptor.java
@@ -94,9 +94,7 @@
     return replicationServers;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int hashCode()
   {
     return getId().hashCode();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
index 29b259d..da5583c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindHostnameVerifier.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.admin.ads.util;
@@ -34,9 +35,7 @@
  */
 class BlindHostnameVerifier implements HostnameVerifier
 {
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean verify(String hostname, SSLSession session)
   {
     return true;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
index 76b7b2a..5a9913d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/BlindTrustManager.java
@@ -22,8 +22,8 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
-
 package org.opends.admin.ads.util;
 
 import java.security.cert.CertificateException;
@@ -35,28 +35,21 @@
  */
 public class BlindTrustManager implements X509TrustManager {
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void checkClientTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void checkServerTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public X509Certificate[] getAcceptedIssuers()
   {
     return new X509Certificate[0];
   }
 }
-
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java
index 7bbd961..28a45c5 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/OpendsCertificateException.java
@@ -22,11 +22,10 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.admin.ads.util;
 
-//
-// J2SE
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate ;
 
@@ -40,15 +39,11 @@
 public class OpendsCertificateException extends CertificateException
 {
 
-  /**
-   * The serial version UUID.
-   */
+  /** The serial version UUID. */
   private static final long serialVersionUID = 1151044344529478436L;
 
 
-  // ------------------
-  // Private certificate chain
-  // ------------------
+  /** Private certificate chain. */
   private X509Certificate[] chain;
 
   // ------------------
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
index 8880b91..8edf33e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ServerLoader.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.admin.ads.util;
 
@@ -451,9 +451,7 @@
     String startTLSUrl = getStartTlsLdapUrl(serverProperties);
     String ldapUrl = getLdapUrl(serverProperties);
 
-    /**
-     * Check the preferred connections passed in the constructor.
-     */
+    // Check the preferred connections passed in the constructor.
     for (PreferredConnection connection : preferredLDAPURLs)
     {
       String url = connection.getLDAPURL();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
index c668868..33e5239 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.admin.ads.util;
@@ -197,16 +198,12 @@
     return result;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Socket createSocket(InetAddress address, int port) throws IOException {
     return getInnerFactory().createSocket(address, port);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Socket createSocket(InetAddress address, int port,
       InetAddress clientAddress, int clientPort) throws IOException
   {
@@ -214,35 +211,27 @@
         clientPort);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Socket createSocket(String host, int port) throws IOException
   {
     return getInnerFactory().createSocket(host, port);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Socket createSocket(String host, int port, InetAddress clientHost,
       int clientPort) throws IOException
   {
     return getInnerFactory().createSocket(host, port, clientHost, clientPort);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Socket createSocket(Socket s, String host, int port, boolean autoClose)
   throws IOException
   {
     return getInnerFactory().createSocket(s, host, port, autoClose);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String[] getDefaultCipherSuites()
   {
     try
@@ -255,9 +244,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String[] getSupportedCipherSuites()
   {
     try
@@ -270,11 +257,6 @@
     }
   }
 
-
-  //
-  // Private
-  //
-
   private SSLSocketFactory getInnerFactory() throws IOException {
     if (innerFactory == null)
     {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
index 4188242..2e7a3d2 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel;
@@ -154,9 +154,7 @@
 
     ComponentListener listener = new ComponentAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void componentHidden(ComponentEvent e)
       {
         handleWindowClosed(localOrRemote, info);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index d4eb377..942b95a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -755,10 +755,12 @@
   }
 
 
-  // NUMSUBORDINATE HACK
-  // numsubordinates is not usable if the displayed entry
-  // is listed in in the hacker.
-  // Note: *usable* means *usable for detecting children presence*.
+  /**
+   * NUMSUBORDINATE HACK
+   * numsubordinates is not usable if the displayed entry
+   * is listed in in the hacker.
+   * Note: *usable* means *usable for detecting children presence*.
+   */
   private boolean isNumSubOrdinatesUsable() throws NamingException {
     SearchResult entry = getDisplayedEntry();
     boolean hasSubOrdinates = BrowserController.getHasSubOrdinates(entry);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
index 5905d97..617496b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
@@ -91,33 +91,25 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int getColumnCount()
   {
     return COLUMN_NAMES.length;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getColumnName(int col) {
     return COLUMN_NAMES[col];
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
index a93ed06..c80a63f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BackupTableModel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -58,9 +59,7 @@
     backups.add(backup);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Object getValueAt(int row, int column)
   {
     switch (column)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index a154416..648ddbc 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -100,9 +100,7 @@
     return baseDn;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean equals(Object v)
   {
@@ -132,18 +130,14 @@
         && getBackend().getBackendID().equals(desc.getBackend().getBackendID());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
     return hashCode;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int compareTo(BaseDNDescriptor desc)
   {
     int returnValue = desc.getDn().compareTo(getDn());
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
index c91dc3b..14463b2 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BaseDNTableModel.java
@@ -348,33 +348,25 @@
     return result;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int getColumnCount()
   {
     return displayReplicationInformation ? 6 : 4;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   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<BaseDNDescriptor>(this);
@@ -382,27 +374,18 @@
     dataArray.clear();
     for (BaseDNDescriptor desc : sortedSet)
     {
-      String[] s = new String[6];
-
-      s[0] = Utilities.unescapeUtf8(desc.getDn().toString());
-
-      s[1] = desc.getBackend().getBackendID();
-
-      s[2] = getValueForEntries(desc);
-
-      s[3] = getStringForReplState(desc);
-
-      s[4] = getValueForMissingChanges(desc);
-
-      s[5] = getValueForOldestMissingChange(desc);
-
-      dataArray.add(s);
+      dataArray.add(new String[] {
+        Utilities.unescapeUtf8(desc.getDn().toString()),
+        desc.getBackend().getBackendID(),
+        getValueForEntries(desc),
+        getStringForReplState(desc),
+        getValueForMissingChanges(desc),
+        getValueForOldestMissingChange(desc)
+      });
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getColumnName(int col) {
     return COLUMN_NAMES[col];
   }
@@ -444,9 +427,7 @@
     this.sortColumn = sortColumn;
   }
 
-  /*
-   * Several comparison methods to be able to sort the table model.
-   */
+  /** Several comparison methods to be able to sort the table model. */
   private int compareBackendIDs(BaseDNDescriptor desc1, BaseDNDescriptor desc2)
   {
     return desc1.getBackend().getBackendID().compareTo(
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
index 9d7047f..d9f0663 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
@@ -294,73 +294,55 @@
     this.attributeName = attributeName;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getMessage()
   {
     return msg;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getAttributeName()
   {
     return attributeName;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isAborted()
   {
     return isAborted;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isNumeric()
   {
     return isNumeric;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isTime()
   {
     return isTime;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isGMTDate()
   {
     return isGMTDate;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isValueInBytes()
   {
     return isValueInBytes;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canHaveAverage()
   {
     return canHaveAverage;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isNumericDate()
   {
     return false;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
index b601931..28e5937 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CategorizedComboBoxElement.java
@@ -84,9 +84,7 @@
     return type;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean equals(Object o)
   {
     if (o instanceof CategorizedComboBoxElement)
@@ -98,9 +96,7 @@
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int hashCode()
   {
     return hashCode;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
index 4b360a6..6582cc2 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ConnectionHandlerTableModel.java
@@ -188,33 +188,25 @@
     return result;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int getColumnCount()
   {
     return 3;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int getRowCount()
   {
     return dataArray.size();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Object getValueAt(int row, int col)
   {
     return dataArray.get(row)[col];
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getColumnName(int col) {
     return COLUMN_NAMES[col];
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
index a2a1df7..5a03142 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -76,17 +76,13 @@
     return attr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int compareTo(AbstractIndexDescriptor o)
   {
     return getName().toLowerCase().compareTo(o.getName().toLowerCase());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int hashCode()
   {
     return hashCode;
@@ -125,9 +121,7 @@
     name.equalsIgnoreCase("id2subtree");
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean equals(Object o)
   {
     if (o == this)
@@ -162,9 +156,7 @@
     return entryLimit;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void recalculateHashCode()
   {
     StringBuilder sb = new StringBuilder();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
index c33ad61..8663ca7 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -44,9 +44,7 @@
 
   private static final long serialVersionUID = 6979651281772979301L;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String[] getColumnNames()
   {
     return new String[] {
@@ -94,9 +92,7 @@
     return result;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String[] getLine(AbstractIndexDescriptor index)
   {
     IndexDescriptor i = (IndexDescriptor)index;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
index 88005e9..d11710c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/SortableListModel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -125,9 +126,7 @@
     data.addAll(newData);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void fireContentsChanged(Object source, int index0, int index1)
   {
     super.fireContentsChanged(source, index0, index1);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
index 335505c..569bdbe 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/TaskTableModel.java
@@ -165,24 +165,18 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Class<?> getColumnClass(int column)
   {
     return LocalizableMessage.class;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getColumnName(int col) {
     return columnNames[col];
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Object getValueAt(int row, int column)
   {
     LocalizableMessage value;
@@ -191,65 +185,50 @@
     switch (column)
     {
     case 0:
-      value = LocalizableMessage.raw(taskEntry.getId());
-      break;
+      return LocalizableMessage.raw(taskEntry.getId());
     case 1:
-      value = taskEntry.getType();
-      break;
+      return taskEntry.getType();
     case 2:
-      value = taskEntry.getState();
-      break;
+      return taskEntry.getState();
     case 3:
-      if (taskEntry.isCancelable())
-      {
-        value = INFO_CTRL_PANEL_TASK_IS_CANCELABLE.get();
-      }
-      else
-      {
-        value = INFO_CTRL_PANEL_TASK_IS_NOT_CANCELABLE.get();
-      }
-      break;
+      return taskEntry.isCancelable()
+          ? INFO_CTRL_PANEL_TASK_IS_CANCELABLE.get()
+          : INFO_CTRL_PANEL_TASK_IS_NOT_CANCELABLE.get();
     case 4:
       if (TaskState.isRecurring(get(row).getTaskState()))
       {
-        value = taskEntry.getScheduleTab();
-      } else {
-        value = taskEntry.getScheduledStartTime();
-        if (value == null || value.equals(LocalizableMessage.EMPTY))
-        {
-          value = INFO_TASKINFO_IMMEDIATE_EXECUTION.get();
-        }
+        return taskEntry.getScheduleTab();
       }
-      break;
+
+      value = taskEntry.getScheduledStartTime();
+      if (value == null || value.equals(LocalizableMessage.EMPTY))
+      {
+        return INFO_TASKINFO_IMMEDIATE_EXECUTION.get();
+      }
+      return value;
     case 5:
-      value = taskEntry.getActualStartTime();
-      break;
+      return taskEntry.getActualStartTime();
     case 6:
-      value = taskEntry.getCompletionTime();
-      break;
+      return taskEntry.getCompletionTime();
     case 7:
-      value = getValue(taskEntry.getDependencyIds(),
+      return getValue(taskEntry.getDependencyIds(),
           INFO_TASKINFO_NONE_SPECIFIED.get());
-      break;
     case 8:
       value = taskEntry.getFailedDependencyAction();
-      if (value == null)
+      if (value != null)
       {
-        value = INFO_TASKINFO_NONE.get();
+        return value;
       }
-      break;
+      return INFO_TASKINFO_NONE.get();
     case 9:
-      value = getValue(taskEntry.getCompletionNotificationEmailAddresses(),
+      return getValue(taskEntry.getCompletionNotificationEmailAddresses(),
           INFO_TASKINFO_NONE_SPECIFIED.get());
-      break;
     case 10:
-      value = getValue(taskEntry.getErrorNotificationEmailAddresses(),
+      return getValue(taskEntry.getErrorNotificationEmailAddresses(),
           INFO_TASKINFO_NONE_SPECIFIED.get());
-      break;
     default:
       throw new IllegalArgumentException("Invalid column: "+column);
     }
-    return value;
   }
 
   /**
@@ -298,9 +277,7 @@
     return allAttributes;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int compare(TaskEntry desc1, TaskEntry desc2)
   {
     int result;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
index 5061367..5a3d617 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.datamodel;
@@ -42,9 +42,7 @@
 {
   private static final long serialVersionUID = 897379916278218775L;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String[] getColumnNames()
   {
     return new String[] {
@@ -95,9 +93,7 @@
     return result;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String[] getLine(AbstractIndexDescriptor index)
   {
     VLVIndexDescriptor i = (VLVIndexDescriptor)index;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
index d9e4935..f05b59f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ClickTooltipDisplayer.java
@@ -51,17 +51,13 @@
   private boolean isTooltipVisible;
   private Popup tipWindow;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void mouseExited(MouseEvent event)
   {
     hideToolTip(event);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void mousePressed(MouseEvent event)
   {
     if (isTooltipVisible)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
index d73e625..ba580a3 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.event;
 
@@ -48,13 +49,15 @@
   private JComboBox combo;
   private JList list;
 
-  // The String that we are searching.
+  /** The String that we are searching. */
   private String lastSearchedString;
 
   private long lastSearchedTime;
 
-  // The number of milliseconds we wait between types before considering that
-  // the search starts again.
+  /**
+   * The number of milliseconds we wait between types before considering that
+   * the search starts again.
+   */
   private long RESET_BETWEEN_TYPES = 700;
 
   /**
@@ -67,9 +70,7 @@
     list = new JList();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int selectionForKey(char key, ComboBoxModel model)
   {
     int selectedIndex = -1;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
index 5e19280..99c638d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/ScrollPaneBorderListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -108,17 +109,13 @@
     return listener;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void componentShown(ComponentEvent ev)
   {
     updateBorder();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void componentHidden(ComponentEvent ev)
   {
     updateBorder();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
index 91f33c4..1a87c03 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/event/TextComponentFocusListener.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.event;
@@ -49,9 +50,7 @@
     this.tf = tf;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void focusGained(FocusEvent e)
   {
     if ((tf.getText() == null) || "".equals(tf.getText()))
@@ -66,10 +65,8 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void focusLost(FocusEvent e)
   {
   }
-}
\ No newline at end of file
+}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
index 74bbbc9..ec7fc41 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/AddToGroupTask.java
@@ -99,51 +99,37 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.MODIFY_ENTRY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
-    return
-    AdminToolMessages.INFO_CTRL_PANEL_ADD_TO_GROUP_TASK_DESCRIPTION.get();
+    return AdminToolMessages.INFO_CTRL_PANEL_ADD_TO_GROUP_TASK_DESCRIPTION.get();
   }
 
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -165,17 +151,13 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
index 43ac29c..f23b53b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/CancelTaskTask.java
@@ -72,50 +72,38 @@
     this.tasks = new ArrayList<TaskEntry>(tasks);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     // TODO: change this
     return Type.MODIFY_ENTRY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_CANCEL_TASK_DESCRIPTION.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean regenerateDescriptor()
   {
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
@@ -136,9 +124,7 @@
     return args;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -158,9 +144,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
index 40e005f..5da8dda 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -130,9 +130,7 @@
     this.backendsToDelete.addAll(backendsToDelete);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     if (baseDNsToDelete.size() > 0)
@@ -145,17 +143,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     StringBuilder sb = new StringBuilder();
@@ -212,9 +206,7 @@
     return LocalizableMessage.raw(sb.toString());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -530,17 +522,13 @@
     root.commit();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
@@ -584,9 +572,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index 0777d6b..870879a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -132,50 +132,37 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.DELETE_ENTRY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_DELETE_ENTRY_TASK_DESCRIPTION.get();
   }
 
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -198,17 +185,13 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
index 1b169fe..6b3c55c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
@@ -84,25 +84,19 @@
     this.indexesToDelete.addAll(indexesToDelete);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.DELETE_INDEX;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     if (backendSet.size() == 1)
@@ -117,9 +111,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -314,17 +306,13 @@
     backend.commit();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
@@ -349,9 +337,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
index 401027a..b271fbc 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -75,26 +75,18 @@
  */
 public class DeleteSchemaElementsTask extends Task
 {
-  // The list of object classes that the user asked to delete.
-  private LinkedHashSet<ObjectClass> providedOcsToDelete =
-    new LinkedHashSet<ObjectClass>();
-  // The list of attributes that the user asked to delete.
-  private LinkedHashSet<AttributeType> providedAttrsToDelete =
-    new LinkedHashSet<AttributeType>();
-  // The list of object classes that will be actually deleted (some might be
-  // recreated).
-  private LinkedHashSet<ObjectClass> ocsToDelete =
-      new LinkedHashSet<ObjectClass>();
-  // The list of attributes that will be actually deleted (some might be
-  // recreated).
-  private LinkedHashSet<AttributeType> attrsToDelete =
-    new LinkedHashSet<AttributeType>();
-  // The list of object classes that will be recreated.
-  private LinkedHashSet<ObjectClass> ocsToAdd =
-      new LinkedHashSet<ObjectClass>();
-  // The list of attributes that will be recreated.
-  private LinkedHashSet<AttributeType> attrsToAdd =
-      new LinkedHashSet<AttributeType>();
+  /** The list of object classes that the user asked to delete. */
+  private LinkedHashSet<ObjectClass> providedOcsToDelete = new LinkedHashSet<ObjectClass>();
+  /** The list of attributes that the user asked to delete. */
+  private LinkedHashSet<AttributeType> providedAttrsToDelete = new LinkedHashSet<AttributeType>();
+  /** The list of object classes that will be actually deleted (some might be recreated). */
+  private LinkedHashSet<ObjectClass> ocsToDelete = new LinkedHashSet<ObjectClass>();
+  /** The list of attributes that will be actually deleted (some might be recreated). */
+  private LinkedHashSet<AttributeType> attrsToDelete = new LinkedHashSet<AttributeType>();
+  /** The list of object classes that will be recreated. */
+  private LinkedHashSet<ObjectClass> ocsToAdd = new LinkedHashSet<ObjectClass>();
+  /** The list of attributes that will be recreated. */
+  private LinkedHashSet<AttributeType> attrsToAdd = new LinkedHashSet<AttributeType>();
 
   /**
    * Constructor of the task.
@@ -169,18 +161,14 @@
     this.attrsToDelete.addAll(allAttrsToDelete);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
@@ -198,18 +186,14 @@
     return canLaunch;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Type getType()
   {
     return Type.NEW_SCHEMA_ELEMENT;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void runTask()
   {
@@ -228,27 +212,21 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected List<String> getCommandLineArguments()
   {
     return Collections.emptyList();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTaskDescription()
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
index cb14ca1..acdc20a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/IndexTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -123,9 +123,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
index bf8a969..ed7c88f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyAttributeTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.task;
 
@@ -82,26 +82,20 @@
     this.newAttribute = newAttribute;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.MODIFY_SCHEMA_ELEMENT;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_MODIFY_ATTRIBUTE_TASK_DESCRIPTION.get(
         oldAttribute.getNameOrOID());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -118,33 +112,25 @@
     return canLaunch;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected List<String> getCommandLineArguments()
   {
     return Collections.emptyList();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     try
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index d8c8d98..e2602fa 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -153,50 +153,38 @@
     return hasModifications;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.MODIFY_ENTRY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_MODIFY_ENTRY_TASK_DESCRIPTION.get(oldEntry.getDN());
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -220,17 +208,13 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
@@ -291,9 +275,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void postOperation()
   {
     if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY) &&
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
index bbf7a26..7e3f83b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.task;
 
@@ -81,26 +81,20 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.MODIFY_SCHEMA_ELEMENT;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_MODIFY_OBJECTCLASS_TASK_DESCRIPTION.get(
         oldObjectClass.getNameOrOID());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -117,33 +111,25 @@
     return canLaunch;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected List<String> getCommandLineArguments()
   {
     return Collections.emptyList();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     try
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 1ecbe50..0e2a7f4 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -105,49 +105,37 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.NEW_ENTRY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_NEW_ENTRY_TASK_DESCRIPTION.get(dn);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -171,17 +159,13 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
index 28b8d30..72eb580 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
@@ -97,18 +97,14 @@
     this.attrsToAdd.addAll(attrsToAdd);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Set<String> getBackends()
   {
     return Collections.emptySet();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
@@ -126,9 +122,7 @@
     return canLaunch;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void runTask()
   {
@@ -147,18 +141,14 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Type getType()
   {
     return Type.NEW_SCHEMA_ELEMENT;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTaskDescription()
   {
@@ -217,18 +207,14 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected String getCommandLinePath()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected List<String> getCommandLineArguments()
   {
@@ -337,9 +323,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void run()
       {
@@ -383,9 +367,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void run()
       {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
index b295578..f563d4e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -78,18 +78,14 @@
     this.indexes.addAll(indexes);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Type getType()
   {
     return Type.REBUILD_INDEXES;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTaskDescription()
   {
@@ -106,9 +102,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
@@ -131,9 +125,7 @@
     return canLaunch;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void runTask()
   {
@@ -204,9 +196,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected ArrayList<String> getCommandLineArguments()
   {
@@ -258,9 +248,7 @@
     return args;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected String getCommandLinePath()
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
index b95eadc..c67fa00 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ResetUserPasswordTask.java
@@ -117,50 +117,38 @@
     useAdminCtx = controller.isConfigurationNode(node);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.MODIFY_ENTRY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_RESET_USER_PASSWORD_TASK_DESCRIPTION.get(
         node.getDN());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean regenerateDescriptor()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return getCommandLinePath("ldappasswordmodify");
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     ArrayList<String> args = new ArrayList<String>();
@@ -181,9 +169,7 @@
     return args;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -207,9 +193,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
index d2ec90c..3eff04a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/RestartServerTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -60,9 +60,7 @@
     startTask = new StartServerTask(info, dlg);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     if (starting)
@@ -75,17 +73,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_RESTART_SERVER_TASK_DESCRIPTION.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return null;
@@ -118,9 +112,7 @@
     return getCommandLinePath("stop-ds");
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
index 5d86bda..1ac9f95 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartServerTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -52,33 +52,25 @@
     super(info, dlg);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.START_SERVER;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_START_SERVER_TASK_DESCRIPTION.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return getCommandLinePath("start-ds");
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     ArrayList<String> args = new ArrayList<String>();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
index da81eb2..303e4eb 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StartStopTask.java
@@ -62,17 +62,13 @@
 
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Set<String> getBackends()
   {
     return backendSet;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean canLaunch(Task taskToBeLaunched,
       Collection<LocalizableMessage> incompatibilityReasons)
   {
@@ -86,9 +82,7 @@
     return canLaunch;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     state = State.RUNNING;
@@ -116,9 +110,7 @@
     getInfo().startPooling();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected ArrayList<String> getCommandLineArguments()
   {
     return new ArrayList<String>();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
index 48c16a9..1cc32ed 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/StopServerTask.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.task;
@@ -56,26 +56,20 @@
     super(info, dlg);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Type getType()
   {
     return Type.STOP_SERVER;
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTaskDescription()
   {
     return INFO_CTRL_PANEL_STOP_SERVER_TASK_DESCRIPTION.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void runTask()
   {
     super.runTask();
@@ -94,9 +88,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getCommandLinePath()
   {
     return getCommandLinePath("stop-ds");
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
index 6ecd587..081c4cc 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -87,17 +88,13 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return table;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     update(backendName);
@@ -112,16 +109,7 @@
   {
     this.backendName = backendName;
 
-    BackendDescriptor backend = null;
-    for (BackendDescriptor b : getInfo().getServerDescriptor().getBackends())
-    {
-      if (b.getBackendID().equals(backendName))
-      {
-        backend = b;
-        break;
-      }
-    }
-
+    BackendDescriptor backend = getBackend(backendName);
     if (backend != null)
     {
       final BackendDescriptor b = backend;
@@ -145,6 +133,18 @@
     }
   }
 
+  private BackendDescriptor getBackend(String backendID)
+  {
+    for (BackendDescriptor b : getInfo().getServerDescriptor().getBackends())
+    {
+      if (b.getBackendID().equals(backendID))
+      {
+        return b;
+      }
+    }
+    return null;
+  }
+
   /**
    * The method that is called to update the table model with the contents of
    * the specified backend.
@@ -152,17 +152,13 @@
    */
   protected abstract void updateTableModel(BackendDescriptor backend);
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No OK button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
@@ -223,7 +219,7 @@
           final IndexSelectionEvent ise = new IndexSelectionEvent(table, index);
           SwingUtilities.invokeLater(new Runnable()
           {
-            // Call it this way to let the painting events to happen.
+            /** Call it this way to let the painting events happen. */
             public void run()
             {
               for (IndexSelectionListener listener : indexListeners)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
index 5b3cb46..982d538 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -108,9 +108,7 @@
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     final ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
@@ -229,9 +227,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     updateErrorPaneIfServerRunningAndAuthRequired(ev.getNewDescriptor(),
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
index 02f69e2..2ab6f07 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -123,25 +123,19 @@
     packParentDialog();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return groups;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     final ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public Void processBackgroundTask()
       {
         try
@@ -154,9 +148,7 @@
         updateErrors(errors);
         return null;
       }
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
         if (t != null)
@@ -175,17 +167,13 @@
     worker.startBackgroundTask();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_ADD_TO_GROUP_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
@@ -240,9 +228,7 @@
     add(browse, gbc);
     browse.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         browseGroupsClicked();
@@ -251,37 +237,27 @@
 
     DropTargetListener dropTargetlistener = new DropTargetListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragEnter(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragExit(DropTargetEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragOver(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dropActionChanged(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void drop(DropTargetDropEvent e)
       {
         try {
@@ -365,9 +341,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         setPrimaryValid(lGroups);
@@ -416,9 +390,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           setPrimaryInvalid(lGroups);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
index 1d0a40a..8473103 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -75,32 +75,24 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_ATTRIBUTE_SYNTAX_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return usedByAttributes;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
@@ -173,9 +165,7 @@
 
     KeyAdapter keyListener = new KeyAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void keyTyped(KeyEvent ev)
       {
         if ((ev.getKeyChar() == KeyEvent.VK_SPACE) ||
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
index 4f10720..a7de397 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendIndexesPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -44,33 +44,25 @@
 {
   private static final long serialVersionUID = 7214847636854721907L;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BackendIndexesPanel()
   {
     super();
   }
-  /**
-   * {@inheritDoc}
-   */
+
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return AdminToolMessages.INFO_CTRL_PANEL_BACKEND_INDEXES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected AbstractIndexTableModel getIndexTableModel()
   {
     return new IndexTableModel();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void updateTableModel(BackendDescriptor backend)
   {
     tableModel.setData(
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
index 0d6e725..44b0ee4 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackendVLVIndexesPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -44,34 +44,25 @@
 {
   private static final long serialVersionUID = -5864660402543106492L;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public BackendVLVIndexesPanel()
   {
     super();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return AdminToolMessages.INFO_CTRL_PANEL_BACKEND_VLV_INDEXES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected AbstractIndexTableModel getIndexTableModel()
   {
     return new VLVIndexTableModel();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void updateTableModel(BackendDescriptor backend)
   {
     tableModel.setData(
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java
index e2c463e..d3eff24 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupListPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -156,9 +156,7 @@
     super();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return parentDirectory;
@@ -298,9 +296,7 @@
     refreshList.setOpaque(false);
     refreshList.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         refreshList();
@@ -316,9 +312,7 @@
     verifyBackup.setOpaque(false);
     verifyBackup.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         verifyBackupClicked();
@@ -326,9 +320,7 @@
     });
     ListSelectionListener listener = new ListSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void valueChanged(ListSelectionEvent ev)
       {
         BackupDescriptor backup = getSelectedBackup();
@@ -360,9 +352,7 @@
     BackgroundTask<Set<BackupInfo>> worker =
       new BackgroundTask<Set<BackupInfo>>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public Set<BackupInfo> processBackgroundTask() throws Throwable
       {
         // Open the backup directory and make sure it is valid.
@@ -416,9 +406,8 @@
         }
         return backups;
       }
-      /**
-       * {@inheritDoc}
-       */
+
+      /** {@inheritDoc} */
       public void backgroundTaskCompleted(Set<BackupInfo> returnValue,
           Throwable t)
       {
@@ -527,9 +516,7 @@
     return list;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -584,9 +571,7 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible && backupDirectoryInitialized)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
index 6801597..b6dce95 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -116,25 +116,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_BACKUP_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return backupID;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void verifyBackupClicked()
   {
     // Nothing to do: the button is not visible.
@@ -292,9 +286,7 @@
 
     changeListener = new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent ev)
       {
         backends.setEnabled(!allBackends.isSelected());
@@ -318,18 +310,14 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
     updateSimpleBackendComboBoxModel(backends, lNoBackendsFound, desc);
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         allBackends.setVisible(backends.getModel().getSize() > 0);
@@ -352,9 +340,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lBackend);
@@ -464,9 +450,7 @@
     final String path = parentDirectory.getText();
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public Void processBackgroundTask() throws Throwable
       {
         // Open the backup directory and make sure it is valid.
@@ -515,9 +499,7 @@
             errors.add(ERR_CTRL_PANEL_BACKUP_ID_ALREADY_EXIST.get(id, path));
             SwingUtilities.invokeLater(new Runnable()
             {
-              /**
-               * {@inheritDoc}
-               */
+              /** {@inheritDoc} */
               public void run()
               {
                 setPrimaryInvalid(lBackupID);
@@ -528,9 +510,7 @@
         }
         return null;
       }
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void backgroundTaskCompleted(Void returnValue,
           Throwable t)
       {
@@ -597,9 +577,7 @@
     return schedulePanel.getSchedule();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lBackend);
@@ -610,9 +588,7 @@
     super.cancelClicked();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
@@ -688,26 +664,20 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.BACKUP;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_BACKUP_TASK_DESCRIPTION.get(
       Utilities.getStringFromCollection(backendSet, ", "), dir);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -729,9 +699,7 @@
       return canLaunch;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -775,17 +743,13 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<String>();
@@ -856,9 +820,7 @@
       return args;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return getCommandLinePath("backup");
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
index 8c51ace..cc579e1 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BaseDNPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -62,9 +62,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_OTHER_BASE_DN_TITLE.get();
@@ -104,24 +102,18 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return dn;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(dnLabel);
@@ -161,9 +153,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(dnLabel);
@@ -171,9 +161,7 @@
     super.cancelClicked();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
index c5b815e..72ba826 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
@@ -24,7 +24,6 @@
  *      Copyright 2008 Sun Microsystems, Inc.
  *      Portions Copyright 2014-2015 ForgeRock AS
  */
-
 package org.opends.guitools.controlpanel.ui;
 
 import static org.opends.messages.AdminToolMessages.*;
@@ -38,9 +37,6 @@
 import java.io.FileInputStream;
 import java.util.ArrayList;
 
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
 import javax.swing.Box;
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
@@ -50,6 +46,8 @@
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
 
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
 import org.opends.guitools.controlpanel.datamodel.BinaryValue;
 import org.opends.guitools.controlpanel.event.BrowseActionListener;
 import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
@@ -60,7 +58,6 @@
 /**
  * Panel that is displayed in the dialog where the user can specify the value
  * of a binary attribute.
- *
  */
 public class BinaryAttributeEditorPanel extends StatusGenericPanel
 {
@@ -107,9 +104,8 @@
 //  Read the file or encode the base 64 content.
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public Void processBackgroundTask() throws Throwable
       {
         try
@@ -173,11 +169,9 @@
         return null;
       }
 
-      /**
-       * {@inheritDoc}
-       */
-      public void backgroundTaskCompleted(Void returnValue,
-          Throwable t)
+      /** {@inheritDoc} */
+      @Override
+      public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
         setPrimaryValid(useFile);
         setPrimaryValid(useBase64);
@@ -221,17 +215,15 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public Component getPreferredFocusComponent()
   {
     return file;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public void cancelClicked()
   {
     valueChanged = false;
@@ -247,9 +239,8 @@
     return value;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     refresh(true, false);
@@ -331,9 +322,8 @@
       // Read the file or encode the base 64 content.
       BackgroundTask<BinaryValue> worker = new BackgroundTask<BinaryValue>()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
+        @Override
         public BinaryValue processBackgroundTask() throws Throwable
         {
           try
@@ -397,11 +387,10 @@
           }
           return returnValue;
         }
-        /**
-         * {@inheritDoc}
-         */
-        public void backgroundTaskCompleted(BinaryValue returnValue,
-            Throwable t)
+
+        /** {@inheritDoc} */
+        @Override
+        public void backgroundTaskCompleted(BinaryValue returnValue, Throwable t)
         {
           setEnabledOK(true);
           displayMainPanel();
@@ -445,32 +434,31 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_BINARY_ATTRIBUTE_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
   /**
-   * {@inheritDoc}
+   * Returns whether the value has changed.
+   *
+   * @return {@code true} if the value has changed, {@code false} otherwise
    */
   public boolean valueChanged()
   {
     return valueChanged;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public boolean requiresScroll()
   {
     return true;
@@ -561,9 +549,8 @@
     add(Box.createHorizontalGlue(), gbc);
     refreshButton.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         refreshButtonClicked();
@@ -584,6 +571,7 @@
 
     ActionListener listener = new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent ev)
       {
         updateEnabling();
@@ -684,9 +672,8 @@
       super(field, type, parent);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
+    @Override
     protected void fieldUpdated()
     {
       super.fieldUpdated();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
index 90c142c..3e9c202 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BinaryValuePanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -81,9 +81,7 @@
     lastBytes = bytes;
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public Void processBackgroundTask() throws Throwable
       {
         try
@@ -113,11 +111,9 @@
         }
         return null;
       }
-      /**
-       * {@inheritDoc}
-       */
-      public void backgroundTaskCompleted(Void returnValue,
-          Throwable t)
+
+      /** {@inheritDoc} */
+      public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
         displayMainPanel();
         packParentDialog();
@@ -129,9 +125,6 @@
     };
     if (launchBackground)
     {
-      /**
-       * {@inheritDoc}
-       */
       displayMessage(INFO_CTRL_PANEL_READING_SUMMARY.get());
       worker.startBackgroundTask();
     }
@@ -141,56 +134,43 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return base64;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No OK Button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_VIEW_BINARY_ATTRIBUTE_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
   /**
    * Creates the layout of the panel (but the contents are not populated here).
-   *
    */
   private void createLayout()
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
index 7aacff7..046408e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseEntriesPanel.java
@@ -158,9 +158,7 @@
 
   private boolean forceRefreshWhenOpening;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public JMenuBar getMenuBar()
   {
     if (menuBar == null)
@@ -171,41 +169,31 @@
     return menuBar;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_MANAGE_ENTRIES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getBrowseButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void createBrowserController(ControlPanelInfo info)
   {
     super.createBrowserController(info);
     entryPane.setController(controller);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
@@ -225,9 +213,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected Component createMainPanel()
   {
     JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
@@ -271,9 +257,7 @@
   {
     TreeSelectionListener treeSelectionListener = new TreeSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void valueChanged(TreeSelectionEvent ev)
       {
         if (ignoreTreeSelectionEvents)
@@ -382,16 +366,12 @@
     final DragSource dragSource = DragSource.getDefaultDragSource();
     final DragSourceListener dragSourceListener = new DragSourceListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragDropEnd(DragSourceDropEvent dsde)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragEnter(DragSourceDragEvent dsde)
       {
         DragSourceContext context = dsde.getDragSourceContext();
@@ -410,32 +390,24 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragOver(DragSourceDragEvent dsde)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dropActionChanged(DragSourceDragEvent dsde)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragExit(DragSourceEvent dsde)
       {
       }
     };
     final DragGestureListener dragGestureListener = new DragGestureListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragGestureRecognized(DragGestureEvent e)
       {
         //Get the selected node
@@ -465,18 +437,14 @@
     );
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
     entryPane.setInfo(info);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
@@ -687,9 +655,7 @@
         INFO_CTRL_PANEL_NEW_USER_MENU.get());
     popupNewUserMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newUser();
@@ -702,9 +668,7 @@
         INFO_CTRL_PANEL_NEW_GROUP_MENU.get());
     popupNewGroupMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newGroup();
@@ -717,9 +681,7 @@
         INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU.get());
     popupNewOUMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newOrganizationalUnit();
@@ -732,9 +694,7 @@
         INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU.get());
     popupNewOrganizationMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newOrganization();
@@ -747,9 +707,7 @@
         INFO_CTRL_PANEL_NEW_DOMAIN_MENU.get());
     popupNewDomainMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newDomain();
@@ -762,9 +720,7 @@
         INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU.get());
     popupNewEntryFromLDIFMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newEntryFromLDIF();
@@ -777,9 +733,7 @@
         INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU.get());
     popupResetUserPasswordMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         resetUserPassword();
@@ -793,9 +747,7 @@
         INFO_CTRL_PANEL_ADD_TO_GROUP_MENU.get());
     popupAddToGroupMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         addToGroup();
@@ -810,9 +762,7 @@
         INFO_CTRL_PANEL_DUPLICATE_ENTRY_MENU.get());
     popupDuplicateEntryMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         duplicateEntry();
@@ -824,9 +774,7 @@
         INFO_CTRL_PANEL_COPY_DN_MENU.get());
     popupCopyDNMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         copyDN();
@@ -841,9 +789,7 @@
         INFO_CTRL_PANEL_DELETE_ENTRY_MENU.get());
     popupDeleteMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         deleteClicked();
@@ -1103,9 +1049,7 @@
   {
     ClipboardOwner owner = new ClipboardOwner()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void lostOwnership( Clipboard aClipboard,
           Transferable aContents) {
         //do nothing
@@ -1223,9 +1167,7 @@
           INFO_CTRL_PANEL_NEW_BROWSER_WINDOW_MENU.get());
       newWindow.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newWindow();
@@ -1237,9 +1179,7 @@
           INFO_CTRL_PANEL_CLOSE_MENU.get());
       close.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           closeClicked();
@@ -1282,9 +1222,7 @@
       {
         private boolean ignoreEvents;
         private JRadioButtonMenuItem lastSelected = menus[0];
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           if (ignoreEvents)
@@ -1399,9 +1337,7 @@
           INFO_CTRL_PANEL_NEW_USER_MENU.get());
       newUserMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newUser();
@@ -1414,9 +1350,7 @@
           INFO_CTRL_PANEL_NEW_GROUP_MENU.get());
       newGroupMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newGroup();
@@ -1429,9 +1363,7 @@
           INFO_CTRL_PANEL_NEW_ORGANIZATIONAL_UNIT_MENU.get());
       newOUMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newOrganizationalUnit();
@@ -1444,9 +1376,7 @@
           INFO_CTRL_PANEL_NEW_ORGANIZATION_MENU.get());
       newOrganizationMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newOrganization();
@@ -1459,9 +1389,7 @@
           INFO_CTRL_PANEL_NEW_DOMAIN_MENU.get());
       newDomainMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newDomain();
@@ -1474,9 +1402,7 @@
           INFO_CTRL_PANEL_NEW_FROM_LDIF_MENU.get());
       newEntryFromLDIFMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           newEntryFromLDIF();
@@ -1488,9 +1414,7 @@
           INFO_CTRL_PANEL_RESET_USER_PASSWORD_MENU.get());
       resetPasswordMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           resetUserPassword();
@@ -1503,9 +1427,7 @@
           INFO_CTRL_PANEL_ADD_TO_GROUP_MENU.get());
       addToGroupMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           addToGroup();
@@ -1520,9 +1442,7 @@
           INFO_CTRL_PANEL_DUPLICATE_ENTRY_MENU.get());
       duplicateEntryMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           duplicateEntry();
@@ -1535,9 +1455,7 @@
           INFO_CTRL_PANEL_COPY_DN_MENU.get());
       copyDNMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           copyDN();
@@ -1550,9 +1468,7 @@
           INFO_CTRL_PANEL_DELETE_ENTRY_MENU.get());
       deleteMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           deleteClicked();
@@ -1565,9 +1481,7 @@
           INFO_CTRL_PANEL_DELETE_BASE_DN_MENU.get());
       deleteBaseDNMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           deleteBaseDN();
@@ -1580,9 +1494,7 @@
           INFO_CTRL_PANEL_DELETE_BACKEND_MENU.get());
       deleteBackendMenuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           deleteBackend();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
index 0b43aba..cca4328 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseGeneralMonitoringPanel.java
@@ -135,36 +135,28 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean requiresBorder()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean callConfigurationChangedInBackground()
   {
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toBeDisplayed(boolean visible)
   {
@@ -204,36 +196,28 @@
     add(createSplitPane(), gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_GENERAL_MONITORING_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return treePane;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public GenericDialog.ButtonType getButtonType()
   {
@@ -271,9 +255,7 @@
 
     treePane.getTree().addTreeSelectionListener(new TreeSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void valueChanged(TreeSelectionEvent ev)
       {
         if (!ignoreSelectionEvents)
@@ -307,9 +289,7 @@
     return pane;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setInfo(ControlPanelInfo info)
   {
@@ -318,9 +298,7 @@
     entryPane.setInfo(info);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor server = ev.getNewDescriptor();
@@ -404,9 +382,7 @@
     final LocalizableMessage fErrorDetails = errorDetails;
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         errorPane.setVisible(fDisplayErrorPane);
@@ -649,9 +625,7 @@
   {
     private static final long serialVersionUID = -3390566664259441766L;
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Component getTreeCellRendererComponent(JTree tree, Object value,
         boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
index a0ce3e3..5618132 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
@@ -138,25 +138,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresBorder()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
@@ -201,9 +195,7 @@
     backends.setModel(new DefaultComboBoxModel(new String[]{}));
     ItemListener comboListener = new ItemListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void itemStateChanged(ItemEvent ev)
       {
         if (!ignoreSelectionEvents &&
@@ -227,9 +219,7 @@
     newIndex.setOpaque(false);
     newIndex.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newIndexClicked();
@@ -244,9 +234,7 @@
     newVLVIndex.setOpaque(false);
     newVLVIndex.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newVLVIndexClicked();
@@ -269,49 +257,36 @@
     add(createSplitPane(), gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_MANAGE_INDEXES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return backends;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void closeClicked()
   {
     super.closeClicked();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /**
-   * {@inheritDoc}
-   */
   private Component createSplitPane()
   {
     JSplitPane pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
@@ -325,9 +300,7 @@
 
     entryPane.addIndexSelectionListener(new IndexSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void indexSelected(IndexSelectionEvent ev)
       {
         AbstractIndexDescriptor index = ev.getIndex();
@@ -366,9 +339,7 @@
 
     treePane.getTree().addTreeSelectionListener(new TreeSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void valueChanged(TreeSelectionEvent ev)
       {
         if (!ignoreSelectionEvents)
@@ -458,9 +429,7 @@
     return pane;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -469,9 +438,7 @@
     info.addIndexModifiedListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ignoreSelectionEvents = true;
@@ -492,9 +459,7 @@
         INFO_CTRL_PANEL_NEW_INDEX_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newIndexClicked();
@@ -505,9 +470,7 @@
         INFO_CTRL_PANEL_NEW_VLV_INDEX_MENU.get());
     menuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         newVLVIndexClicked();
@@ -519,9 +482,7 @@
         INFO_CTRL_PANEL_DELETE_INDEX_MENU.get());
     deleteMenuItem.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         deleteClicked();
@@ -541,9 +502,7 @@
   {
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         repopulateTree(treePane.getTree());
@@ -569,17 +528,13 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void indexModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void backendIndexesModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
@@ -851,9 +806,7 @@
       newVLVIndexPanel.addConfigurationElementCreatedListener(
           new ConfigurationElementCreatedListener()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void elementCreated(ConfigurationElementCreatedEvent ev)
             {
               Object o = ev.getConfigurationObject();
@@ -982,9 +935,7 @@
 
     private static final long serialVersionUID = -6953837045703643228L;
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Component getTreeCellRendererComponent(JTree tree, Object value,
         boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
         boolean hasFocus)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
index 55f33d0..9a86694 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationAttributePanel.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
-
 package org.opends.guitools.controlpanel.ui;
 
 import static org.opends.messages.AdminToolMessages.*;
@@ -32,15 +31,12 @@
 
 /**
  * The panel that displays a configuration attribute definition.
- *
  */
 public class ConfigurationAttributePanel extends StandardAttributePanel
 {
   private static final long serialVersionUID = -6072885354690411482L;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CONFIGURATION_ATTRIBUTE_TITLE.get();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
index 6079a40..52513a4 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfigurationObjectClassPanel.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
-
 package org.opends.guitools.controlpanel.ui;
 
 import static org.opends.messages.AdminToolMessages.*;
@@ -32,15 +31,12 @@
 
 /**
  * The panel that displays a configuration objectclass definition.
- *
  */
 public class ConfigurationObjectClassPanel extends StandardObjectClassPanel
 {
   private static final long serialVersionUID = 8875851764570955881L;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CONFIGURATION_OBJECTCLASS_TITLE.get();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
index 876dd7d..16ea2c5 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConfirmInitializeAndImportDialog.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -105,9 +105,7 @@
     pack();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setVisible(boolean visible)
   {
     if (visible)
@@ -179,17 +177,13 @@
       add(createButtonsPanel(), gbc);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean requiresBorder()
     {
       return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean requiresScroll()
     {
       return false;
@@ -238,9 +232,7 @@
       buttonsPanel.add(importOnlyButton, gbc);
       importOnlyButton.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.IMPORT_ONLY;
@@ -256,9 +248,7 @@
       buttonsPanel.add(cancelButton, gbc);
       cancelButton.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.CANCEL;
@@ -272,44 +262,32 @@
       return buttonsPanel;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Component getPreferredFocusComponent()
     {
       return initializeAllButton;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void okClicked()
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTitle()
     {
       return INFO_CTRL_PANEL_CONFIRM_INITIALIZE_TITLE.get();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void configurationChanged(ConfigurationChangeEvent ev)
     {
-
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public GenericDialog.ButtonType getButtonType()
     {
       return GenericDialog.ButtonType.NO_BUTTON;
     }
   }
 }
-
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
index 8375f6d..d1d2513 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ConnectionHandlerMonitoringPanel.java
@@ -254,18 +254,14 @@
     updateTableSizes();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_CONNECTION_HANDLER_MONITORING_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public JMenuBar getMenuBar()
   {
@@ -277,9 +273,7 @@
     return menuBar;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor server = ev.getNewDescriptor();
@@ -378,9 +372,7 @@
     final LocalizableMessage fErrorDetails = errorDetails;
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         ViewPositions pos = Utilities.getViewPositions(
@@ -404,27 +396,21 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return connectionHandlers;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public GenericDialog.ButtonType getButtonType()
   {
@@ -432,18 +418,14 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean requiresBorder()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean requiresScroll()
   {
@@ -614,9 +596,7 @@
       super(info);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected void addMenus()
     {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
index 2950534..247b162 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ControlCenterMainPane.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -97,9 +97,7 @@
     info.addConfigChangeListener(new ConfigChangeListener()
     {
       private boolean lastStatusStopped;
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void configurationChanged(final ConfigurationChangeEvent ev)
       {
         final boolean displayLogin;
@@ -120,9 +118,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             updateAuthenticationLabel(ev.getNewDescriptor());
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java
index 917a1e7..5eccc86 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DBEnvironmentMonitoringPanel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -81,9 +82,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return table;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
index ac3e3fd..7454e7f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBackendPanel.java
@@ -55,9 +55,7 @@
 {
   private static final long serialVersionUID = 8744925738292396658L;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_DELETE_BACKEND_TITLE.get();
@@ -81,9 +79,7 @@
     return INFO_CTRL_PANEL_SELECT_BACKENDS_TO_DELETE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -102,9 +98,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     final LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<LocalizableMessage>();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
index 8bc05f4..03ef2e9 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DeleteBaseDNPanel.java
@@ -100,31 +100,24 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_DELETE_BASE_DN_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return list;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return false;
   }
 
-
   /**
    * Returns the no backend found label.
    * @return the no backend found label.
@@ -168,9 +161,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           @SuppressWarnings("deprecation")
@@ -271,9 +262,7 @@
         INFO_CTRL_PANEL_SELECT_ALL_BUTTON.get());
     selectAllButton.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         int[] indices = new int[list.getModel().getSize()];
@@ -297,9 +286,7 @@
         INFO_CTRL_PANEL_CLEAR_SELECTION_BUTTON.get());
     unselectAllButton.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         list.clearSelection();
@@ -309,9 +296,7 @@
 
     list.addListSelectionListener(new ListSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void valueChanged(ListSelectionEvent ev)
       {
         checkOKButtonEnable();
@@ -325,9 +310,7 @@
     mainPanel.add(Box.createVerticalGlue(), gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -337,17 +320,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkOKButtonEnable()
   {
     setEnabledOK(!list.isSelectionEmpty() && mainPanel.isVisible());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -369,9 +348,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     final LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<LocalizableMessage>();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
index b90d3e3..6de2961 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -94,25 +94,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     throw new IllegalArgumentException("this method must not be called");
@@ -166,17 +160,13 @@
     readEntry(node);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getProgressDialogTitle()
   {
     return INFO_CTRL_PANEL_DUPLICATE_ENTRY_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_DUPLICATE_ENTRY_TITLE.get();
@@ -238,9 +228,7 @@
     add(browse, gbc);
     browse.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         browseClicked();
@@ -300,25 +288,19 @@
 
     DocumentListener listener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         updateDNValue();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
@@ -330,9 +312,7 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     int origSize = errors.size();
@@ -382,9 +362,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getLDIF()
   {
     String dn = this.dn.getText();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
index ba72f30..abcbccf 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/EntryCachesMonitoringPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -77,9 +77,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
index 8d1f87d..bc673c9 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ErrorPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -56,9 +56,7 @@
     createLayout(errors);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return title;
@@ -88,32 +86,24 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.OK;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     Utilities.getParentDialog(this).setVisible(false);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
index 53acfac..446a6c8 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -103,25 +103,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EXPORT_LDIF_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return file;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -175,25 +169,19 @@
     file = Utilities.createTextField();
     documentListener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         String text = file.getText().trim();
         setEnabledOK((text != null) && (text.length() > 0) &&
             !errorPane.isVisible());
       }
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -272,9 +260,7 @@
 
     encryptData.addChangeListener(new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent ev)
       {
         generateSignedHash.setEnabled(encryptData.isSelected());
@@ -305,9 +291,7 @@
 
     wrapText.addChangeListener(new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent ev)
       {
         wrapColumn.setEnabled(wrapText.isSelected());
@@ -333,9 +317,7 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -356,17 +338,13 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkOKButtonEnable()
   {
     documentListener.changedUpdate(null);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lBackend);
@@ -455,9 +433,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lBackend);
@@ -492,26 +468,20 @@
       fileName = file.getText();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.EXPORT_LDIF;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_EXPORT_TASK_DESCRIPTION.get(
           backendSet.iterator().next(), fileName);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -533,9 +503,7 @@
       return canLaunch;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -572,17 +540,13 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<String>();
@@ -623,9 +587,7 @@
       return args;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return getCommandLinePath("export-ldif");
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
index 30fa285..2a13c6f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -37,41 +37,30 @@
 /**
  * Abstract class used to refactor some code among the panels that display the
  * contents of the global monitoring.
- *
  */
 public abstract class GeneralMonitoringPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = 2840755228290832143L;
 
-  /**
-   * The empty border shared by all the panels.
-   */
+  /** The empty border shared by all the panels. */
   protected Border PANEL_BORDER = new EmptyBorder(10, 10, 10, 10);
 
-  /**
-   * The message to express that the value was not found.
-   */
+  /** The message to express that the value was not found. */
   protected static LocalizableMessage NO_VALUE_SET =
     INFO_CTRL_PANEL_NO_MONITORING_VALUE.get();
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return LocalizableMessage.EMPTY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
index 2759020..abd99be 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GeneralMonitoringRightPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -101,9 +101,7 @@
     ((CardLayout)mainPanel.getLayout()).show(mainPanel, getTitle(noEntryPanel));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -155,48 +153,37 @@
     add(mainPanel, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return LocalizableMessage.EMPTY;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
   /**
    * Updates the contents of the panel with the root monitoring information.
-   *
    */
   public void updateRoot()
   {
@@ -207,7 +194,6 @@
 
   /**
    * Updates the contents of the panel with the system information monitoring.
-   *
    */
   public void updateSystemInformation()
   {
@@ -216,11 +202,7 @@
         getTitle(systemInformationPanel));
   }
 
-  /**
-   * Updates the contents of the panel with the work queue monitoring
-   * information.
-   *
-   */
+  /** Updates the contents of the panel with the work queue monitoring information. */
   public void updateWorkQueue()
   {
     workQueuePanel.updateContents();
@@ -231,7 +213,6 @@
   /**
    * Updates the contents of the panel with the entry caches monitoring
    * information.
-   *
    */
   public void updateEntryCaches()
   {
@@ -243,7 +224,6 @@
   /**
    * Updates the contents of the panel with the database environment monitoring
    * information.
-   *
    */
   public void updateDBEnvironment()
   {
@@ -252,10 +232,7 @@
         getTitle(dbEnvironmentPanel));
   }
 
-  /**
-   * Updates the contents of the panel with the JAVA information.
-   *
-   */
+  /** Updates the contents of the panel with the JAVA information. */
   public void updateJavaInformation()
   {
     javaInformationPanel.updateContents();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
index 0942f56..1a4a8f7 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericDialog.java
@@ -67,7 +67,6 @@
 
 /**
  * The generic dialog of the Control Panel.  It contains a StatusGenericPanel.
- *
  */
 public class GenericDialog extends JDialog
 {
@@ -76,41 +75,23 @@
     ColorAndFontConstants.greyBackground;
   private JButton okButton;
 
-  /**
-   * The close button.
-   */
+  /** The close button. */
   protected JButton closeButton;
   private JButton cancelButton;
-  //private JPanel contentPanel;
-  /**
-   * The panel contained in the dialog.
-   */
+  /** The panel contained in the dialog. */
   protected StatusGenericPanel panel;
-  //private ProgressPanel progressPanel;
-  //private boolean displayInputInNextVisible;
   private Component lastComponentWithFocus;
 
-  /**
-   * The different combinations of buttons that the dialog can have.
-   *
-   */
+  /** The different combinations of buttons that the dialog can have. */
   public enum ButtonType
   {
-    /**
-     * The dialog contains OK and CANCEL buttons.
-     */
+    /** The dialog contains OK and CANCEL buttons. */
     OK_CANCEL,
-    /**
-     * The dialog contains a OK button.
-     */
+    /** The dialog contains a OK button. */
     OK,
-    /**
-     * The dialog contains a CLOSE button.
-     */
+    /** The dialog contains a CLOSE button. */
     CLOSE,
-    /**
-     * The dialog has no buttons.
-     */
+    /** The dialog has no buttons. */
     NO_BUTTON
   };
 
@@ -160,9 +141,7 @@
     KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
     ActionListener actionListener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         setVisible(false);
@@ -173,9 +152,7 @@
 
     FocusListener focusListener = new FocusAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void focusGained(FocusEvent ev)
       {
         lastComponentWithFocus = ev.getComponent();
@@ -184,9 +161,7 @@
     addFocusListener(focusListener, panel);
 
     addWindowListener(new WindowAdapter() {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void windowClosing(WindowEvent e) {
         GenericDialog.this.panel.closeClicked();
       }
@@ -228,9 +203,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setVisible(boolean visible)
   {
     if (visible && lastComponentWithFocus == null)
@@ -279,10 +252,7 @@
     closeButton.setEnabled(enable);
   }
 
-  /**
-   * Updates the title of the dialog using the title of the panel.
-   *
-   */
+  /** Updates the title of the dialog using the title of the panel. */
   public void updateTitle()
   {
     if (panel.getTitle() != null)
@@ -297,7 +267,6 @@
     Utilities.setBorder(comp, new EmptyBorder(20, 20, 20, 20));
   }
 
-
   private JPanel createButtonsPanel(final StatusGenericPanel panel)
   {
     JPanel buttonsPanel = new JPanel(new GridBagLayout());
@@ -413,4 +382,3 @@
     }
   }
 }
-
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
index a13388e..410b941 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericFrame.java
@@ -67,7 +67,6 @@
 
 /**
  * The generic frame of the Control Panel.  It contains a StatusGenericPanel.
- *
  */
 public class GenericFrame extends JFrame
 {
@@ -76,18 +75,11 @@
     ColorAndFontConstants.greyBackground;
   private JButton okButton;
 
-  /**
-   * The close button.
-   */
+  /** The close button. */
   protected JButton closeButton;
   private JButton cancelButton;
-  //private JPanel contentPanel;
-  /**
-   * The panel contained in the frame.
-   */
+  /** The panel contained in the frame. */
   protected StatusGenericPanel panel;
-  //private ProgressPanel progressPanel;
-  //private boolean displayInputInNextVisible;
   private Component lastComponentWithFocus;
 
   /**
@@ -135,9 +127,7 @@
     KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
     ActionListener actionListener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         setVisible(false);
@@ -148,9 +138,7 @@
 
     FocusListener focusListener = new FocusAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void focusGained(FocusEvent ev)
       {
         lastComponentWithFocus = ev.getComponent();
@@ -159,9 +147,7 @@
     addFocusListener(focusListener, panel);
 
     addWindowListener(new WindowAdapter() {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void windowClosing(WindowEvent e) {
         GenericFrame.this.panel.closeClicked();
       }
@@ -204,9 +190,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setVisible(boolean visible)
   {
     if (visible && lastComponentWithFocus == null)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
index 9f2bc4a..52d49e4 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -129,27 +129,22 @@
   {
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public Void processBackgroundTask() throws WebBrowserException
       {
         try
         {
           WebBrowserLauncher.openURL(url);
+          return null;
         } catch (Throwable t)
         {
           throw new WebBrowserException(url,
               ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t), t);
         }
-        return null;
       }
 
-      /**
-       * {@inheritDoc}
-       */
-      public void backgroundTaskCompleted(Void returnValue,
-        Throwable throwable)
+      /** {@inheritDoc} */
+      public void backgroundTaskCompleted(Void returnValue, Throwable throwable)
       {
         WebBrowserException ex = (WebBrowserException) throwable;
         if (ex != null)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
index 3dac7bf..17e438e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -114,9 +114,7 @@
    */
   protected JLabel lExclusionFilter;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lDnsToInclude);
@@ -224,9 +222,7 @@
 
     ChangeListener changeListener = new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent e)
       {
         lDnsToInclude.setVisible(expander.isSelected());
@@ -344,9 +340,7 @@
 
     ChangeListener changeListener = new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent e)
       {
         lDnsToExclude.setVisible(expander.isSelected());
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
index 0bfae1e..91e27fe 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexBrowserRightPanel.java
@@ -107,9 +107,7 @@
     backendVLVIndexesPanel.removeIndexSelectionListener(listener);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -201,42 +199,32 @@
     add(mainPanel, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_INDEX_BROWSER_RIGHT_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     // TODO
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
index 55a2931..067894b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -163,9 +163,7 @@
     buttonPanel.add(deleteIndex, gbc);
     deleteIndex.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         deleteIndex();
@@ -181,9 +179,7 @@
     buttonPanel.add(saveChanges, gbc);
     saveChanges.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         saveIndex(false);
@@ -192,25 +188,19 @@
 
     entryLimit.getDocument().addDocumentListener(new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         checkSaveButton();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         checkSaveButton();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         checkSaveButton();
@@ -219,9 +209,7 @@
 
     ActionListener listener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         checkSaveButton();
@@ -233,25 +221,19 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_INDEX_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return entryLimit;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
@@ -261,9 +243,7 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         checkSaveButton();
@@ -272,9 +252,7 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
@@ -557,34 +535,26 @@
       indexToModify = index;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.MODIFY_INDEX;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_MODIFY_INDEX_TASK_DESCRIPTION.get(attributeName,
           backendName);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -633,9 +603,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void run()
             {
               StringBuilder sb = new StringBuilder();
@@ -652,9 +620,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -675,9 +641,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -792,17 +756,13 @@
       index.commit();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       return new ArrayList<String>();
@@ -826,9 +786,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -852,9 +810,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void postOperation()
     {
       if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY))
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index 1dc4744..a1a31fc 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -176,36 +176,28 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_JAVA_PROPERTIES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return javaHome;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setInfo(ControlPanelInfo info)
   {
@@ -444,9 +436,7 @@
     };
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
@@ -456,9 +446,7 @@
       previousLocal = isLocal;
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         @Override
         public void run()
         {
@@ -478,9 +466,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toBeDisplayed(boolean visible)
   {
@@ -614,9 +600,7 @@
 
     BackgroundTask<Void> worker = new BackgroundTask<Void>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public Void processBackgroundTask() throws Throwable
       {
@@ -672,12 +656,10 @@
 
         return null;
       }
-      /**
-       * {@inheritDoc}
-       */
+
+      /** {@inheritDoc} */
       @Override
-      public void backgroundTaskCompleted(Void returnValue,
-          Throwable t)
+      public void backgroundTaskCompleted(Void returnValue, Throwable t)
       {
         if (t == null)
         {
@@ -743,9 +725,7 @@
     setEnabledOK(true);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void cancelClicked()
   {
@@ -753,9 +733,7 @@
     super.cancelClicked();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
@@ -886,9 +864,8 @@
             return confirmationMessages;
           }
         }
-        /**
-         * {@inheritDoc}
-         */
+
+        /** {@inheritDoc} */
         @Override
         public void backgroundTaskCompleted(List<LocalizableMessage> returnValue,
             Throwable t)
@@ -1093,27 +1070,21 @@
       return javaArguments;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int hashCode()
     {
       return hashCode;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public String toString()
     {
       return toString;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean equals(Object o)
     {
@@ -1214,36 +1185,28 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int getColumnCount()
     {
       return COLUMN_NAMES.length;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int getRowCount()
     {
       return dataArray.size();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Object getValueAt(int row, int col)
     {
       return dataArray.get(row)[col];
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public String getColumnName(int col) {
       return COLUMN_NAMES[col];
@@ -1301,17 +1264,13 @@
       this.sortColumn = sortColumn;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isCellEditable(int row, int col) {
       return col != 0;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void setValueAt(Object value, int row, int col)
     {
@@ -1400,36 +1359,28 @@
       arguments = getCurrentJavaArguments();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Type getType()
     {
       return Type.JAVA_SETTINGS_UPDATE;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_UPDATE_JAVA_SETTINGS_TASK_DESCRIPTION.get();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
@@ -1454,27 +1405,21 @@
       return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected String getCommandLinePath()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected ArrayList<String> getCommandLineArguments()
     {
       return new ArrayList<String>();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void runTask()
     {
@@ -1568,9 +1513,7 @@
       }
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         @Override
         public void run()
         {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
index b4ada7d..b179c2f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntryPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -172,9 +172,7 @@
     add(saveChanges, gbc);
     saveChanges.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         saveChanges(true);
@@ -203,9 +201,7 @@
 
     LDAPEntryChangedListener listener = new LDAPEntryChangedListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void entryChanged(LDAPEntryChangedEvent ev)
       {
         boolean enable = saveChanges.isVisible() &&
@@ -260,17 +256,13 @@
     cardLayout.show(mainPanel, NOTHING_SELECTED);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void entryRead(EntryReadEvent ev)
   {
     searchResult = ev.getSearchResult();
@@ -398,41 +390,31 @@
     displayedEntryPanel = null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_LDAP_ENTRY_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return saveChanges;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         boolean isReadOnly = true;
@@ -450,9 +432,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
index b6c44f6..1871457 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LDAPEntrySelectionPanel.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
-
 package org.opends.guitools.controlpanel.ui;
 
 import java.awt.Component;
@@ -42,59 +41,43 @@
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
+import org.forgerock.i18n.LocalizableMessage;
 import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 
 /**
  * A basic panel that contains a browser.  It is used in general in panels that
  * require to provide some DNs of existing entries: we allow the user to launch
  * a browser to select entries.
- *
  */
 public class LDAPEntrySelectionPanel extends AbstractBrowseEntriesPanel
 {
   private LocalizableMessage title;
   private Filter f;
-
   private String[] dns;
 
   /**
    * The values of the filters that will be used when opening the dialog where
    * this panel is contained.  For instance if the filter is set to Filter.USERS
    * the panel will display only users when the dialog appears.
-   *
    */
   public enum Filter
   {
-    /**
-     * Display users.
-     */
+    /** Display users. */
     USERS,
-    /**
-     * Display groups.
-     */
+    /** Display groups. */
     GROUPS,
-    /**
-     * Display Dynamic Groups.
-     */
+    /** Display Dynamic Groups. */
     DYNAMIC_GROUPS,
-    /**
-     * Display Static Groups.
-     */
+    /** Display Static Groups. */
     STATIC_GROUPS,
-    /**
-     * Default filter (all entries).
-     */
+    /** Default filter (all entries). */
     DEFAULT
   }
 
   private static final long serialVersionUID = -8140540064410029902L;
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public LDAPEntrySelectionPanel()
   {
     super();
@@ -111,29 +94,26 @@
           TreeSelectionModel.SINGLE_TREE_SELECTION);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public void toBeDisplayed(boolean visible)
   {
     super.toBeDisplayed(visible);
     if (visible)
     {
-      dns = new String[]{};
+      dns = new String[0];
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public LocalizableMessage getTitle()
   {
     return title;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public void okClicked()
   {
     dns = retrieveDNs();
@@ -164,22 +144,20 @@
     }
     else
     {
-      dns = new String[]{};
+      dns = new String[0];
     }
     return dns;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public GenericDialog.ButtonType getBrowseButtonType()
   {
     return GenericDialog.ButtonType.OK_CANCEL;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   protected Component createMainPanel()
   {
     JComponent p = createTreePane();
@@ -188,9 +166,8 @@
     tree.getSelectionModel().addTreeSelectionListener(
     new TreeSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void valueChanged(TreeSelectionEvent ev)
       {
         TreePath[] paths = tree.getSelectionPaths();
@@ -198,9 +175,8 @@
       }
     });
     MouseListener mouseListener = new MouseAdapter() {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mousePressed(MouseEvent e) {
         int selRow = tree.getRowForLocation(e.getX(), e.getY());
         if ((selRow != -1) && (e.getClickCount() == 2))
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
index 4d7a550..7b8751c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -98,9 +98,7 @@
         actions.add(b);
         b.addActionListener(new ActionListener()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void actionPerformed(ActionEvent ev)
           {
             // Constructs the panels using reflection.
@@ -165,9 +163,7 @@
     createActionButtonListeners(actions);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return null;
@@ -310,9 +306,7 @@
   {
     ActionListener actionListener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         for (ActionButton button : actions)
@@ -328,9 +322,7 @@
 
     MouseAdapter mouseListener = new MouseAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mousePressed(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -343,9 +335,7 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseReleased(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -358,9 +348,7 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseExited(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -373,9 +361,7 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseEntered(MouseEvent ev)
       {
         for (ActionButton button : actions)
@@ -399,25 +385,19 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return null;
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
index b994456..80e443e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainMenuBar.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -142,9 +142,7 @@
       menuItem = Utilities.createMenuItem(INFO_CTRL_PANEL_EXIT_MENU.get());
       menuItem.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           quitClicked();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
index 881d040..b0f1262 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -120,7 +120,7 @@
 
   private JPanel detailsPanel;
   private JLabel noDetailsLabel;
-  // The panel containing all the labels and values of the details.
+  /** The panel containing all the labels and values of the details. */
   private JPanel detailsSubpanel;
   private JLabel logsLabel;
   private JScrollPane logsScroll;
@@ -129,51 +129,38 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public ManageTasksPanel()
   {
     super();
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_TASK_TO_SCHEDULE_LIST_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // Nothing to do, it only contains a close button.
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public JMenuBar getMenuBar()
   {
@@ -184,9 +171,7 @@
     return menuBar;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return taskTable;
@@ -296,9 +281,7 @@
     add(Box.createVerticalGlue(), gbc);
     cancelTask.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         cancelTaskClicked();
@@ -351,9 +334,7 @@
 
     ListSelectionListener listener = new ListSelectionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void valueChanged(ListSelectionEvent ev)
       {
         tableSelected();
@@ -898,9 +879,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     updateErrorPaneIfServerRunningAndAuthRequired(ev.getNewDescriptor(),
@@ -908,25 +887,11 @@
         INFO_CTRL_PANEL_SCHEDULED_TASK_LIST_AUTHENTICATION.get());
     ServerDescriptor server = ev.getNewDescriptor();
     final Set<TaskEntry> tasks = server.getTaskEntries();
-    boolean changed = tableModel.getRowCount() != tasks.size();
-    if (!changed)
-    {
-      for (int i=0; i<tableModel.getRowCount(); i++)
-      {
-        if (!tasks.contains(tableModel.get(i)))
-        {
-          changed = true;
-          break;
-        }
-      }
-    }
-    if (changed)
+    if (haveChanged(tasks))
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           Set<String> selectedIds = getSelectedIds();
@@ -953,6 +918,22 @@
     }
   }
 
+  private boolean haveChanged(final Set<TaskEntry> tasks)
+  {
+    if (tableModel.getRowCount() != tasks.size())
+    {
+      return true;
+    }
+    for (int i=0; i<tableModel.getRowCount(); i++)
+    {
+      if (!tasks.contains(tableModel.get(i)))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
   private void updateTableSizes()
   {
     Utilities.updateTableSizes(taskTable, 5);
@@ -984,9 +965,7 @@
       super(info);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected void addMenus()
     {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
index 6400294..1f29598 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -76,35 +76,27 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_MATCHING_RULE_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Component getPreferredFocusComponent()
   {
     return usedByAttributes;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void okClicked()
   {
@@ -170,9 +162,7 @@
 
     MouseAdapter clickListener = new MouseAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void mouseClicked(MouseEvent ev)
       {
@@ -186,9 +176,7 @@
 
     KeyAdapter keyListener = new KeyAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void keyTyped(KeyEvent ev)
       {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
index 92fac4d..0d204fd 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
@@ -69,8 +69,10 @@
 
  private boolean isCanceled = true;
 
- // Note: the order of the checkboxes and the elements in the Attributes
- // enumeration will be the same.
+ /**
+  * Note: the order of the checkboxes and the elements in the Attributes
+  * enumeration will be the same.
+  */
  private JCheckBox[] checkboxes = {};
 
  private JButton selectAll;
@@ -113,9 +115,7 @@
    return new MonitoringAttributesViewPanel<LocalizableMessage>(attributes);
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  @Override
  public boolean requiresScroll()
  {
@@ -260,32 +260,24 @@
            preferredViewHeight));
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  public LocalizableMessage getTitle()
  {
    return INFO_CTRL_PANEL_ATTRIBUTE_VIEW_OPTIONS_TITLE.get();
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  public void configurationChanged(ConfigurationChangeEvent ev)
  {
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  public Component getPreferredFocusComponent()
  {
    return checkboxes[0];
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  public void toBeDisplayed(boolean visible)
  {
    if (visible)
@@ -294,9 +286,7 @@
    }
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  public void okClicked()
  {
    // Check that at least one checkbox is selected.
@@ -323,9 +313,7 @@
    }
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  public GenericDialog.ButtonType getButtonType()
  {
    return GenericDialog.ButtonType.OK_CANCEL;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 49514fc..1bda122 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -151,25 +151,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_BASE_DN_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return baseDN;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -213,9 +207,7 @@
     add(newBackend, gbc);
     ItemListener comboListener = new ItemListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void itemStateChanged(ItemEvent ev)
       {
         Object o = backends.getSelectedItem();
@@ -240,9 +232,7 @@
     baseDN = Utilities.createTextField();
     documentListener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         String text = baseDN.getText().trim();
@@ -250,17 +240,13 @@
             !errorPane.isVisible());
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -341,9 +327,7 @@
 
     ChangeListener listener = new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent ev)
       {
         browseImportPath.setEnabled(importDataFromLDIF.isSelected());
@@ -364,9 +348,7 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -462,9 +444,7 @@
     return panel;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lBackend);
@@ -476,17 +456,13 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkOKButtonEnable()
   {
     documentListener.changedUpdate(null);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lBackend);
@@ -712,26 +688,20 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.NEW_BASEDN;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_NEW_BASE_DN_TASK_DESCRIPTION.get(newBaseDN,
       backendSet.iterator().next());
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -869,9 +839,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void run()
             {
               List<String> args =
@@ -887,9 +855,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void run()
             {
               LocalizableMessage msg = INFO_CTRL_PANEL_CREATING_BACKEND_PROGRESS.get(
@@ -914,9 +880,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void run()
             {
               LocalizableMessage msg = INFO_CTRL_PANEL_CREATING_BASE_DN_PROGRESS.get(
@@ -937,9 +901,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -959,9 +921,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void run()
             {
               getProgressDialog().getProgressBar().setIndeterminate(false);
@@ -1519,17 +1479,13 @@
       backend.commit();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       return new ArrayList<String>();
@@ -1587,9 +1543,7 @@
       return args;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -1607,9 +1561,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
index 70e6aae..e923fd3 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
@@ -44,25 +44,19 @@
 {
   private static final long serialVersionUID = -595396547491445219L;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_NEW_DOMAIN_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getProgressDialogTitle()
   {
     return INFO_CTRL_NEW_DOMAIN_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     for (JLabel label : labels)
@@ -82,9 +76,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void updateDNValue()
   {
     String value = name.getText().trim();
@@ -99,9 +91,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getLDIF()
   {
     StringBuilder sb = new StringBuilder();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
index 1c4e533..0030c0a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
@@ -71,25 +71,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return ldif;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     super.setParent(parentNode, controller);
@@ -105,17 +99,13 @@
     ldif.setCaretPosition(emptyDn.length());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getProgressDialogTitle()
   {
     return INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE.get();
@@ -155,25 +145,19 @@
     ldif = Utilities.createTextArea(LocalizableMessage.EMPTY, 20, 50);
     ldif.getDocument().addDocumentListener(new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         lSyntaxCorrect.setVisible(false);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         removeUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
        removeUpdate(ev);
@@ -194,9 +178,7 @@
     checkSyntax.setOpaque(false);
     checkSyntax.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
@@ -229,17 +211,13 @@
     add(checkSyntax, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     lSyntaxCorrect.setVisible(false);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     try
@@ -256,9 +234,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getLDIF()
   {
     return ldif.getText();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
index f39dfaa..4634d4c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
@@ -125,9 +125,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     super.setParent(parentNode, controller);
@@ -140,48 +138,36 @@
     filter.setText("ldap:///"+parentNode.getDN()+"??sub?(<your filter>)");
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getProgressDialogTitle()
   {
     return INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected boolean checkSyntaxBackground()
   {
     return staticGroup.isSelected();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     Runnable runnable = new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         for (JLabel label : labels)
@@ -371,9 +357,7 @@
     staticGroup.setSelected(true);
     ActionListener actionListener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         checkEnabling();
@@ -439,9 +423,7 @@
 
     addMembers.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         addMembersClicked();
@@ -515,9 +497,7 @@
       Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get());
     browseReferenceGroup.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         browseReferenceGroupClicked();
@@ -528,25 +508,19 @@
 
     DocumentListener listener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         updateDNValue();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
@@ -560,37 +534,27 @@
 
     DropTargetListener dropTargetlistener = new DropTargetListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragEnter(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragExit(DropTargetEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragOver(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dropActionChanged(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void drop(DropTargetDropEvent e)
       {
         try {
@@ -648,10 +612,7 @@
     checkEnabling();
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  protected void updateDNValue()
+  private void updateDNValue()
   {
     String value = name.getText().trim();
     if (value.length() > 0)
@@ -723,9 +684,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getLDIF()
   {
     StringBuilder sb = new StringBuilder();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index c6570ef..c4f7286 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -106,17 +106,13 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_INDEX_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return attributes;
@@ -131,9 +127,7 @@
     backendName.setText(backend.getBackendID());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
@@ -273,9 +267,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lAttribute);
@@ -408,34 +400,26 @@
       indexTypes = getTypes();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.NEW_INDEX;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_NEW_INDEX_TASK_DESCRIPTION.get(
           attributeName, backendName.getText());
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -480,9 +464,7 @@
         {
           SwingUtilities.invokeLater(new Runnable()
           {
-            /**
-             * {@inheritDoc}
-             */
+            /** {@inheritDoc} */
             public void run()
             {
               List<String> args = getObfuscatedCommandLineArguments(
@@ -495,9 +477,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -519,9 +499,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -659,17 +637,13 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       return new ArrayList<String>();
@@ -687,9 +661,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -720,9 +692,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void postOperation()
     {
       if ((lastException == null) && (state == State.FINISHED_SUCCESSFULLY) &&
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 19217d8..76d93e1 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -147,25 +147,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_OBJECTCLASS_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
@@ -237,9 +231,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
@@ -476,9 +468,7 @@
     SuperiorObjectClassesChangedListener listener =
       new SuperiorObjectClassesChangedListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void parentObjectClassesChanged(
           SuperiorObjectClassesChangedEvent ev)
       {
@@ -555,9 +545,7 @@
       new DoubleAddRemovePanel<AttributeType>(0, AttributeType.class);
     Comparator<AttributeType> comparator = new Comparator<AttributeType>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public int compare(AttributeType attr1, AttributeType attr2)
       {
         return attr1.getNameOrOID().toLowerCase().compareTo(
@@ -638,9 +626,7 @@
     add(labels, comps, inlineHelps, p, gbc1);
     ChangeListener changeListener = new ChangeListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void stateChanged(ChangeEvent e)
       {
         p.setVisible(expander.isSelected());
@@ -773,9 +759,7 @@
       defaultRenderer = attributes.getAvailableList().getCellRenderer();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Component getListCellRendererComponent(JList list, Object value,
         int index, boolean isSelected, boolean cellHasFocus)
     {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
index 8265ec1..ec9b09c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
@@ -122,9 +122,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     super.setParent(parentNode, controller);
@@ -138,17 +136,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return name;
@@ -163,9 +157,7 @@
     return INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     for (JLabel label : labels)
@@ -248,25 +240,19 @@
 
     DocumentListener listener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         updateDNValue();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
index 1c25ee2..b920d47 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationalUnitPanel.java
@@ -87,9 +87,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     super.setParent(parentNode, controller);
@@ -103,33 +101,25 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getProgressDialogTitle()
   {
     return INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     for (JLabel label : labels)
@@ -220,25 +210,19 @@
 
     DocumentListener listener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         updateDNValue();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
@@ -270,9 +254,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getLDIF()
   {
     StringBuilder sb = new StringBuilder();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
index 12b8733..c6e5ba8 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
@@ -115,9 +115,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setParent(BasicNode parentNode, BrowserController controller)
   {
     super.setParent(parentNode, controller);
@@ -131,33 +129,25 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return firstName;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getProgressDialogTitle()
   {
     return INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkSyntax(ArrayList<LocalizableMessage> errors)
   {
     for (JLabel label : labels)
@@ -292,25 +282,19 @@
 
     DocumentListener listener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         updateDNValue();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         insertUpdate(ev);
@@ -327,9 +311,7 @@
     namingAttribute.setSelectedItem(NAMING_ATTRIBUTES[0]);
     namingAttribute.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         updateDNValue();
@@ -357,9 +339,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getLDIF()
   {
     StringBuilder sb = new StringBuilder();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index 2a282d6..0681fe7 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -88,25 +88,19 @@
     createBasicLayout(this, new GridBagConstraints(), false);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_NEW_VLV_INDEX_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -128,9 +122,7 @@
     backendName.setText(backend.getBackendID());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     List<LocalizableMessage> errors = checkErrors(true);
@@ -207,34 +199,26 @@
       maxBlock = Integer.parseInt(maxBlockSize.getText());
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.NEW_INDEX;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_NEW_VLV_INDEX_TASK_DESCRIPTION.get(
           indexName, backendID);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -292,9 +276,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -316,9 +298,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -407,18 +387,14 @@
       index.commit();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected String getCommandLinePath()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected ArrayList<String> getCommandLineArguments()
     {
@@ -437,9 +413,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void runTask()
     {
@@ -471,9 +445,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void postOperation()
     {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
index 47ee01b..9db29f4 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ObjectClassEditorPanel.java
@@ -126,17 +126,13 @@
         availableListModel, 0, availableListModel.getSize());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return structural;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     valueChanged = false;
@@ -152,9 +148,7 @@
     return value;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     String struct = (String)  structural.getSelectedItem();
@@ -166,17 +160,13 @@
     Utilities.getParentDialog(this).setVisible(false);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_OBJECTCLASS_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final Schema schema = ev.getNewDescriptor().getSchema();
@@ -201,9 +191,7 @@
 
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           String currentStruct = (String)structural.getSelectedItem();
@@ -267,9 +255,7 @@
           ColorAndFontConstants.defaultFont);
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           setEnabledOK(false);
@@ -289,9 +275,7 @@
     return valueChanged;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresScroll()
   {
     return false;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index 9675c4d..367c03a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -110,9 +110,7 @@
       {
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             progressPanel.appendErrorLine(msg);
@@ -124,9 +122,7 @@
     {
       public void newLine(final String msg)
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         SwingUtilities.invokeLater(new Runnable()
         {
           public void run()
@@ -175,9 +171,7 @@
     progressPanel.setSummary(text);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setEnabledClose(boolean enable)
   {
     progressPanel.closeButton.setEnabled(enable);
@@ -235,33 +229,25 @@
       createLayout();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTitle()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean requiresScroll()
     {
       return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean requiresBorder()
     {
       return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean isDisposeOnClose()
     {
       return true;
@@ -413,9 +399,7 @@
       updateVisibility(lastShowDetails);
       details.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           lastShowDetails = details.isSelected();
@@ -423,7 +407,7 @@
         }
       });
 
-//    The button panel
+      // The button panel
       gbc.gridy ++;
       gbc.weighty = 0.0;
       gbc.insets = new Insets(0, 0, 0, 0);
@@ -445,9 +429,7 @@
       closeWhenOver.setOpaque(false);
       closeWhenOver.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           closeWhenOverClicked();
@@ -474,9 +456,7 @@
       buttonsPanel.add(closeButton, gbc);
       closeButton.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           closeClicked();
@@ -538,32 +518,24 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public GenericDialog.ButtonType getButtonType()
     {
       return GenericDialog.ButtonType.NO_BUTTON;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void configurationChanged(ConfigurationChangeEvent ev)
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Component getPreferredFocusComponent()
     {
       return details;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void okClicked()
     {
       Utilities.getParentDialog(this).setVisible(false);
@@ -591,9 +563,7 @@
       {
         Thread t = new Thread(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             try
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
index 901485a..e9c11fa 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RebuildIndexPanel.java
@@ -93,17 +93,13 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void indexModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void backendIndexesModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
@@ -136,9 +132,7 @@
     baseDNs.addItemListener(listener);
     baseDNs.addItemListener(new ItemListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void itemStateChanged(ItemEvent ev)
       {
         comboBoxSelected(hmIndexes,
@@ -188,9 +182,7 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -201,25 +193,19 @@
     info.addIndexModifiedListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_REBUILD_INDEXES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return baseDNs;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     ServerDescriptor desc = ev.getNewDescriptor();
@@ -256,9 +242,7 @@
     }
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         ViewPositions pos;
@@ -295,9 +279,7 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lBaseDN);
@@ -305,9 +287,7 @@
     super.cancelClicked();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lBaseDN);
@@ -380,9 +360,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected boolean displayBackend(BackendDescriptor backend)
   {
     return !backend.isConfigBackend() &&
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
index 7a82852..1d0d40f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RefreshOptionsPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -65,9 +65,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_REFRESH_PANEL_TITLE.get();
@@ -115,32 +113,24 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.OK_CANCEL;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return period;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     isCanceled = true;
@@ -180,9 +170,7 @@
     return isCanceled;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -194,8 +182,8 @@
   }
 
   /**
-   * Returns the time specified by the user in miliseconds.
-   * @return the time specified by the user in miliseconds.
+   * Returns the time specified by the user in milliseconds.
+   * @return the time specified by the user in milliseconds.
    */
   public long getPoolingPeriod()
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
index ae3708a..ed84d8c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ResetUserPasswordPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -93,17 +93,13 @@
     packParentDialog();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return password;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     final ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
@@ -158,17 +154,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_RESET_USER_PASSWORD_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
index 280a67e..ff28dc9 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/RestorePanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -78,17 +78,13 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_RESTORE_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void backupCreated(BackupCreatedEvent ev)
   {
     boolean refreshList = false;
@@ -120,18 +116,14 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
     info.addBackupCreatedListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -140,17 +132,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         lBackupID.setVisible(!desc.isLocal());
@@ -163,13 +151,11 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void verifyBackupClicked()
   {
     LinkedHashSet<LocalizableMessage> errors = new LinkedHashSet<LocalizableMessage>();
-//  Launch the task in another progress dialog.
+    // Launch the task in another progress dialog.
     ProgressDialog dlg = new ProgressDialog(
         Utilities.createFrame(),
         Utilities.getParentDialog(this),
@@ -243,17 +229,13 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void checkOKButtonEnable()
   {
     listener.valueChanged(null);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lPath);
@@ -337,9 +319,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lPath);
@@ -348,10 +328,7 @@
     super.cancelClicked();
   }
 
-  /**
-   * The task in charge of restoring or verifying the backup.
-   *
-   */
+  /** The task in charge of restoring or verifying the backup. */
   protected class RestoreTask extends Task
   {
     private Set<String> backendSet;
@@ -392,17 +369,13 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.RESTORE;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       if (verify)
@@ -415,9 +388,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -439,9 +410,7 @@
       return canLaunch;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -502,17 +471,13 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<String>();
@@ -539,9 +504,7 @@
       return args;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return getCommandLinePath("restore");
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
index 327750c..6dc5a36 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaBrowserRightPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -109,9 +109,7 @@
     ((CardLayout)mainPanel.getLayout()).show(mainPanel, NOTHING_SELECTED);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -325,41 +323,31 @@
     add(mainPanel, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_SCHEMA_BROWSER_RIGHT_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
index 535c78e..296f1da 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SelectObjectClassesPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -93,9 +93,7 @@
 
     Comparator<ObjectClass> comparator = new Comparator<ObjectClass>()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public int compare(ObjectClass oc1, ObjectClass oc2)
       {
         return oc1.getNameOrOID().toLowerCase().compareTo(
@@ -114,25 +112,19 @@
     add(addRemove, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return addRemove;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_SUPERIOR_OBJECTCLASSES_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     isCanceled = true;
@@ -159,9 +151,7 @@
     return isCanceled;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     if (visible)
@@ -170,9 +160,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 0e93661..9fa670b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -138,12 +138,13 @@
 
   private final String CONFIRM_PASSWORD = "confirm password";
 
-  // Map containing as key the attribute name and as value a localizable
-  // message.
+  /** Map containing as key the attribute name and as value a localizable message. */
   static Map<String, LocalizableMessage> hmFriendlyAttrNames =
     new HashMap<String, LocalizableMessage>();
-  // Map containing as key an object class and as value the preferred naming
-  // attribute for the objectclass.
+  /**
+   * Map containing as key an object class and as value the preferred naming
+   * attribute for the objectclass.
+   */
   static Map<String, String> hmNameAttrNames = new HashMap<String, String>();
   static Map<String, String[]> hmOrdereredAttrNames =
     new HashMap<String, String[]>();
@@ -261,17 +262,13 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresBorder()
   {
     return false;
@@ -284,37 +281,27 @@
   {
     dropTargetListener = new DropTargetListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragEnter(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragExit(DropTargetEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dragOver(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void dropActionChanged(DropTargetDragEvent e)
       {
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void drop(DropTargetDropEvent e)
       {
         try {
@@ -392,9 +379,7 @@
     showOnlyAttrsWithValues.setSelected(displayOnlyWithAttrs);
     showOnlyAttrsWithValues.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+       /** {@inheritDoc} */
        public void actionPerformed(ActionEvent ev)
        {
          updateAttributeVisibility(!showOnlyAttrsWithValues.isSelected());
@@ -430,9 +415,7 @@
     add(scrollAttributes, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
   {
     boolean sameEntry = false;
@@ -631,9 +614,7 @@
 
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         if ((p != null) && (scrollAttributes.getViewport().contains(p)))
@@ -954,9 +935,7 @@
         pane.setValue(binaryValue, isImage);
         pane.addEditActionListener(new ActionListener()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void actionPerformed(ActionEvent ev)
           {
             if (binaryDlg == null)
@@ -1025,9 +1004,7 @@
         ocCellPanel.addEditActionListener(new ActionListener()
         {
           private ObjectClassValue newValue;
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void actionPerformed(ActionEvent ev)
           {
             if (editOcDlg == null)
@@ -1145,9 +1122,7 @@
         pane.addEditActionListener(new ActionListener()
         {
           private BinaryValue newValue;
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void actionPerformed(ActionEvent ev)
           {
             if (editBinaryDlg == null)
@@ -1190,9 +1165,7 @@
         });
         pane.addDeleteActionListener(new ActionListener()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void actionPerformed(ActionEvent ev)
           {
             pane.setValue((byte[])null, false);
@@ -1258,17 +1231,13 @@
     return isRequired;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Entry getEntry() throws OpenDsException
   {
     Entry entry = null;
@@ -1508,9 +1477,7 @@
     return mustAddBrowseButton;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected List<Object> getValues(String attrName)
   {
     List<Object> values = new ArrayList<Object>();
@@ -1546,9 +1513,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getDisplayedDN()
   {
     StringBuilder sb = new StringBuilder();
@@ -1928,25 +1893,19 @@
       comp = tf;
       tf.getDocument().addDocumentListener(new DocumentListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void insertUpdate(DocumentEvent ev)
         {
           notifyListeners();
         }
 
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void changedUpdate(DocumentEvent ev)
         {
           notifyListeners();
         }
 
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void removeUpdate(DocumentEvent ev)
         {
           notifyListeners();
@@ -1955,7 +1914,7 @@
     }
 
     /**
-     * Creats an EditorComponent using a BinaryCellPanel.
+     * Creates an EditorComponent using a BinaryCellPanel.
      * @param binaryPanel the BinaryCellPanel.
      */
     public EditorComponent(BinaryCellPanel binaryPanel)
@@ -1964,7 +1923,7 @@
     }
 
     /**
-     * Creats an EditorComponent using a ObjectClassCellPanel.
+     * Creates an EditorComponent using a ObjectClassCellPanel.
      * @param ocPanel the ObjectClassCellPanel.
      */
     public EditorComponent(ObjectClassCellPanel ocPanel)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
index 463c04a..9b1eb18 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -91,32 +91,24 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_STANDARD_ATTRIBUTE_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return requiredBy;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
@@ -220,9 +212,7 @@
       final JList list = lists[i];
       MouseAdapter clickListener = new MouseAdapter()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void mouseClicked(MouseEvent ev)
         {
           if (ev.getClickCount() == 1)
@@ -235,9 +225,7 @@
 
       KeyAdapter keyListener = new KeyAdapter()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void keyTyped(KeyEvent ev)
         {
           if ((ev.getKeyChar() == KeyEvent.VK_SPACE) ||
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
index f7159ac..87f6f35 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StatusPanel.java
@@ -80,7 +80,7 @@
 class StatusPanel extends StatusGenericPanel
 {
   private static final long serialVersionUID = -6493442314639004717L;
-  // The place holder where we display errors.
+  /** The place holder where we display errors. */
   private JEditorPane serverStatus;
   private SelectableLabelWithHelpIcon currentConnections;
   private JEditorPane hostName;
@@ -157,9 +157,7 @@
     inScrollPanel.add(Box.createVerticalGlue(), gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     if (startButton.isVisible())
@@ -173,9 +171,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresBorder()
   {
     return false;
@@ -188,17 +184,13 @@
     Utilities.updateTableSizes(connectionHandlersTable);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_STATUS_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(final ConfigurationChangeEvent ev)
   {
     if (SwingUtilities.isEventDispatchThread())
@@ -209,9 +201,7 @@
     {
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           updateContents(ev.getNewDescriptor());
@@ -220,9 +210,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
@@ -553,9 +541,7 @@
     stopButton.setOpaque(false);
     stopButton.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         stopServer();
@@ -571,9 +557,7 @@
     statusPanel.add(startButton, gbc);
     startButton.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         startServer();
@@ -586,9 +570,7 @@
     restartButton.setOpaque(false);
     restartButton.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         restartServer();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
index bf0ef27..6bd987f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SystemInformationMonitoringPanel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -75,9 +76,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return monitoringLabels.get(0);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
index b9c2dfd..2bbfa2a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -95,9 +95,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return table;
@@ -126,9 +124,7 @@
     showOnlyAttrsWithValues.setSelected(displayOnlyWithAttrs);
     showOnlyAttrsWithValues.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+       /** {@inheritDoc} */
        public void actionPerformed(ActionEvent ev)
        {
          updateAttributeVisibility();
@@ -166,9 +162,7 @@
     add(scroll, gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void update(CustomSearchResult sr, boolean isReadOnly, TreePath path)
   {
     boolean sameEntry = false;
@@ -203,17 +197,13 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Entry getEntry() throws OpenDsException
   {
     if (SwingUtilities.isEventDispatchThread())
@@ -283,9 +273,7 @@
     return sb.toString();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected String getDisplayedDN()
   {
     StringBuilder sb = new StringBuilder();
@@ -423,18 +411,13 @@
     tableModel.updateAttributeVisibility();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected List<Object> getValues(String attrName)
   {
     return tableModel.getValues(attrName);
   }
 
-  /**
-   * The table model used by the tree in the panel.
-   *
-   */
+  /** The table model used by the tree in the panel. */
   protected class LDAPEntryTableModel extends SortableTableModel
   implements Comparator<AttributeValuePair>
   {
@@ -443,7 +426,7 @@
       new ArrayList<AttributeValuePair>();
     private SortedSet<AttributeValuePair> allSortedValues =
       new TreeSet<AttributeValuePair>(this);
-    Set<String> requiredAttrs = new HashSet<String>();
+    private Set<String> requiredAttrs = new HashSet<String>();
     private final String[] COLUMN_NAMES = new String[] {
         getHeader(LocalizableMessage.raw("Attribute"), 40),
         getHeader(LocalizableMessage.raw("Value", 40))};
@@ -470,9 +453,7 @@
       fireTableDataChanged();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public int compare(AttributeValuePair desc1, AttributeValuePair desc2)
     {
       int result;
@@ -564,25 +545,19 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public int getColumnCount()
     {
       return COLUMN_NAMES.length;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public int getRowCount()
     {
       return dataArray.size();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Object getValueAt(int row, int col)
     {
       if (col == 0)
@@ -595,9 +570,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public String getColumnName(int col) {
       return COLUMN_NAMES[col];
     }
@@ -640,18 +613,14 @@
       this.sortColumn = sortColumn;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean isCellEditable(int row, int col) {
       return col != 0
           && !isReadOnly
           && !schemaReadOnlyAttributesLowerCase.contains(dataArray.get(row).attrName.toLowerCase());
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void setValueAt(Object value, int row, int col)
     {
       dataArray.get(row).value = value;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
index d122bbe..e761502 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/TaskToSchedulePanel.java
@@ -275,9 +275,7 @@
     add(Box.createVerticalGlue(), gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void toBeDisplayed(boolean visible)
   {
     // Reset the schedule and the labels
@@ -300,17 +298,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_TASK_TO_SCHEDULE_TITLE.get(taskName);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     schedule = null;
@@ -731,16 +725,12 @@
     return schedule == null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return scheduleType;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
index bf95a8d..ecaabb3 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/UnsavedChangesDialog.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -105,9 +105,7 @@
     pack();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setVisible(boolean visible)
   {
     if (visible)
@@ -177,17 +175,13 @@
       add(createButtonsPanel(), gbc);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean requiresBorder()
     {
       return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean requiresScroll()
     {
       return false;
@@ -233,9 +227,7 @@
       buttonsPanel.add(cancelButton, gbc);
       cancelButton.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.CANCEL;
@@ -251,9 +243,7 @@
       buttonsPanel.add(saveButton, gbc);
       saveButton.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           result = Result.SAVE;
@@ -267,52 +257,38 @@
       return buttonsPanel;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Component getPreferredFocusComponent()
     {
       return doNotSaveButton;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void okClicked()
     {
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTitle()
     {
       return INFO_CTRL_PANEL_UNSAVED_CHANGES_DIALOG_TITLE.get();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void configurationChanged(ConfigurationChangeEvent ev)
     {
-
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public GenericDialog.ButtonType getButtonType()
     {
       return GenericDialog.ButtonType.NO_BUTTON;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean isDisposeOnClose()
     {
       return true;
     }
   }
 }
-
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index 3fd743d..405a7c8 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -126,25 +126,19 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_VLV_INDEX_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return baseDN;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     final ServerDescriptor desc = ev.getNewDescriptor();
@@ -156,22 +150,17 @@
       INFO_CTRL_PANEL_CANNOT_CONNECT_TO_REMOTE_DETAILS.get(desc.getHostname()));
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           checkSaveButton();
-          deleteIndex.setEnabled(
-              !authenticationRequired(desc));
+          deleteIndex.setEnabled(!authenticationRequired(desc));
         }
       });
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
   }
@@ -230,9 +219,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public GenericDialog.ButtonType getButtonType()
   {
@@ -241,7 +228,6 @@
 
   /**
    * Creates the layout of the panel (but the contents are not populated here).
-   *
    */
   private void createLayout()
   {
@@ -292,9 +278,7 @@
     buttonPanel.add(deleteIndex, gbc);
     deleteIndex.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         deleteIndex();
@@ -310,9 +294,7 @@
     buttonPanel.add(saveChanges, gbc);
     saveChanges.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         saveIndex(false);
@@ -321,25 +303,19 @@
 
     DocumentListener documentListener = new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         checkSaveButton();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         checkSaveButton();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         checkSaveButton();
@@ -348,9 +324,7 @@
 
     ActionListener actionListener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         checkSaveButton();
@@ -366,25 +340,19 @@
     attributes.addActionListener(actionListener);
     sortOrder.getModel().addListDataListener(new ListDataListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void contentsChanged(ListDataEvent e)
       {
         checkSaveButton();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void intervalAdded(ListDataEvent e)
       {
         checkSaveButton();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void intervalRemoved(ListDataEvent e)
       {
         checkSaveButton();
@@ -640,34 +608,26 @@
       indexToModify = index;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.MODIFY_INDEX;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_MODIFY_VLV_INDEX_TASK_DESCRIPTION.get(
           indexName, backendID);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -745,9 +705,7 @@
         }
         SwingUtilities.invokeLater(new Runnable()
         {
-          /**
-           * {@inheritDoc}
-           */
+          /** {@inheritDoc} */
           public void run()
           {
             getProgressDialog().appendProgressHtml(
@@ -838,17 +796,13 @@
       index.commit();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       return new ArrayList<String>();
@@ -860,15 +814,10 @@
       {
         return getCommandLinePath("dsconfig");
       }
-      else
-      {
-        return null;
-      }
+      return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -890,9 +839,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void postOperation()
     {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
index aec1e7c..c5b76bc 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VerifyIndexPanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui;
@@ -109,9 +109,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setInfo(ControlPanelInfo info)
   {
     super.setInfo(info);
@@ -122,17 +120,13 @@
     info.addIndexModifiedListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void indexModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void backendIndexesModified(IndexModifiedEvent ev)
   {
     refreshContents(getInfo().getServerDescriptor());
@@ -257,9 +251,7 @@
     verifyIndexContents.setSelected(true);
     listener = new ItemListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void itemStateChanged(ItemEvent ev)
       {
         addRemove.setEnabled(verifyIndexContents.isSelected());
@@ -271,25 +263,19 @@
     listener.itemStateChanged(null);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_VERIFY_INDEXES_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return baseDNs;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     refreshContents(ev.getNewDescriptor());
@@ -301,9 +287,7 @@
     updateBaseDNComboBoxModel((DefaultComboBoxModel)baseDNs.getModel(), desc);
     SwingUtilities.invokeLater(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         ViewPositions pos;
@@ -344,9 +328,7 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void cancelClicked()
   {
     setPrimaryValid(lBaseDN);
@@ -355,9 +337,7 @@
     super.cancelClicked();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     setPrimaryValid(lBaseDN);
@@ -439,9 +419,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected boolean displayBackend(BackendDescriptor backend)
   {
     return !backend.isConfigBackend() &&
@@ -563,25 +541,19 @@
       this.baseDN = getSelectedBaseDN();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       return Type.VERIFY_INDEXES;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       return INFO_CTRL_PANEL_VERIFY_INDEX_TASK_DESCRIPTION.get(baseDN);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -608,9 +580,7 @@
       return canLaunch;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -640,9 +610,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<String>();
@@ -689,12 +657,10 @@
       return args;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return getCommandLinePath("verify-index");
     }
-  };
+  }
 }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index d854ea5..85c2a6f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -104,9 +104,7 @@
    */
   protected static boolean displayOnlyWithAttrs = true;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
@@ -167,9 +165,7 @@
     listeners.remove(listener);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean requiresBorder()
   {
     return true;
@@ -182,10 +178,7 @@
    */
   protected abstract String getDisplayedDN();
 
-  /**
-   * Notifies the entry changed listeners that the entry changed.
-   *
-   */
+  /** Notifies the entry changed listeners that the entry changed. */
   protected void notifyListeners()
   {
     if (ignoreEntryChangeEvents)
@@ -379,17 +372,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_EDIT_LDAP_ENTRY_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     Schema schema = ev.getNewDescriptor().getSchema();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
index 9588fe2..9f8b0bf 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WindowsServicePanel.java
@@ -79,9 +79,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return INFO_CTRL_PANEL_WINDOWS_SERVICE_TITLE.get();
@@ -142,9 +140,7 @@
 
     ActionListener listener = new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         updateWindowsService();
@@ -166,17 +162,13 @@
     addBottomGlue(gbc);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.CLOSE;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     if (!isWindowsServiceEnabled)
@@ -189,9 +181,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
     boolean previousValue = isWindowsServiceEnabled;
@@ -204,9 +194,7 @@
       previousLocal = isLocal;
       SwingUtilities.invokeLater(new Runnable()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void run()
         {
           lState.setText(isWindowsServiceEnabled ?
@@ -230,9 +218,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // NO ok button
@@ -305,9 +291,7 @@
       backendSet = new HashSet<String>();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Type getType()
     {
       if (enableService)
@@ -320,9 +304,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LocalizableMessage getTaskDescription()
     {
       if (enableService)
@@ -335,9 +317,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean canLaunch(Task taskToBeLaunched,
         Collection<LocalizableMessage> incompatibilityReasons)
     {
@@ -353,9 +333,7 @@
       return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void runTask()
     {
       state = State.RUNNING;
@@ -399,17 +377,13 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Set<String> getBackends()
     {
       return backendSet;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected ArrayList<String> getCommandLineArguments()
     {
       ArrayList<String> args = new ArrayList<String>();
@@ -426,12 +400,10 @@
       return args;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     protected String getCommandLinePath()
     {
       return getCommandLinePath("windows-service");
     }
-  };
+  }
 }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
index 26deb63..ca0fa69 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/WorkQueueMonitoringPanel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui;
 
@@ -74,9 +75,7 @@
     createLayout();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return monitoringLabels.get(0);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
index 40c5c97..b19781f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/AccordionElementBorder.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.border;
@@ -34,38 +35,26 @@
 
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 
-/**
- * The border specific to the accordion element.
- *
- */
+/** The border specific to the accordion element. */
 public class AccordionElementBorder implements Border
 {
   private Insets insets = new Insets(1, 1, 1, 1);
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public AccordionElementBorder() {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Insets getBorderInsets(Component c) {
     return insets;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isBorderOpaque() {
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void paintBorder(Component c, Graphics g, int x, int y, int width,
       int height) {
     g.setColor(ColorAndFontConstants.topAccordionBorderColor);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
index dadbcf0..30d9b0d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/border/SelectedCategoryBorder.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.border;
@@ -34,42 +35,29 @@
 
 import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
 
-/**
- * The border of the CategoryButton when is selected.
- *
- */
+/** The border of the CategoryButton when is selected. */
 public class SelectedCategoryBorder implements Border
 {
   private Insets insets = new Insets(5, 5, 6, 5);
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public SelectedCategoryBorder() {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Insets getBorderInsets(Component c)
   {
     return insets;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isBorderOpaque()
   {
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  public void paintBorder(Component c, Graphics g, int x, int y, int width,
-      int height)
+  /** {@inheritDoc} */
+  public void paintBorder(Component c, Graphics g, int x, int y, int width, int height)
   {
     // render shadow on bottom
     g.setColor(ColorAndFontConstants.defaultBorderColor);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
index 2c4a537..64eacd0 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -133,25 +134,19 @@
 
     ListDataListener listDataListener = new ListDataListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void intervalRemoved(ListDataEvent ev)
       {
         updateButtonEnabling();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void intervalAdded(ListDataEvent ev)
       {
         updateButtonEnabling();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void contentsChanged(ListDataEvent ev)
       {
         updateButtonEnabling();
@@ -159,9 +154,7 @@
     };
     MouseAdapter doubleClickListener = new MouseAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseClicked(MouseEvent e) {
         if (isEnabled() && (e.getClickCount() == 2))
         {
@@ -226,9 +219,7 @@
     add.setOpaque(false);
     add.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         addClicked();
@@ -244,9 +235,7 @@
       addAll.setOpaque(false);
       addAll.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           selectedListModel.addAll(availableListModel.getData());
@@ -266,9 +255,7 @@
     remove.setOpaque(false);
     remove.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         removeClicked();
@@ -285,9 +272,7 @@
       removeAll.setOpaque(false);
       removeAll.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           availableListModel.addAll(selectedListModel.getData());
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
index d6207d1..d718c5e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/BinaryCellPanel.java
@@ -335,9 +335,7 @@
     deleteButton.removeActionListener(listener);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
       int condition, boolean pressed)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
index 24f8f1b..536eb80 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryButton.java
@@ -95,9 +95,7 @@
     setFont(ColorAndFontConstants.categoryFont);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void updateUI()
   {
     super.updateUI();
@@ -105,9 +103,7 @@
     setBorder(isSelected() ? buttonSelectedBorder : buttonUnselectedBorder);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void paintComponent(Graphics g) {
     setBackground(backgroundColor);
     g.setColor(backgroundColor);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
index e127043..619fd52 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CategoryPanel.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -127,9 +128,7 @@
     return expanded;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setForeground(Color foreground)
   {
     super.setForeground(foreground);
@@ -139,16 +138,10 @@
     }
   }
 
-
-  /**
-   * The custom listener used to display the child component.
-   *
-   */
+  /** The custom listener used to display the child component. */
   private class CollapseListener implements ChangeListener
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void stateChanged(ChangeEvent event) {
       setExpanded(expandButton.isSelected());
     }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
index 5a821d1..d4559c2 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CellEditorButton.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -37,7 +37,6 @@
 /**
  * This is a simple extension of the JButton class used to be able to invoke
  * the method processKeyBinding.
- *
  */
 public class CellEditorButton extends JButton
 {
@@ -52,12 +51,10 @@
     super(label.toString());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean processKeyBinding(KeyStroke ks, KeyEvent e,
       int condition, boolean pressed)
   {
     return super.processKeyBinding(ks, e, condition, pressed);
   }
-}
\ No newline at end of file
+}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
index 76a6b57..03b997a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
@@ -69,9 +69,7 @@
     MOUSE_PRESSED, MOUSE_CLICKED, MOUSE_RELEASED
   };
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void paintComponent(Graphics g)
   {
     int[] selectedRows = getSelectionRows();
@@ -88,16 +86,7 @@
     for ( int i = 0; i < nRows; i++)
     {
       int rowHeight = getRowBounds( i ).height;
-      boolean isSelected = false;
-      for (int j=0; j<selectedRows.length; j++)
-      {
-        if (selectedRows[j] == i)
-        {
-          isSelected = true;
-          break;
-        }
-      }
-      if (isSelected)
+      if (isRowSelected(selectedRows, i))
       {
         g.setColor(TreeCellRenderer.selectionBackground);
       }
@@ -121,6 +110,18 @@
     setOpaque(isOpaque);
   }
 
+  private boolean isRowSelected(int[] selectedRows, int i)
+  {
+    for (int j=0; j<selectedRows.length; j++)
+    {
+      if (selectedRows[j] == i)
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * Sets a popup menu that will be displayed when the user clicks on the tree.
    * @param popMenu the popup menu.
@@ -130,10 +131,7 @@
     this.popupMenu = popMenu;
   }
 
-  /**
-   * Default constructor.
-   *
-   */
+  /** Default constructor. */
   public CustomTree()
   {
     putClientProperty("JTree.lineStyle", "Angled");
@@ -143,9 +141,7 @@
     MouseListener mouseListener = new MouseAdapter()
     {
       private boolean ignoreEvents;
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mousePressed(MouseEvent ev)
       {
         if (ignoreEvents)
@@ -194,9 +190,7 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseReleased(MouseEvent ev)
       {
         if (ignoreEvents)
@@ -219,9 +213,7 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseClicked(MouseEvent ev)
       {
         if (ignoreEvents)
@@ -300,9 +292,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void addMouseListener(MouseListener mouseListener)
   {
     super.addMouseListener(mouseListener);
@@ -313,9 +303,7 @@
     mouseListeners.add(mouseListener);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void removeMouseListener(MouseListener mouseListener)
   {
     super.removeMouseListener(mouseListener);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
index fc28c2f..f73e253 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
@@ -145,25 +145,19 @@
 
     ListDataListener listDataListener = new ListDataListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void intervalRemoved(ListDataEvent ev)
       {
         listSelectionChanged();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void intervalAdded(ListDataEvent ev)
       {
         listSelectionChanged();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void contentsChanged(ListDataEvent ev)
       {
         listSelectionChanged();
@@ -171,9 +165,7 @@
     };
     MouseAdapter doubleClickListener = new MouseAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseClicked(MouseEvent e) {
         if (isEnabled() && (e.getClickCount() == 2))
         {
@@ -252,9 +244,7 @@
     add1.setOpaque(false);
     add1.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         add1Clicked();
@@ -302,9 +292,7 @@
       removeAll1.setOpaque(false);
       removeAll1.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(selectedListModel1, availableListModel);
@@ -333,9 +321,7 @@
     add2.setOpaque(false);
     add2.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         add2Clicked();
@@ -352,9 +338,7 @@
       addAll2.setOpaque(false);
       addAll2.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(availableListModel, selectedListModel2);
@@ -369,9 +353,7 @@
     remove2.setOpaque(false);
     remove2.addActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         remove2Clicked();
@@ -389,9 +371,7 @@
       removeAll2.setOpaque(false);
       removeAll2.addActionListener(new ActionListener()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public void actionPerformed(ActionEvent ev)
         {
           moveAll(selectedListModel2, availableListModel);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
index 998e05f..79cd3f5 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/FilterTextField.java
@@ -99,17 +99,13 @@
     constructorBorderSet = true;
     getDocument().addDocumentListener(new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent e)
       {
         insertUpdate(e);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent e)
       {
         boolean displayIcon = getText().length() > 0;
@@ -127,9 +123,7 @@
 
     addMouseListener(new MouseAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mousePressed(MouseEvent ev)
       {
         boolean p = getClearIconRectangle().contains(ev.getPoint());
@@ -140,9 +134,7 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void mouseReleased(MouseEvent ev)
       {
         if (mousePressed && getClearIconRectangle().contains(ev.getPoint()))
@@ -174,9 +166,7 @@
     listeners.remove(listener);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void setBorder(Border border)
   {
     if (constructorBorderSet && border != null)
@@ -276,9 +266,7 @@
    */
   private class IconBorder implements Border
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public Insets getBorderInsets(Component c)
     {
       ImageIcon icon = getClearIcon();
@@ -294,9 +282,7 @@
       return new Insets(0, 0, 0, rightInsets);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void paintBorder(Component c, Graphics g, int x, int y,
         int width, int height)
     {
@@ -323,9 +309,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public boolean isBorderOpaque()
     {
       return false;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
index fa77e6d..5311d58 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/LabelWithHelpIcon.java
@@ -196,9 +196,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getToolTipText(MouseEvent ev)
   {
     int x = ev.getPoint().x;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
index 7e96d73..c1b18ad 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/NumericLimitedSizeDocumentFilter.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -50,9 +51,7 @@
     this.maxSize = maxSize;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void insertString(DocumentFilter.FilterBypass fb, int offset,
       String text, AttributeSet attr)
   throws BadLocationException
@@ -84,9 +83,7 @@
     updateCaretPosition(fb);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void replace(DocumentFilter.FilterBypass fb, int offset,
       int length, String text, AttributeSet attr)
   throws BadLocationException
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
index 9f5a0ef..b4d60fb 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/ObjectClassCellPanel.java
@@ -173,9 +173,7 @@
     editButton.setVisible(visible);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected boolean processKeyBinding(KeyStroke ks, KeyEvent e,
       int condition, boolean pressed)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
index 84feeca..2d3ab6e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SelectableLabelWithHelpIcon.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -185,9 +185,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getToolTipText(MouseEvent ev)
   {
     int x = ev.getPoint().x;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
index 735eb94..8801763 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/SuperiorObjectClassesEditor.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -145,9 +146,7 @@
     singleSuperior.setRenderer(renderer);
     ItemListener itemListener = new ItemListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void itemStateChanged(ItemEvent ev)
       {
         notifyListeners();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
index e541cb1..6d0c27f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TimeDocumentFilter.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.components;
 
@@ -47,9 +48,7 @@
     this.tf = tf;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void insertString(DocumentFilter.FilterBypass fb, int offset,
       String text, AttributeSet attr)
   throws BadLocationException
@@ -59,9 +58,7 @@
     trimPosition(fb, text, offset, previousLength);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void remove(DocumentFilter.FilterBypass fb, int offset,
       int length)
   throws BadLocationException
@@ -87,9 +84,7 @@
     updateCaretPosition(fb);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void replace(DocumentFilter.FilterBypass fb, int offset,
       int length, String text, AttributeSet attr)
   throws BadLocationException
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
index 9a29d0f..9fa5cce 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/TreePanel.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.components;
@@ -89,43 +89,32 @@
     return tree;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void okClicked()
   {
     // No ok button
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public GenericDialog.ButtonType getButtonType()
   {
     return GenericDialog.ButtonType.NO_BUTTON;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LocalizableMessage getTitle()
   {
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getPreferredFocusComponent()
   {
     return tree;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void configurationChanged(ConfigurationChangeEvent ev)
   {
   }
 }
-
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
index abc3f25..7ab22ed 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
@@ -22,8 +22,8 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
-
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -31,7 +31,6 @@
 /**
  * Abstract class with some common methods for all the nodes in the
  * 'Manage Index' tree.
- *
  */
 public abstract class AbstractIndexTreeNode extends DefaultMutableTreeNode
 {
@@ -48,24 +47,24 @@
   }
 
   /**
-   * {@inheritDoc}
+   * Returns the name.
+   *
+   * @return the name
    */
   public String getName()
   {
     return name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public boolean isRoot()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public boolean isLeaf()
   {
     return true;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
index a44e970..c6d0b71 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BasicNode.java
@@ -57,8 +57,10 @@
   private String[] referral;
   private int numSubOrdinates;
 
-  // This is required for the case where there is an undefined number of
-  // subordinates (for instance in the case of the changelog).
+  /**
+   * This is required for the case where there is an undefined number of
+   * subordinates (for instance in the case of the changelog).
+   */
   private boolean hasSubOrdinates;
 
   private String displayName;
@@ -320,9 +322,7 @@
   /**
    * Rendering
    */
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String toString() {
     return getDisplayName();
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
index 016c743..09cf144 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/BrowserNodeInfo.java
@@ -153,21 +153,13 @@
   /**
    * Error types
    */
-  /**
-   * No error happened.
-   */
+  /** No error happened. */
   int ERROR_NONE          = 0;
-  /**
-   * And error reading the entry occurred.
-   */
+  /** And error reading the entry occurred. */
   int ERROR_READING_ENTRY     = 1;
-  /**
-   * An error following referrals occurred.
-   */
+  /** An error following referrals occurred. */
   int ERROR_SOLVING_REFERRAL    = 2;
-  /**
-   * An error occurred searching the children of the entry.
-   */
+  /** An error occurred searching the children of the entry. */
   int ERROR_SEARCHING_CHILDREN  = 3;
 
 }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
index 89a6b4e..94f3427 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/CategoryTreeNode.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -50,17 +50,13 @@
     super(name);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isRoot()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isLeaf()
   {
     return getChildCount() == 0;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
index 9531284..69f944a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/DndBrowserNodes.java
@@ -24,7 +24,6 @@
  *      Copyright 2008 Sun Microsystems, Inc.
  *      Portions Copyright 2015 ForgeRock AS
  */
-
 package org.opends.guitools.controlpanel.ui.nodes;
 
 import java.awt.Component;
@@ -38,13 +37,9 @@
  * drag and drop.  Currently drag and drop is used for instance to drag a
  * number of entries from a browser and drop them in the list of members of
  * a group.
- *
  */
-
 public class DndBrowserNodes implements Transferable {
-  /**
-   * The data flavor managed by this transferable.
-   */
+  /** The data flavor managed by this transferable. */
   public static final DataFlavor INFO_FLAVOR =
     new DataFlavor(BrowserNodeInfo.class, "Browse Node Information");
 
@@ -52,34 +47,32 @@
 
   private BrowserNodeInfo[] nodes;
 
-  private Component parent; // The component that contains the nodes
+  /** The component that contains the nodes. */
+  private Component parent;
 
   /**
    * Transferable implementation
    * ============================================
    */
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public boolean isDataFlavorSupported(DataFlavor df) {
     return df.equals(INFO_FLAVOR);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public Object getTransferData(DataFlavor df)
   throws UnsupportedFlavorException, IOException {
-    if (df.equals(INFO_FLAVOR)) {
-      return this;
+    if (!isDataFlavorSupported(df)) {
+      throw new UnsupportedFlavorException(df);
     }
-    else throw new UnsupportedFlavorException(df);
+    return this;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public DataFlavor[] getTransferDataFlavors() {
     return FLAVORS;
   }
@@ -123,4 +116,3 @@
     this.parent = parent;
   }
 }
-
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
index 44b6789..8d39bfa 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/GeneralMonitoringTreeNode.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.nodes;
 
@@ -73,17 +74,13 @@
     return identifier;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isRoot()
   {
     return isRoot;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isLeaf()
   {
     return getChildCount() == 0;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
index 6782cf8..f81a3ac 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.nodes;
@@ -70,17 +71,13 @@
     return schemaElement;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isRoot()
   {
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isLeaf()
   {
     return true;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
index 8014024..0f0f21f 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AccessibleTableHeaderRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.renderer;
 
@@ -38,6 +39,7 @@
 public class AccessibleTableHeaderRenderer implements TableCellRenderer
 {
   private TableCellRenderer renderer;
+
   /**
    * Constructor of the renderer.
    * @param renderer the renderer to be used as base.
@@ -46,9 +48,8 @@
   {
     this.renderer = renderer;
   }
-  /**
-   * {@inheritDoc}
-   */
+
+  /** {@inheritDoc} */
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column)
   {
@@ -58,5 +59,4 @@
         Utilities.stripHtmlToSingleLine(String.valueOf(value)));
     return comp;
   }
-
 }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
index 56533bd..29aa177 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/AttributeCellEditor.java
@@ -97,9 +97,7 @@
     textField = Utilities.createTextField();
     textField.getDocument().addDocumentListener(new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         if (!textField.hasFocus())
@@ -108,17 +106,13 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -127,9 +121,7 @@
     passwordField = Utilities.createPasswordField();
     passwordField.getDocument().addDocumentListener(new DocumentListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void changedUpdate(DocumentEvent ev)
       {
         if (!passwordField.hasFocus())
@@ -138,17 +130,13 @@
         }
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void insertUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void removeUpdate(DocumentEvent ev)
       {
         changedUpdate(ev);
@@ -159,9 +147,7 @@
     binaryPanel = new BinaryCellPanel();
     binaryPanel.addEditActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent e)
       {
         if (editBinaryDlg == null)
@@ -208,9 +194,7 @@
     ocPanel = new ObjectClassCellPanel();
     ocPanel.addEditActionListener(new ActionListener()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void actionPerformed(ActionEvent ev)
       {
         if (editOcDlg == null)
@@ -240,9 +224,7 @@
     });
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTableCellEditorComponent(JTable table, Object value,
                    boolean isSelected, int row, int column)
   {
@@ -305,9 +287,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Object getCellEditorValue()
   {
     if (binaryValue != null)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
index 3ad53c1..b87b63a 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BackupTableCellRenderer.java
@@ -79,9 +79,7 @@
     this.backupParentPath = backupParentPath;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
index d069dd9..7ce4601 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BaseDNCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -48,9 +49,7 @@
     super();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column) {
     String text = (String)value;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
index 8ace788..5d9bba4 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/BrowserCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -61,9 +62,7 @@
     inspectedNode = node;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTreeCellRendererComponent(
       JTree tree,
       Object value,
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
index 65b9dc9..a1ca450 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomCellRenderer.java
@@ -76,9 +76,7 @@
     setForeground(ColorAndFontConstants.treeForeground);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column) {
     if (value instanceof String)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
index 49a594b7..3507187 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/CustomListCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -93,9 +94,7 @@
     ((JPanel)separator).setBorder(new EmptyBorder(5, 3, 5, 3));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
index da9266f..5a495ca 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/IndexCellRenderer.java
@@ -57,9 +57,7 @@
     this.info = info;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
index 390dc93..12121bd 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
@@ -76,9 +76,7 @@
 
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column) {
     if (isRequired(table, row, column))
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
index 17f0904..f750695 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/NoLeftInsetCategoryComboBoxRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.ui.renderer;
 
@@ -50,9 +51,7 @@
     super(combo);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
@@ -67,4 +66,4 @@
     comp.setFont(defaultFont);
     return comp;
   }
-}
\ No newline at end of file
+}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 5a7d7f7..b779dbe 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -62,9 +62,7 @@
     super(list);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
index 7357342..1ba80ee 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/SelectableTableCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -69,26 +70,23 @@
   {
     MouseAdapter mouseListener = new MouseAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mousePressed(MouseEvent ev)
       {
         isBeingPressed = true;
         table.repaint();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mouseReleased(MouseEvent ev)
       {
         isBeingPressed = false;
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mouseExited(MouseEvent ev)
       {
         hasMouseOver = false;
@@ -96,9 +94,8 @@
         table.repaint();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mouseEntered(MouseEvent ev)
       {
         if (ev.getSource() == table)
@@ -114,18 +111,16 @@
     };
     MouseMotionAdapter mouseMotionAdapter = new MouseMotionAdapter()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mouseMoved(MouseEvent ev)
       {
         lastRowMouseOver = table.rowAtPoint(ev.getPoint());
         table.repaint();
       }
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
+      @Override
       public void mouseDragged(MouseEvent ev)
       {
         lastRowMouseOver = -1;
@@ -136,9 +131,8 @@
     table.addMouseMotionListener(mouseMotionAdapter);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object value,
       boolean isSelected, boolean hasFocus, int row, int column)
   {
@@ -148,10 +142,7 @@
     return this;
   }
 
-  /**
-   * {@inheritDoc}
-   */
-  protected void updateComponent(Component comp, JTable table, int row,
+  void updateComponent(Component comp, JTable table, int row,
       int column, boolean isSelected)
   {
     if (table.isCellEditable(row, column) && !isSelected)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
index 3eca817..abb9f1d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TaskCellRenderer.java
@@ -67,9 +67,7 @@
     setForeground(ColorAndFontConstants.treeForeground);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   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-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
index 0a04ea1..0bf8d22 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/TreeCellRenderer.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.ui.renderer;
@@ -79,9 +80,7 @@
     setFont(ColorAndFontConstants.treeFont);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getTreeCellRendererComponent(JTree tree, Object value,
       boolean isSelected, boolean isExpanded, boolean isLeaf, int row,
       boolean hasFocus)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
index af46758..23dbfc6 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/VLVSortOrderRenderer.java
@@ -54,9 +54,7 @@
     this.defaultRenderer = list.getCellRenderer();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public Component getListCellRendererComponent(JList list, Object value,
       int index, boolean isSelected, boolean cellHasFocus)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
index c5a9de9..ad5e6b2 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ApplicationPrintStream.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -57,9 +57,7 @@
     super(new ByteArrayOutputStream(), true);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void println(String msg)
   {
@@ -67,9 +65,7 @@
     logger.info(LocalizableMessage.raw(msg));
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void write(byte[] b, int off, int len)
   {
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
index 2d69927..0f4130d 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BackgroundTaskThread.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -31,17 +32,13 @@
 /**
 * This class defines a thread that will be used to actually perform the
 * processing for a background task.
-* @param <T> type of object returned by the background task fed to this
-* object
+* @param <T> type of object returned by the background task fed to this object
 */
-class BackgroundTaskThread<T>
-     extends Thread
+class BackgroundTaskThread<T> extends Thread
 {
- // The background task that is to be processed.
+ /** The background task that is to be processed. */
  private final BackgroundTask<T> backgroundTask;
 
-
-
  /**
   * Creates a new background task thread that will be used to process the
   * provided task.
@@ -53,9 +50,7 @@
    this.backgroundTask = backgroundTask;
  }
 
- /**
-  * Performs the processing associated with the background task.
-  */
+ /** Performs the processing associated with the background task. */
  public void run()
  {
    try
@@ -63,9 +58,7 @@
      final T returnValue = backgroundTask.processBackgroundTask();
      SwingUtilities.invokeLater(new Runnable()
      {
-       /**
-        * {@inheritDoc}
-        */
+       /** {@inheritDoc} */
        public void run()
        {
          backgroundTask.backgroundTaskCompleted(returnValue, null);
@@ -78,9 +71,7 @@
      {
        SwingUtilities.invokeLater(new Runnable()
        {
-         /**
-          * {@inheritDoc}
-          */
+         /** {@inheritDoc} */
          public void run()
          {
            backgroundTask.backgroundTaskCompleted(null, t);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
index f028d17..f6df8b3 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/BlindApplicationTrustManager.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.util;
 
@@ -45,25 +46,19 @@
     super(null);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void checkClientTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void checkServerTrusted(X509Certificate[] chain, String authType)
   throws CertificateException
   {
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public X509Certificate[] getAcceptedIssuers()
   {
     return new X509Certificate[0];
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
index 1ec0716..bd579f7 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LDAPEntryReader.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -66,9 +67,7 @@
     this.notifyListeners = true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public CustomSearchResult processBackgroundTask() throws Throwable
   {
@@ -106,9 +105,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void backgroundTaskCompleted(CustomSearchResult sr,
       Throwable throwable)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
index 8d7f431..8743d0e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/LowerCaseComparator.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -29,18 +30,15 @@
 import java.util.Comparator;
 
 /**
- * Class used to compare Strings without take into account the case.  It can
- * be used to sort Strings in TreeSets for instance.
- *
+ * Class used to compare Strings without taking into account the case.
+ * It can be used to sort Strings in TreeSets for instance.
  */
 public class LowerCaseComparator implements Comparator<String>
 {
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int compare(String s1, String s2)
   {
-    if ((s1 != null) && (s2 != null))
+    if (s1 != null && s2 != null)
     {
       return s1.toLowerCase().compareTo(s2.toLowerCase());
     }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
index fec61f4..66ab52b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ProcessReader.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 
 package org.opends.guitools.controlpanel.util;
@@ -67,9 +68,7 @@
 
     readerThread = new Thread(new Runnable()
     {
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       public void run()
       {
         String line;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
index 20b35cf..d4266c0 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -79,10 +79,10 @@
   /** The reference to the configuration root entry. */
   private ConfigEntry configRootEntry;
 
-  /** The server root */
+  /** The server root. */
   private String serverRoot;
 
-  /** The instance root */
+  /** The instance root. */
   private String instanceRoot;
 
   private DN[] baseDNs;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
index 2d37736..fb92b68 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -146,9 +146,7 @@
       }
       FileFilter ldifFiles = new FileFilter()
       {
-        /**
-         * {@inheritDoc}
-         */
+        /** {@inheritDoc} */
         public boolean accept(File f)
         {
           boolean accept = false;
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
index eddc537..8a9cdd3 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -104,9 +104,7 @@
     initializeParser();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void launch() {
     //  Validate user provided data
     try
@@ -158,9 +156,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected void guiLaunchFailed(String logFilePath) {
     if (logFilePath != null)
     {
@@ -173,32 +169,24 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ArgumentParser getArgumentParser() {
     return this.argParser;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   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}
-   */
+  /** {@inheritDoc} */
   protected CliApplication createCliApplication() {
     return new Uninstaller();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   protected LocalizableMessage getFrameTitle() {
     return Utils.getCustomizedObject("INFO_FRAME_UNINSTALL_TITLE",
         INFO_FRAME_UNINSTALL_TITLE.get(DynamicConstants.PRODUCT_NAME),
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
index 6d8a94b..333f0fd 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallProgressStep.java
@@ -22,80 +22,41 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
-
 package org.opends.guitools.uninstaller;
 
 import org.opends.quicksetup.ProgressStep;
 
-/**
- * Enumeration of steps for an uninstall process.
- */
+/** Enumeration of steps for an uninstall process. */
 public enum UninstallProgressStep implements ProgressStep {
 
-  /**
-   * Uninstall not started.
-   */
+  /** Uninstall not started. */
   NOT_STARTED,
-
-  /**
-   * Unconfiguring replication in remote servers.
-   */
+  /** Unconfiguring replication in remote servers. */
   UNCONFIGURING_REPLICATION,
-
-  /**
-   * Stopping server.
-   */
+  /** Stopping server. */
   STOPPING_SERVER,
-
-  /**
-   * Disabling Windows Service.
-   */
+  /** Disabling Windows Service. */
   DISABLING_WINDOWS_SERVICE,
-
-  /**
-   * Removing External Database files.
-   */
+  /** Removing External Database files. */
   DELETING_EXTERNAL_DATABASE_FILES,
-
-  /**
-   * Removing External Log files.
-   */
+  /** Removing External Log files. */
   DELETING_EXTERNAL_LOG_FILES,
-
-  /**
-   * Removing external references.
-   */
+  /** Removing external references. */
   REMOVING_EXTERNAL_REFERENCES,
-
-  /**
-   * Removing installation files.
-   */
+  /** Removing installation files. */
   DELETING_INSTALLATION_FILES,
-
-  /**
-   * Installation finished successfully.
-   */
+  /** Installation finished successfully. */
   FINISHED_SUCCESSFULLY,
-
-  /**
-   * Installation finished with a non critical error updating remote servers.
-   */
+  /** Installation finished with a non critical error updating remote servers. */
   FINISHED_WITH_ERROR_ON_REMOTE,
-
-  /**
-   * Installation finished but not all the files could be deleted.
-   */
+  /** Installation finished but not all the files could be deleted. */
   FINISHED_WITH_ERROR_DELETING,
-
-  /**
-   * Installation finished with an error.
-   */
+  /** Installation finished with an error. */
   FINISHED_WITH_ERROR;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isLast() {
     return this == FINISHED_SUCCESSFULLY ||
     this == FINISHED_WITH_ERROR ||
@@ -103,9 +64,7 @@
     this == FINISHED_WITH_ERROR_DELETING;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isError() {
     return this.equals(FINISHED_WITH_ERROR);
   }
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
index 47eae32..52d2066 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
@@ -79,13 +79,10 @@
     super(application);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Object getFieldValue(FieldName fieldName)
   {
-    Object value;
     switch (fieldName)
     {
     case EXTERNAL_DB_DIRECTORIES:
@@ -95,8 +92,7 @@
       {
         s1.addAll(outsideDbs);
       }
-      value = s1;
-      break;
+      return s1;
 
     case EXTERNAL_LOG_FILES:
       Set<String> s2 = new HashSet<String>();
@@ -105,28 +101,21 @@
       {
         s2.addAll(outsideLogs);
       }
-      value = s2;
-      break;
+      return s2;
     default:
       JCheckBox cb = getCheckBox(fieldName);
-      value = cb.isSelected();
-      break;
+      return cb.isSelected();
     }
-    return value;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getTitle()
   {
     return INFO_CONFIRM_UNINSTALL_PANEL_TITLE.get();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected Component createInputPanel()
   {
@@ -249,9 +238,7 @@
     return panel;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected LocalizableMessage getInstructions()
   {

--
Gitblit v1.10.0