From 99d6402a5f64b3a07024f190df67c3de3aa443a4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 19 Jan 2010 17:09:10 +0000
Subject: [PATCH] Fix a bunch of warnings mentioned by the IDE (most of them related to the non-use of generics).
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java | 5
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 33 ++--
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java | 11
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java | 4
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Configuration.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java | 5
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserInteraction.java | 4
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java | 3
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java | 5
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java | 6
opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java | 7
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java | 5
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 6
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java | 5
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java | 12 -
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/HistoricalRecord.java | 11 +
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java | 8
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java | 12 -
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 6
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/VersionIssueNotifier.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java | 3
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java | 8
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java | 5
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Application.java | 2
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java | 10
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java | 8
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java | 3
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 5
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java | 7
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java | 4
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 6
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java | 7
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java | 6
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java | 52 +++----
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java | 4
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java | 10
52 files changed, 172 insertions(+), 196 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 87c9783..698d22f 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -44,7 +44,6 @@
import javax.swing.SwingUtilities;
import javax.swing.tree.TreeNode;
-import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.messages.AdminToolMessages;
@@ -1110,8 +1109,6 @@
}
if (!checkSucceeded)
{
- String hostPort = ServerDescriptor.getServerRepresentation(url.getHost(),
- url.getPort());
throw new SearchAbandonException(
State.FAILED, new ReferralLimitExceededException(
ERR_CTRL_PANEL_REFERRAL_LOOP.get(url.getRawBaseDN())), referral);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
index d92db88..079dfd4 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexDescriptor.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -31,7 +31,8 @@
* Abstract class used to describe the configuration of an index.
*
*/
-public abstract class AbstractIndexDescriptor implements Comparable
+public abstract class AbstractIndexDescriptor
+implements Comparable<AbstractIndexDescriptor>
{
private String name;
private BackendDescriptor backend;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
index ae5ab04..1cd76e4 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/AbstractIndexTableModel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -45,6 +45,7 @@
public abstract class AbstractIndexTableModel extends SortableTableModel
implements Comparator<AbstractIndexDescriptor>
{
+ private static final long serialVersionUID = -5131878622200568636L;
private Set<AbstractIndexDescriptor> data =
new HashSet<AbstractIndexDescriptor>();
private ArrayList<String[]> dataArray =
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index 1e9ada0..8b696e6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -35,7 +35,7 @@
* used by the classes in the BackendTableModel class.
*
*/
-public class BaseDNDescriptor implements Comparable
+public class BaseDNDescriptor implements Comparable<BaseDNDescriptor>
{
/**
* An enumeration describing the type of base DN for a given backend.
@@ -134,35 +134,31 @@
/**
* {@inheritDoc}
*/
- public int compareTo(Object o)
+ public int compareTo(BaseDNDescriptor desc)
{
int returnValue = -1;
- if (o instanceof BaseDNDescriptor)
+ returnValue = desc.getDn().compareTo(getDn());
+ if (returnValue == 0)
{
- BaseDNDescriptor desc = (BaseDNDescriptor)o;
- returnValue = desc.getDn().compareTo(getDn());
- if (returnValue == 0)
- {
- returnValue = getType().compareTo(desc.getType());
- }
- if (returnValue == 0)
- {
- getBackend().getBackendID().compareTo(
- desc.getBackend().getBackendID());
- }
- if (returnValue == 0)
- {
- returnValue = compare(getEntries(), desc.getEntries());
- }
- if (returnValue == 0)
- {
- returnValue = compare(getAgeOfOldestMissingChange(),
- desc.getAgeOfOldestMissingChange());
- }
- if (returnValue == 0)
- {
- returnValue = compare(getMissingChanges(), desc.getMissingChanges());
- }
+ returnValue = getType().compareTo(desc.getType());
+ }
+ if (returnValue == 0)
+ {
+ getBackend().getBackendID().compareTo(
+ desc.getBackend().getBackendID());
+ }
+ if (returnValue == 0)
+ {
+ returnValue = compare(getEntries(), desc.getEntries());
+ }
+ if (returnValue == 0)
+ {
+ returnValue = compare(getAgeOfOldestMissingChange(),
+ desc.getAgeOfOldestMissingChange());
+ }
+ if (returnValue == 0)
+ {
+ returnValue = compare(getMissingChanges(), desc.getMissingChanges());
}
return returnValue;
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
index e303a8f..fe72223 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -79,15 +79,9 @@
/**
* {@inheritDoc}
*/
- public int compareTo(Object o)
+ public int compareTo(AbstractIndexDescriptor o)
{
- int returnValue = -1;
- if (o instanceof AbstractIndexDescriptor)
- {
- AbstractIndexDescriptor index = (AbstractIndexDescriptor)o;
- returnValue = getName().compareTo(index.getName());
- }
- return returnValue;
+ return getName().compareTo(o.getName());
}
/**
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
index b5fe49c..5858304 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 2009-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -47,6 +47,7 @@
public abstract class MonitoringTableModel<T, P> extends SortableTableModel
implements Comparator<P>
{
+ private static final long serialVersionUID = -3974562860632179025L;
private Set<P> data = new HashSet<P>();
private ArrayList<String[]> dataArray = new ArrayList<String[]>();
private ArrayList<P> dataSourceArray = new ArrayList<P>();
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 3aee88e..80da30d 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -799,7 +799,7 @@
if (areEqual)
{
- Iterable[] iterables = {attr1.getExtraPropertyNames(),
+ Iterable<?>[] iterables = {attr1.getExtraPropertyNames(),
attr2.getExtraPropertyNames(),
attr1.getNormalizedNames(), attr2.getNormalizedNames(),
attr1.getUserDefinedNames(), attr2.getUserDefinedNames()};
@@ -858,7 +858,7 @@
if (areEqual)
{
- Iterable[] iterables = {
+ Iterable<?>[] iterables = {
oc1.getExtraPropertyNames(), oc2.getExtraPropertyNames(),
oc1.getNormalizedNames(), oc2.getNormalizedNames(),
oc1.getUserDefinedNames(), oc2.getUserDefinedNames()};
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
index 7ba73b1..fead554 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -73,15 +73,9 @@
/**
* {@inheritDoc}
*/
- public int compareTo(Object o)
+ public int compareTo(AbstractIndexDescriptor o)
{
- int returnValue = -1;
- if (o instanceof AbstractIndexDescriptor)
- {
- AbstractIndexDescriptor index = (AbstractIndexDescriptor)o;
- returnValue = getName().compareTo(index.getName());
- }
- return returnValue;
+ return getName().compareTo(o.getName());
}
/**
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
index 172b4c7..36cecc2 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBackendIndexesPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -60,6 +60,7 @@
*/
public abstract class AbstractBackendIndexesPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = 2702054131388877743L;
private String backendName;
/**
* The table model.
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
index 84b67a2..082b23a 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -115,6 +115,7 @@
public abstract class AbstractBrowseEntriesPanel extends StatusGenericPanel
implements BackendPopulatedListener
{
+ private static final long serialVersionUID = -6063927039968115236L;
private JComboBox baseDNs;
/**
* The combo box containing the different filter types.
@@ -1879,7 +1880,7 @@
if (!node.isLeaf())
{
- Enumeration en = node.children();
+ Enumeration<?> en = node.children();
while (en.hasMoreElements())
{
nEntries ++;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
index e86358d..ed0ca5a 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractIndexPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
@@ -61,6 +61,7 @@
*/
public abstract class AbstractIndexPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = 4465529396749593707L;
/**
* Title panel.
*/
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
index 18738cf..040886e 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -55,6 +55,8 @@
*/
public abstract class AbstractNewEntryPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = 6894546787832469213L;
+
/**
* The parent node that was selected when the user clicked on the new entry
* action.
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index 9bfb20c..92dcd11 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
@@ -89,12 +89,13 @@
import org.opends.server.util.ServerConstants;
/**
- * Abstract class used to refactor some code between the classes that are used
+ * Abstract class used to re-factor some code between the classes that are used
* to edit/create a VLV index.
*
*/
public abstract class AbstractVLVIndexPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = -82857384664911898L;
/**
* Title panel.
*/
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
index 6213564..99c6717 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -195,7 +195,7 @@
* @param syntax the attribute syntax that the panel must display.
* @param schema the schema.
*/
- public void update(AttributeSyntax syntax, Schema schema)
+ public void update(AttributeSyntax<?> syntax, Schema schema)
{
String n = syntax.getSyntaxName();
if (n == null)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
index 34c557e..9ca4144 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -80,6 +80,8 @@
*/
public abstract class BackupListPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = -4804555239922795163L;
+
/**
* The text field containing the parent directory.
*/
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
index d6cb134..b017b68 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/BrowseIndexPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -957,7 +957,8 @@
private HashMap<Object, ImageIcon> hmCategoryImages =
new HashMap<Object, ImageIcon>();
- private HashMap<Class, ImageIcon> hmImages = new HashMap<Class, ImageIcon>();
+ private HashMap<Class<?>, ImageIcon> hmImages =
+ new HashMap<Class<?>, ImageIcon>();
{
Object[] nodes = {standardIndexes, vlvIndexes};
String[] paths = {"ds-idx-folder.png", "ds-vlv-idx-folder.png"};
@@ -966,7 +967,7 @@
hmCategoryImages.put(nodes[i],
Utilities.createImageIcon(IconPool.IMAGE_PATH+"/"+paths[i]));
}
- Class[] classes = {IndexTreeNode.class, VLVIndexTreeNode.class};
+ Class<?>[] classes = {IndexTreeNode.class, VLVIndexTreeNode.class};
String[] ocPaths = {"ds-idx.png", "ds-vlv-idx.png"};
for (int i=0; i<classes.length; i++)
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
index 5d2d8c6..9d8f229 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GeneralMonitoringPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 2009-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -41,6 +41,8 @@
*/
public abstract class GeneralMonitoringPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = 2840755228290832143L;
+
/**
* The empty border shared by all the panels.
*/
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
index 5ae3e89..f05c250 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -53,6 +53,8 @@
public abstract class GenericMenuBar extends JMenuBar
{
+ private static final long serialVersionUID = -7289801307628271507L;
+
private ControlPanelInfo info;
/**
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
index c7e35c4..7cf9ebf 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -64,6 +64,7 @@
*/
public abstract class InclusionExclusionPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = -3826176895778069011L;
/**
* The DNs to exclude.
*/
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
index 9372231..ad98ead 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MatchingRulePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -217,9 +217,9 @@
titlePanel.setDetails(Message.raw(n));
name.setText(n);
oid.setText(matchingRule.getOID());
- AttributeSyntax s = null;
+ AttributeSyntax<?> s = null;
String syntaxOID = matchingRule.getSyntaxOID();
- for (AttributeSyntax candidate : schema.getSyntaxes().values())
+ for (AttributeSyntax<?> candidate : schema.getSyntaxes().values())
{
if (candidate.getOID().equals(syntaxOID))
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
index 6cba7f8..e404f17 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/MonitoringAttributesViewPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2009 Sun Microsystems, Inc.
+ * Copyright 2009-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -171,8 +171,7 @@
JPanel checkBoxPanel = new JPanel(new GridBagLayout());
checkBoxPanel.setOpaque(false);
JScrollPane scroll = Utilities.createBorderLessScrollBar(checkBoxPanel);
- ScrollPaneBorderListener scrollListener =
- ScrollPaneBorderListener.createFullBorderListener(scroll);
+ ScrollPaneBorderListener.createFullBorderListener(scroll);
checkboxes = new JCheckBox[monitoringAttributes.size()];
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
index a58b2a7..742b03f 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -42,12 +42,14 @@
import org.opends.server.types.Schema;
/**
- * Abstract class used to refactor some code among the panels that display the
+ * Abstract class used to re-factor some code among the panels that display the
* contents of a schema element.
*
*/
public abstract class SchemaElementPanel extends StatusGenericPanel
{
+ private static final long serialVersionUID = -8556383593966382604L;
+
private Set<SchemaElementSelectionListener> listeners =
new HashSet<SchemaElementSelectionListener>();
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
index 2c0bafb..e6524f3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AbstractIndexTreeNode.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui.nodes;
@@ -36,6 +36,7 @@
*/
public abstract class AbstractIndexTreeNode extends DefaultMutableTreeNode
{
+ private static final long serialVersionUID = 8055748310817873273L;
private String name;
/**
* Constructor.
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
index 8837ad2..5763707 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/AttributeSyntaxTreeNode.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui.nodes;
@@ -37,14 +37,14 @@
public class AttributeSyntaxTreeNode extends SchemaElementTreeNode
{
private static final long serialVersionUID = 2439971368723239776L;
- private AttributeSyntax syntax;
+ private AttributeSyntax<?> syntax;
/**
* Constructor of the node.
* @param name the name of the node.
* @param syntax the attribute syntax.
*/
- public AttributeSyntaxTreeNode(String name, AttributeSyntax syntax)
+ public AttributeSyntaxTreeNode(String name, AttributeSyntax<?> syntax)
{
super(name, syntax);
this.syntax = syntax;
@@ -54,7 +54,7 @@
* Returns the attribute syntax represented by this node.
* @return the attribute syntax represented by this node.
*/
- public AttributeSyntax getAttributeSyntax()
+ public AttributeSyntax<?> getAttributeSyntax()
{
return syntax;
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
index aaf293e..aafe05c 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/nodes/SchemaElementTreeNode.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui.nodes;
@@ -36,6 +36,7 @@
*/
public abstract class SchemaElementTreeNode extends DefaultMutableTreeNode
{
+ private static final long serialVersionUID = 5832209952457633471L;
private String name;
private Object schemaElement;
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
index 417c926..2949fac 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -61,12 +61,12 @@
public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus)
{
- if (value instanceof AttributeSyntax)
+ if (value instanceof AttributeSyntax<?>)
{
- String syntaxName = ((AttributeSyntax)value).getSyntaxName();
+ String syntaxName = ((AttributeSyntax<?>)value).getSyntaxName();
if (syntaxName == null)
{
- value = ((AttributeSyntax)value).getOID();
+ value = ((AttributeSyntax<?>)value).getOID();
}
else
{
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
index 8990627..c7c369a 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.util;
@@ -51,6 +51,7 @@
import org.opends.server.types.CanceledOperationException;
import org.opends.server.types.ConditionResult;
import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.IndexType;
@@ -244,8 +245,7 @@
serverRoot = rootFile.getAbsolutePath();
File instanceRootFile =
- DirectoryServer.getEnvironmentConfig().
- getInstanceRootFromServerRoot(rootFile);
+ DirectoryEnvironmentConfig.getInstanceRootFromServerRoot(rootFile);
instanceRoot = instanceRootFile.getAbsolutePath();
}
catch (InitializationException ie)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java
index 675ed6d..363545a 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.util;
@@ -70,8 +70,8 @@
new ArrayList<AttributeType>();
private final ArrayList<MatchingRule> matchingRulesToKeep =
new ArrayList<MatchingRule>();
- private final ArrayList<AttributeSyntax> syntaxesToKeep =
- new ArrayList<AttributeSyntax>();
+ private final ArrayList<AttributeSyntax<?>> syntaxesToKeep =
+ new ArrayList<AttributeSyntax<?>>();
/**
* Constructor.
@@ -100,7 +100,7 @@
{
matchingRulesToKeep.add(mr);
}
- for (AttributeSyntax syntax : sc.getSyntaxes().values())
+ for (AttributeSyntax<?> syntax : sc.getSyntaxes().values())
{
syntaxesToKeep.add(syntax);
}
@@ -260,7 +260,7 @@
{
schema.registerMatchingRule(mr, true);
}
- for (AttributeSyntax syntax : syntaxesToKeep)
+ for (AttributeSyntax<?> syntax : syntaxesToKeep)
{
schema.registerSyntax(syntax, true);
}
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
index 3d0f9e6..5285bf9 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.uninstaller;
@@ -34,7 +34,6 @@
import org.opends.messages.ToolMessages;
import java.io.File;
-import java.util.logging.Logger;
import org.opends.quicksetup.CliApplication;
import org.opends.quicksetup.Launcher;
import org.opends.quicksetup.Installation;
@@ -60,9 +59,6 @@
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
- static private final Logger LOG =
- Logger.getLogger(UninstallLauncher.class.getName());
-
/**
* The main method which is called by the uninstall command lines.
*
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 516a8d5..b9c5ef6 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -312,13 +312,13 @@
uud.setUpdateRemoteReplication(false);
Set<String> dbs = new HashSet<String>();
- Set s = (Set) qs.getFieldValue(FieldName.EXTERNAL_DB_DIRECTORIES);
+ Set<?> s = (Set<?>) qs.getFieldValue(FieldName.EXTERNAL_DB_DIRECTORIES);
for (Object v : s) {
dbs.add((String) v);
}
Set<String> logs = new HashSet<String>();
- s = (Set) qs.getFieldValue(FieldName.EXTERNAL_LOG_FILES);
+ s = (Set<?>) qs.getFieldValue(FieldName.EXTERNAL_LOG_FILES);
for (Object v : s) {
logs.add((String) v);
}
@@ -424,8 +424,9 @@
*/
public boolean finishClicked(final WizardStep cStep, final QuickSetup qs) {
if (cStep == Step.CONFIRM_UNINSTALL) {
- BackgroundTask worker = new BackgroundTask() {
- public Object processBackgroundTask() throws UserDataException {
+ BackgroundTask<UninstallData> worker =
+ new BackgroundTask<UninstallData>() {
+ public UninstallData processBackgroundTask() throws UserDataException {
try {
updateUserUninstallDataForConfirmUninstallPanel(qs);
return new UninstallData(Installation.getLocal());
@@ -439,7 +440,7 @@
}
}
- public void backgroundTaskCompleted(Object returnValue,
+ public void backgroundTaskCompleted(UninstallData returnValue,
Throwable throwable) {
qs.getDialog().workerFinished();
if (throwable != null) {
@@ -456,7 +457,7 @@
INFO_ERROR_TITLE.get());
}
} else {
- conf = (UninstallData)returnValue;
+ conf = returnValue;
if (conf.isADS() && conf.isReplicationServer())
{
if (conf.isServerRunning())
@@ -1618,9 +1619,9 @@
conf.getReplicationServerPort());
getUninstallUserData().setReferencedHostName(loginDialog.getHostName());
- BackgroundTask worker = new BackgroundTask()
+ BackgroundTask<TopologyCache> worker = new BackgroundTask<TopologyCache>()
{
- public Object processBackgroundTask() throws Throwable
+ public TopologyCache processBackgroundTask() throws Throwable
{
LOG.log(Level.INFO, "Loading Topology Cache in askForAuthentication");
ADSContext adsContext = new ADSContext(ctx);
@@ -1630,7 +1631,7 @@
cache.reloadTopology();
return cache;
}
- public void backgroundTaskCompleted(Object returnValue,
+ public void backgroundTaskCompleted(TopologyCache returnValue,
Throwable throwable) {
qs.getDialog().workerFinished();
if (throwable != null)
@@ -1653,7 +1654,7 @@
}
else
{
- TopologyCache cache = (TopologyCache)returnValue;
+ TopologyCache cache = returnValue;
handleTopologyCache(qs, cache);
}
}
@@ -1822,16 +1823,17 @@
{
LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
getTrustManager().acceptCertificate(chain, authType, host);
- BackgroundTask worker = new BackgroundTask()
+ BackgroundTask<TopologyCache> worker =
+ new BackgroundTask<TopologyCache>()
{
- public Object processBackgroundTask() throws Throwable
+ public TopologyCache processBackgroundTask() throws Throwable
{
LOG.log(Level.INFO, "Reloading topology");
cache.getFilter().setSearchMonitoringInformation(false);
cache.reloadTopology();
return cache;
}
- public void backgroundTaskCompleted(Object returnValue,
+ public void backgroundTaskCompleted(TopologyCache returnValue,
Throwable throwable) {
qs.getDialog().workerFinished();
if (throwable != null)
@@ -1954,7 +1956,7 @@
ServerDescriptor.ServerProperty.IS_REPLICATION_SERVER);
if (Boolean.TRUE.equals(v))
{
- Set replicationServers = (Set<?>)server.getServerProperties().get(
+ Set<?> replicationServers = (Set<?>)server.getServerProperties().get(
ServerDescriptor.ServerProperty.EXTERNAL_REPLICATION_SERVERS);
if (replicationServers != null)
{
@@ -2236,7 +2238,8 @@
{
property = ServerDescriptor.ServerProperty.LDAP_PORT;
}
- ArrayList ports = (ArrayList)server.getServerProperties().get(property);
+ ArrayList<?> ports =
+ (ArrayList<?>)server.getServerProperties().get(property);
if (ports != null)
{
isServerToUninstall = ports.contains(port);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
index 4fcbc49..2506e5a 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/ConfirmUninstallPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.uninstaller.ui;
@@ -62,7 +62,6 @@
private static final long serialVersionUID = 81730510134697056L;
- private CurrentInstallStatus installStatus;
private Set<String> outsideDbs;
private Set<String> outsideLogs;
@@ -79,7 +78,6 @@
CurrentInstallStatus installStatus)
{
super(application);
- this.installStatus = installStatus;
}
/**
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
index a25c30e..fd9a1a3 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.uninstaller.ui;
@@ -377,9 +377,9 @@
*/
private void okClicked()
{
- BackgroundTask worker = new BackgroundTask()
+ BackgroundTask<Boolean> worker = new BackgroundTask<Boolean>()
{
- public Object processBackgroundTask() throws NamingException,
+ public Boolean processBackgroundTask() throws NamingException,
ApplicationException
{
Boolean isServerRunning = Boolean.TRUE;
@@ -426,7 +426,7 @@
return isServerRunning;
}
- public void backgroundTaskCompleted(Object returnValue,
+ public void backgroundTaskCompleted(Boolean returnValue,
Throwable throwable)
{
if (throwable != null)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Application.java
index b23dbfc..e36874e 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -106,7 +106,7 @@
String appClassName =
System.getProperty("org.opends.quicksetup.Application.class");
if (appClassName != null) {
- Class appClass = null;
+ Class<?> appClass = null;
try {
appClass = Class.forName(appClassName);
app = (GuiApplication) appClass.newInstance();
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
index 9d47a6e..0076720 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -54,7 +54,7 @@
* Represents information about the current build that is
* publicly obtainable by invoking start-ds -F.
*/
-public class BuildInformation implements Comparable {
+public class BuildInformation implements Comparable<BuildInformation> {
static private final Logger LOG =
Logger.getLogger(BuildInformation.class.getName());
@@ -414,8 +414,7 @@
/**
* {@inheritDoc}
*/
- public int compareTo(Object o) {
- BuildInformation bi = (BuildInformation) o;
+ public int compareTo(BuildInformation bi) {
if (getMajorVersion().equals(bi.getMajorVersion())) {
if (getMinorVersion().equals(bi.getMinorVersion())) {
if (getPointVersion().equals(bi.getPointVersion())) {
@@ -442,7 +441,7 @@
public boolean equals(Object o) {
return this == o ||
!(o == null || getClass() != o.getClass()) &&
- compareTo(o) == 0;
+ compareTo((BuildInformation)o) == 0;
}
/**
@@ -457,7 +456,7 @@
return hc;
}
- static private void checkNotNull(Map values, String... props)
+ static private void checkNotNull(Map<?, ?> values, String... props)
throws ApplicationException {
for (String prop : props) {
if (null == values.get(prop)) {
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
index efa5f9d..67668a7 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/CliUserInteraction.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -162,7 +162,7 @@
/**
* {@inheritDoc}
*/
- public String createUnorderedList(List list) {
+ public String createUnorderedList(List<?> list) {
StringBuilder sb = new StringBuilder();
if (list != null) {
for (Object o : list) {
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Configuration.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Configuration.java
index 6287b07..c976104 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Configuration.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Configuration.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -35,16 +35,12 @@
import java.io.IOException;
import java.util.Set;
import java.util.HashSet;
-import java.util.logging.Logger;
/**
* Represents the contents of an OpenDS configuration file.
*/
public class Configuration {
- static private final Logger LOG =
- Logger.getLogger(Configuration.class.getName());
-
private String contents = null;
private String lowerCaseContents = null;
private Installation install = null;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/HistoricalRecord.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/HistoricalRecord.java
index b872457..b769896 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/HistoricalRecord.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/HistoricalRecord.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -281,6 +281,15 @@
}
/**
+ * Returns the error that was generated during creation.
+ * @return the error that was generated during creation.
+ */
+ public Exception getCreationError()
+ {
+ return creationError;
+ }
+
+ /**
* {@inheritDoc}
*/
public String toString() {
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserInteraction.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserInteraction.java
index 9ea771b..b560ab1 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserInteraction.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserInteraction.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -104,7 +104,7 @@
* @param list to format
* @return String representing the list
*/
- String createUnorderedList(List list);
+ String createUnorderedList(List<?> list);
/**
* Promt the user for a string.
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
index 51d1b6c..904a5ad 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installandupgrader/InstallAndUpgrader.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installandupgrader;
@@ -37,7 +37,6 @@
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
-import java.util.logging.Logger;
import org.opends.quicksetup.ButtonName;
import org.opends.quicksetup.Constants;
@@ -68,8 +67,6 @@
*/
public class InstallAndUpgrader extends GuiApplication
{
- static private final Logger LOG =
- Logger.getLogger(InstallAndUpgrader.class.getName());
private GuiApplication installer;
private GuiApplication upgrader;
private InstallAndUpgradeUserData userData;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
index bce0345..f6170d2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installer;
@@ -31,7 +31,6 @@
import static org.opends.messages.ToolMessages.*;
import java.io.File;
-import java.util.logging.Logger;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.ReturnCode;
@@ -57,10 +56,6 @@
* based setup much be launched.
*/
public class SetupLauncher extends Launcher {
-
- static private final Logger LOG =
- Logger.getLogger(SetupLauncher.class.getName());
-
/**
* The main method which is called by the setup command lines.
*
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
index 5bb761c..ab89893 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/SuffixesToReplicateOptions.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
@@ -85,13 +85,13 @@
switch (type)
{
case REPLICATE_WITH_EXISTING_SUFFIXES:
- Set s = (Set)args[0];
+ Set<?> s = (Set<?>)args[0];
availableSuffixes = new LinkedHashSet<SuffixDescriptor>();
for (Object o: s)
{
availableSuffixes.add((SuffixDescriptor)o);
}
- s = (Set)args[1];
+ s = (Set<?>)args[1];
suffixesToReplicate = new LinkedHashSet<SuffixDescriptor>();
for (Object o: s)
{
@@ -103,13 +103,13 @@
// If there is something put it.
if ((args != null) && (args.length > 0))
{
- s = (Set)args[0];
+ s = (Set<?>)args[0];
availableSuffixes = new LinkedHashSet<SuffixDescriptor>();
for (Object o: s)
{
availableSuffixes.add((SuffixDescriptor)o);
}
- s = (Set)args[1];
+ s = (Set<?>)args[1];
suffixesToReplicate = new LinkedHashSet<SuffixDescriptor>();
for (Object o: s)
{
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java
index 1ee1f83..1797336 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/DirectoryManagerAuthenticationDialog.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.ui;
@@ -329,9 +329,9 @@
private void shutDownClicked()
{
isCancelled = false;
- BackgroundTask worker = new BackgroundTask()
+ BackgroundTask<Boolean> worker = new BackgroundTask<Boolean>()
{
- public Object processBackgroundTask() throws NamingException
+ public Boolean processBackgroundTask() throws NamingException
{
Boolean isServerRunning = Boolean.TRUE;
try
@@ -368,7 +368,7 @@
return isServerRunning;
}
- public void backgroundTaskCompleted(Object returnValue,
+ public void backgroundTaskCompleted(Boolean returnValue,
Throwable throwable)
{
if (throwable != null)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
index 25ecab2..dd387a1 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.ui;
@@ -611,7 +611,8 @@
// platforms.
try
{
- Class cl = Class.forName("org.opends.quicksetup.CliUserInteraction");
+ Class<?> cl =
+ Class.forName("org.opends.quicksetup.CliUserInteraction");
ui = (UserInteraction) cl.newInstance();
}
catch (Throwable t)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java
index a8e436f..9c9d0f5 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/GuiUserInteraction.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.ui;
@@ -135,7 +135,7 @@
/**
* {@inheritDoc}
*/
- public String createUnorderedList(List list) {
+ public String createUnorderedList(List<?> list) {
StringBuilder sb = new StringBuilder();
if (list != null) {
sb.append(Constants.HTML_UNORDERED_LIST_OPEN);
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
index 6abd022..ccd4939 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -680,7 +680,7 @@
* This is a class used when the user clicks on next and that extends
* BackgroundTask.
*/
- private class NextClickedBackgroundTask extends BackgroundTask
+ private class NextClickedBackgroundTask extends BackgroundTask<Object>
{
private WizardStep cStep;
public NextClickedBackgroundTask(WizardStep cStep)
@@ -740,7 +740,8 @@
application.acceptCertificateForException(ce,
answer == CertificateDialog.ReturnType.ACCEPTED_PERMANENTLY);
application.nextClicked(cStep, QuickSetup.this);
- BackgroundTask worker = new NextClickedBackgroundTask(cStep);
+ BackgroundTask<Object> worker =
+ new NextClickedBackgroundTask(cStep);
getDialog().workerStarted();
worker.startBackgroundTask();
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
index d63b863..b1e0c1a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/ReviewPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.ui;
@@ -36,6 +36,8 @@
*/
public abstract class ReviewPanel extends QuickSetupStepPanel {
+ private static final long serialVersionUID = 509534079919269557L;
+
/**
* Creates an instance.
* @param application GuiApplication this panel represents
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
index b53ee3b..c4b57d2 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/MigrationManager.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -517,8 +517,4 @@
private File getCustomSchemaDiffFile() throws IOException {
return new File(backupDir, "schema.custom.diff");
}
-
- private File getCustomADSDiffFile() throws IOException {
- return new File(backupDir, "admin-backend.custom.diff");
- }
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index 7c40fda..517012f 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -46,7 +46,6 @@
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.StringArgument;
-import java.util.logging.Logger;
import java.io.File;
import org.opends.server.util.DynamicConstants;
@@ -59,9 +58,6 @@
/** Prefix for log files. */
static public final String LOG_FILE_PREFIX = "opends-upgrade-";
- static private final Logger LOG =
- Logger.getLogger(UpgradeLauncher.class.getName());
-
/** Short form of the option for specifying the installation package file. */
static public final Character FILE_OPTION_SHORT = 'f';
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java
index ca902a4..e4df3c6 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeSvr4Launcher.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -45,7 +45,6 @@
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.StringArgument;
-import java.util.logging.Logger;
import java.io.File;
/**
@@ -54,9 +53,6 @@
*/
public class UpgradeSvr4Launcher extends UpgradeLauncher {
- static private final Logger LOG =
- Logger.getLogger(UpgradeSvr4Launcher.class.getName());
-
/**
* The main method which is called by the setup command lines.
*
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
index 7e22516..4683179 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgraderCliHelper.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -30,16 +30,11 @@
import org.opends.quicksetup.UserDataException;
import org.opends.server.util.cli.ConsoleApplication;
-import java.util.logging.Logger;
-
/**
* Assists Upgrader utility in CLI drudgery.
*/
public class UpgraderCliHelper extends ConsoleApplication {
- static private final Logger LOG =
- Logger.getLogger(UpgraderCliHelper.class.getName());
-
/** Launcher for this CLI invocation. */
protected UpgradeLauncher launcher;
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/VersionIssueNotifier.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/VersionIssueNotifier.java
index 04d8be6..18f5cdc 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/VersionIssueNotifier.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/VersionIssueNotifier.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -378,7 +378,7 @@
* @param list to format
* @return String representing the list
*/
- protected String createUnorderedList(List list) {
+ protected String createUnorderedList(List<?> list) {
StringBuilder sb = new StringBuilder();
if (list != null) {
for (Object o : list) {
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java b/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java
index 6ba52cc..2a494de 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/status/StatusCli.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools.status;
@@ -1333,9 +1333,4 @@
return Message.raw(
StaticUtils.wrapText(text, getCommandLineMaxLineWidth()));
}
-
- private static void printTimeSince(String msg, long initTime)
- {
- System.out.println(msg+" : "+(System.currentTimeMillis() - initTime));
- }
}
--
Gitblit v1.10.0