From 838e873376cc4a1cc3588746f6bf8dec4c9355a9 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).
---
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
index 1e9ada0..8b696e6 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/BaseDNDescriptor.java
+++ b/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;
}
--
Gitblit v1.10.0