From 02093f726f7582e1ffd6ef12c16caf68451a833d Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Thu, 29 Mar 2007 15:09:14 +0000
Subject: [PATCH] These refactorings are essential in anticipation of a new quicksetup application for the upgrader feature (issue 598). These changes were reviewed by Josu.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java
index 77cc909..21b1f5a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DataOptionsPanel.java
@@ -45,10 +45,9 @@
import javax.swing.text.JTextComponent;
import org.opends.quicksetup.event.BrowseActionListener;
-import org.opends.quicksetup.installer.DataOptions;
+import org.opends.quicksetup.DataOptions;
import org.opends.quicksetup.installer.FieldName;
-import org.opends.quicksetup.installer.LabelFieldDescriptor;
-import org.opends.quicksetup.installer.UserInstallData;
+import org.opends.quicksetup.UserData;
/**
* This is the panel that contains the Data Options: the suffix dn, whether
@@ -61,7 +60,7 @@
private static final long serialVersionUID = 1815782841921928118L;
- private UserInstallData defaultUserData;
+ private UserData defaultUserData;
private HashMap<FieldName, JLabel> hmLabels =
new HashMap<FieldName, JLabel>();
@@ -79,7 +78,7 @@
* @param defaultUserData the default values that must be used to initialize
* the fields of the panel.
*/
- public DataOptionsPanel(UserInstallData defaultUserData)
+ public DataOptionsPanel(UserData defaultUserData)
{
this.defaultUserData = defaultUserData;
populateComponentMaps();
@@ -350,7 +349,7 @@
*/
private Object getDefaultValue(FieldName fieldName)
{
- Object value = null;
+ Object value;
switch (fieldName)
{
case DIRECTORY_BASE_DN:
@@ -366,7 +365,7 @@
break;
case NUMBER_ENTRIES:
- value = new Integer(defaultUserData.getDataOptions().getNumberEntries());
+ value = defaultUserData.getDataOptions().getNumberEntries();
break;
default:
--
Gitblit v1.10.0