From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
index 7c3e77d..a76b807 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -90,15 +90,7 @@
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
import org.opends.server.schema.SchemaConstants;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LDIFImportConfig;
-import org.opends.server.types.ObjectClass;
-import org.opends.server.types.OpenDsException;
-import org.opends.server.types.RDN;
-import org.opends.server.types.Schema;
+import org.opends.server.types.*;
import org.opends.server.util.Base64;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.ServerConstants;
@@ -1610,7 +1602,7 @@
String attrName = rdn.getAttributeName(i);
AttributeValue value = rdn.getAttributeValue(i);
- String sValue = value.getStringValue();
+ String sValue = value.getValue().toString();
Set<String> values = getDisplayedStringValues(attrName);
if (!values.contains(sValue))
@@ -1632,7 +1624,8 @@
AttributeType attr = rdn.getAttributeType(i);
attributeTypes.add(attr);
attributeNames.add(rdn.getAttributeName(i));
- attributeValues.add(new AttributeValue(attr, firstNonEmpty));
+ attributeValues.add(AttributeValues.create(
+ attr, firstNonEmpty));
}
}
}
@@ -1671,7 +1664,8 @@
{
attributeTypes.add(attr);
attributeNames.add(attrName);
- attributeValues.add(new AttributeValue(attr, (String)o));
+ attributeValues.add(
+ AttributeValues.create(attr, (String)o));
}
break;
}
--
Gitblit v1.10.0