From d41ebfdf1b752c71ff76b2b613e424adf3b0fd4c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 04 Mar 2014 10:36:04 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 106 ++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 61 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index bb8dc36..9b5bc05 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -95,6 +95,8 @@
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
+import static org.opends.server.types.CommonSchemaElements.*;
+
/**
* The panel that displays a custom object class definition.
*
@@ -166,9 +168,8 @@
createLayout();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public LocalizableMessage getTitle()
{
return INFO_CTRL_PANEL_CUSTOM_OBJECTCLASS_TITLE.get();
@@ -208,9 +209,8 @@
add(delete, gbc);
delete.addActionListener(new ActionListener()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void actionPerformed(ActionEvent ev)
{
deleteObjectclass();
@@ -225,9 +225,8 @@
add(saveChanges, gbc);
saveChanges.addActionListener(new ActionListener()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void actionPerformed(ActionEvent ev)
{
ArrayList<LocalizableMessage> errors = new ArrayList<LocalizableMessage>();
@@ -246,9 +245,8 @@
SuperiorObjectClassesChangedListener listener =
new SuperiorObjectClassesChangedListener()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void parentObjectClassesChanged(
SuperiorObjectClassesChangedEvent ev)
{
@@ -284,9 +282,8 @@
new DoubleAddRemovePanel<AttributeType>(0, AttributeType.class);
Comparator<AttributeType> comparator = new Comparator<AttributeType>()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public int compare(AttributeType attr1, AttributeType attr2)
{
return attr1.getNameOrOID().toLowerCase().compareTo(
@@ -385,9 +382,8 @@
add(labels, comps, inlineHelps, p, gbc1);
ChangeListener changeListener = new ChangeListener()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void stateChanged(ChangeEvent e)
{
p.setVisible(expander.isSelected());
@@ -399,25 +395,22 @@
DocumentListener docListener = new DocumentListener()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void insertUpdate(DocumentEvent ev)
{
checkEnableSaveChanges();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void removeUpdate(DocumentEvent ev)
{
checkEnableSaveChanges();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void changedUpdate(DocumentEvent arg0)
{
checkEnableSaveChanges();
@@ -431,6 +424,7 @@
ActionListener actionListener = new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ev)
{
checkEnableSaveChanges();
@@ -441,23 +435,20 @@
ListDataListener dataListener = new ListDataListener()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void contentsChanged(ListDataEvent e)
{
checkEnableSaveChanges();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void intervalAdded(ListDataEvent e)
{
checkEnableSaveChanges();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void intervalRemoved(ListDataEvent e)
{
checkEnableSaveChanges();
@@ -552,7 +543,7 @@
}
origin.setText(sOrigin);
- String sFile = oc.getSchemaFile();
+ String sFile = getSchemaFile(oc);
if (sFile == null)
{
sFile = "";
@@ -573,9 +564,8 @@
ignoreChangeEvents = false;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void configurationChanged(ConfigurationChangeEvent ev)
{
final ServerDescriptor desc = ev.getNewDescriptor();
@@ -616,9 +606,8 @@
}
SwingUtilities.invokeLater(new Runnable()
{
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void run()
{
delete.setEnabled(!authenticationRequired(desc)
@@ -638,17 +627,15 @@
});
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public boolean mustCheckUnsavedChanges()
{
return saveChanges.isEnabled();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public UnsavedChangesDialog.Result checkUnsavedChanges()
{
UnsavedChangesDialog.Result result;
@@ -674,17 +661,15 @@
return result;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public Component getPreferredFocusComponent()
{
return name;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public void okClicked()
{
}
@@ -1111,11 +1096,11 @@
if (sel != null)
{
ArrayList<Integer> indexes = new ArrayList<Integer>();
- for (int j=0; j<sel.length; j++)
+ for (int element : sel)
{
- if (sel[j] < lists[i].getModel().getSize())
+ if (element < lists[i].getModel().getSize())
{
- indexes.add(sel[j]);
+ indexes.add(element);
}
}
int[] newSelection = new int[indexes.size()];
@@ -1210,9 +1195,8 @@
defaultRenderer = attributes.getAvailableList().getCellRenderer();
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus)
{
--
Gitblit v1.10.0