From 710a84b388a71afbda13a6dbf3f1523af2c5e0cd Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 06 Apr 2016 10:18:08 +0000
Subject: [PATCH] Extract methods to remove duplicated code
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index 390900a..1bb1fa8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -60,6 +60,7 @@
import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.SearchScope;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.server.config.client.BackendVLVIndexCfgClient;
import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
@@ -80,7 +81,6 @@
import org.opends.quicksetup.Installation;
import org.opends.server.config.ConfigException;
import org.opends.server.protocols.ldap.LDAPFilter;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.schema.SomeSchemaElement;
import org.opends.server.types.FilterType;
import org.opends.server.types.LDAPException;
@@ -156,7 +156,7 @@
private final JComboBox ascendingOrder = Utilities.createComboBox();
/** Combo box containing the sort order. */
- protected DefaultListModel sortOrderModel;
+ protected DefaultListModel<VLVSortOrder> sortOrderModel;
/** The list of labels. */
private final JLabel[] labels = { lName, lBaseDN, lSearchScope, lFilter, lSortOrder, lBackend, lMaxBlockSize };
@@ -254,7 +254,7 @@
List<VLVSortOrder> sortOrder = new ArrayList<>();
for (int i = 0; i < sortOrderModel.getSize(); i++)
{
- sortOrder.add((VLVSortOrder) sortOrderModel.get(i));
+ sortOrder.add(sortOrderModel.get(i));
}
return sortOrder;
}
@@ -936,8 +936,8 @@
int[] indexes = sortOrder.getSelectedIndices();
for (int i = 0; i < indexes.length; i++)
{
- Object o1 = sortOrderModel.elementAt(indexes[i] - 1);
- Object o2 = sortOrderModel.elementAt(indexes[i]);
+ VLVSortOrder o1 = sortOrderModel.elementAt(indexes[i] - 1);
+ VLVSortOrder o2 = sortOrderModel.elementAt(indexes[i]);
sortOrderModel.set(indexes[i] - 1, o2);
sortOrderModel.set(indexes[i], o1);
@@ -955,8 +955,8 @@
int[] indexes = sortOrder.getSelectedIndices();
for (int i = 0; i < indexes.length; i++)
{
- Object o1 = sortOrderModel.elementAt(indexes[i] + 1);
- Object o2 = sortOrderModel.elementAt(indexes[i]);
+ VLVSortOrder o1 = sortOrderModel.elementAt(indexes[i] + 1);
+ VLVSortOrder o2 = sortOrderModel.elementAt(indexes[i]);
sortOrderModel.set(indexes[i] + 1, o2);
sortOrderModel.set(indexes[i], o1);
@@ -978,7 +978,7 @@
DefaultComboBoxModel model = (DefaultComboBoxModel) attributes.getModel();
for (int index : indexes)
{
- VLVSortOrder sortOrder = (VLVSortOrder) sortOrderModel.getElementAt(index);
+ VLVSortOrder sortOrder = sortOrderModel.getElementAt(index);
String attrName = sortOrder.getAttributeName();
boolean isCustom = customAttrNames.contains(attrName);
boolean dealingWithCustom = true;
--
Gitblit v1.10.0