opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -14,7 +14,6 @@ * Copyright 2008-2009 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -32,9 +31,6 @@ import java.util.Set; import java.util.TreeSet; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import javax.swing.ButtonGroup; import javax.swing.DefaultComboBoxModel; import javax.swing.JCheckBox; @@ -48,6 +44,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.guitools.controlpanel.datamodel.BackendDescriptor; import org.opends.guitools.controlpanel.datamodel.BackupDescriptor; import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo; @@ -443,9 +441,9 @@ }; setEnabledOK(false); setEnabledCancel(false); for (int i=0; i<components.length; i++) for (JComponent component : components) { components[i].setEnabled(false); component.setEnabled(false); } final String id = backupID.getText(); final String path = parentDirectory.getText(); @@ -512,12 +510,11 @@ return null; } @Override public void backgroundTaskCompleted(Void returnValue, Throwable t) public void backgroundTaskCompleted(Void returnValue, Throwable t) { for (int i=0; i<components.length; i++) for (JComponent component : components) { components[i].setEnabled(true); component.setEnabled(true); } setEnabledOK(true); setEnabledCancel(true); opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/MainActionsPane.java
@@ -37,13 +37,13 @@ import javax.swing.ButtonGroup; import javax.swing.JPanel; import org.forgerock.i18n.LocalizableMessage; import org.opends.guitools.controlpanel.datamodel.Action; import org.opends.guitools.controlpanel.datamodel.Category; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; import org.opends.guitools.controlpanel.ui.components.ActionButton; import org.opends.guitools.controlpanel.ui.components.CategoryPanel; import org.opends.guitools.controlpanel.util.Utilities; import org.forgerock.i18n.LocalizableMessage; /** * The panel on the left side of the main Control Center dialog. It contains @@ -261,19 +261,18 @@ classes.add(WindowsServicePanel.class); } int classIndex = 0; for (int i=0; i<labels.length; i++) for (LocalizableMessage[] label : labels) { Category category = new Category(); category.setName(labels[i][0]); for (int j=1; j<labels[i].length; j++) category.setName(label[0]); for (int j = 1; j < label.length; j++) { Action action = new Action(); action.setName(labels[i][j]); action.setName(label[j]); action.setAssociatedPanel(classes.get(classIndex)); classIndex ++; category.getActions().add(action); } categories.add(category); } @@ -375,7 +374,6 @@ return null; } @Override public void configurationChanged(ConfigurationChangeEvent ev) { opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/AddRemovePanel.java
@@ -28,6 +28,7 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.List; import javax.swing.Box; import javax.swing.JButton; @@ -230,10 +231,8 @@ { selectedListModel.addAll(availableListModel.getData()); availableListModel.clear(); selectedListModel.fireContentsChanged(selectedListModel, 0, selectedListModel.getSize()); availableListModel.fireContentsChanged(availableListModel, 0, availableListModel.getSize()); fireContentsChanged(selectedListModel); fireContentsChanged(availableListModel); } }); gbc.gridy ++; @@ -267,10 +266,8 @@ { availableListModel.addAll(selectedListModel.getData()); selectedListModel.clear(); selectedListModel.fireContentsChanged(selectedListModel, 0, selectedListModel.getSize()); availableListModel.fireContentsChanged(availableListModel, 0, availableListModel.getSize()); fireContentsChanged(selectedListModel); fireContentsChanged(availableListModel); } }); gbc.gridy ++; @@ -417,33 +414,32 @@ private void addClicked() { @SuppressWarnings("deprecation") Object[] selectedObjects = availableList.getSelectedValues(); for (int i=0; i<selectedObjects.length; i++) List<?> selectedObjects = availableList.getSelectedValuesList(); for (Object selectedObject : selectedObjects) { T value = AddRemovePanel.this.theClass.cast(selectedObjects[i]); T value = AddRemovePanel.this.theClass.cast(selectedObject); selectedListModel.add(value); availableListModel.remove(value); } selectedListModel.fireContentsChanged(selectedListModel, 0, selectedListModel.getSize()); availableListModel.fireContentsChanged(availableListModel, 0, availableListModel.getSize()); fireContentsChanged(selectedListModel); fireContentsChanged(availableListModel); } private void removeClicked() { @SuppressWarnings("deprecation") Object[] selectedObjects = selectedList.getSelectedValues(); for (int i=0; i<selectedObjects.length; i++) List<?> selectedObjects = selectedList.getSelectedValuesList(); for (Object selectedObject : selectedObjects) { T value = AddRemovePanel.this.theClass.cast(selectedObjects[i]); T value = AddRemovePanel.this.theClass.cast(selectedObject); availableListModel.add(value); selectedListModel.remove(value); } selectedListModel.fireContentsChanged(selectedListModel, 0, selectedListModel.getSize()); availableListModel.fireContentsChanged(availableListModel, 0, availableListModel.getSize()); fireContentsChanged(selectedListModel); fireContentsChanged(availableListModel); } private void fireContentsChanged(SortableListModel<T> listModel) { listModel.fireContentsChanged(listModel, 0, listModel.getSize()); } } opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
@@ -14,7 +14,6 @@ * Copyright 2008 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui.components; import static com.forgerock.opendj.util.OperatingSystem.isMacOS; @@ -98,9 +97,9 @@ private boolean isRowSelected(int[] selectedRows, int i) { for (int j=0; j<selectedRows.length; j++) for (int selectedRow : selectedRows) { if (selectedRows[j] == i) if (selectedRow == i) { return true; } opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
@@ -36,6 +36,7 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ListModel; import javax.swing.ListSelectionModel; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; @@ -557,15 +558,13 @@ int[] indexes = list.getSelectedIndices(); if (indexes != null) { for (int i=0; i<indexes.length; i++) for (int index : indexes) { // This check is necessary since the selection model might not // be in sync with the list model. if (indexes[i] < list.getModel().getSize() && list.getModel().getElementAt(indexes[i]).equals(element)) if (selectionAndListModelAreInSync(list, element, index)) { list.getSelectionModel().removeIndexInterval(indexes[i], indexes[i]); list.getSelectionModel().removeIndexInterval(index, index); } } } @@ -593,6 +592,13 @@ } } private boolean selectionAndListModelAreInSync(JList<T> list, T element, int index) { final ListModel<T> listModel = list.getModel(); return index < listModel.getSize() && listModel.getElementAt(index).equals(element); } private boolean isEnabled(JList<T> list, SortableListModel<T> model) { int index = list.getSelectedIndex(); opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/Uninstaller.java
@@ -979,7 +979,7 @@ @Override public QuickSetupStepPanel createWizardStepPanel(WizardStep step) { if (step == Step.CONFIRM_UNINSTALL) { return new ConfirmUninstallPanel(this, installStatus); return new ConfirmUninstallPanel(this); } else if (step == Step.PROGRESS) { return new ProgressPanel(this); } else if (step == Step.FINISHED) { opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
@@ -17,28 +17,34 @@ package org.opends.guitools.uninstaller.ui; import org.opends.quicksetup.CurrentInstallStatus; import org.opends.quicksetup.Installation; import static org.opends.messages.AdminToolMessages.*; import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Set; import javax.swing.Box; import javax.swing.DefaultListModel; import javax.swing.JCheckBox; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.border.EmptyBorder; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import org.opends.quicksetup.Configuration; import org.opends.quicksetup.Installation; import org.opends.quicksetup.ui.FieldName; import org.opends.quicksetup.ui.GuiApplication; import org.opends.quicksetup.ui.QuickSetupStepPanel; import org.opends.quicksetup.ui.UIFactory; import org.opends.quicksetup.util.Utils; import javax.swing.*; import javax.swing.border.EmptyBorder; import java.awt.*; import java.util.HashMap; import java.util.HashSet; import java.util.Set; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.slf4j.LocalizedLogger; import java.io.IOException; import static org.opends.messages.AdminToolMessages.*; /** * This is the panel displayed when the user is uninstalling Open DS. It is * basically a panel with the text informing of the consequences of uninstalling @@ -58,10 +64,8 @@ /** * The constructor of this class. * @param application Application this panel represents * @param installStatus the object describing the current installation status. */ public ConfirmUninstallPanel(GuiApplication application, CurrentInstallStatus installStatus) public ConfirmUninstallPanel(GuiApplication application) { super(application); } @@ -169,14 +173,14 @@ FieldName.REMOVE_LDIFS }; for (int i=0; i<names.length; i++) for (FieldName fieldName : names) { gbc.gridwidth = GridBagConstraints.RELATIVE; p.add(Box.createHorizontalGlue(), gbc); gbc.insets.left = 0; gbc.gridwidth = GridBagConstraints.REMAINDER; gbc.insets.left = UIFactory.LEFT_INSET_SECONDARY_FIELD; p.add(getCheckBox(names[i]), gbc); p.add(getCheckBox(fieldName), gbc); } gbc.weightx = 1.0;