From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
index 42d41e5..777b6d0 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup.installer.ui;
@@ -71,7 +72,6 @@
implements Comparator<SuffixDescriptor>
{
private static final long serialVersionUID = -8051367953737385327L;
- private Component lastFocusComponent;
private TreeSet<SuffixDescriptor> orderedSuffixes =
new TreeSet<SuffixDescriptor>(this);
private HashMap<String, JCheckBox> hmCheckBoxes =
@@ -126,17 +126,9 @@
/**
* {@inheritDoc}
*/
- public void displayFieldInvalid(FieldName fieldName, boolean invalid)
- {
- }
-
- /**
- * {@inheritDoc}
- */
public int compare(SuffixDescriptor desc1, SuffixDescriptor desc2)
{
- int result = 0;
- result = compareSuffixDN(desc1, desc2);
+ int result = compareSuffixDN(desc1, desc2);
if (result == 0)
{
result = compareSuffixStrings(desc1, desc2);
@@ -277,17 +269,6 @@
}
/**
- * {@inheritDoc}
- */
- public void endDisplay()
- {
- if (lastFocusComponent != null)
- {
- lastFocusComponent.requestFocusInWindow();
- }
- }
-
- /**
* Creates the components of this panel.
*/
private void createComponents()
--
Gitblit v1.10.0