From 5ffb7bab2d8c555b22b4f3acd28b7a45aa5280b8 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 09 Sep 2011 15:39:40 +0000
Subject: [PATCH] Tidy-up code after running FindBugs. Rename method clone() to duplicate() to avoid confusion with the Cloneable interface.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java | 3 ++-
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
index 7b01be9..aae4f55 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
@@ -65,7 +66,8 @@
* exceptions that most of the methods in SearchResult throw.
*
*/
-public class CustomSearchResult implements Comparable<CustomSearchResult> {
+public class CustomSearchResult implements Comparable<CustomSearchResult>
+{
private String dn;
private Map<String, List<Object>> attributes;
private SortedSet<String> attrNames;
@@ -213,7 +215,7 @@
/**
* {@inheritDoc}
*/
- public CustomSearchResult clone()
+ public CustomSearchResult duplicate()
{
CustomSearchResult sr = new CustomSearchResult(dn);
sr.attributes = new HashMap<String, List<Object>>(attributes);
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 1f28788..97887da 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -658,7 +659,7 @@
}
else
{
- filteredSr = sr.clone();
+ filteredSr = sr.duplicate();
filteredSr.set(EntryHistorical.HISTORICALATTRIBUTENAME, newValues);
}
}
--
Gitblit v1.10.0