From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
index 1bf445c..31e756d 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -52,7 +52,7 @@
* exceptions that most of the methods in SearchResult throw.
*
*/
-public class CustomSearchResult implements Comparable {
+public class CustomSearchResult implements Comparable<CustomSearchResult> {
private Name name;
private String dn;
private Map<String, Set<Object>> attributes;
@@ -177,8 +177,17 @@
/**
* {@inheritDoc}
*/
- public int compareTo(Object o) {
- return this.getDN().compareTo(((CustomSearchResult)o).getDN());
+ public int compareTo(CustomSearchResult o) {
+ int compareTo;
+ if (this.equals(o))
+ {
+ compareTo = 0;
+ }
+ else
+ {
+ compareTo = toString().compareTo(o.toString());
+ }
+ return compareTo;
}
/**
--
Gitblit v1.10.0