From 2bc8d15a28fafab97cefafede06d6b7e738ae0fe Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 11 Dec 2009 18:45:45 +0000
Subject: [PATCH] Various incremental improvements.

---
 sdk/src/org/opends/sdk/ldap/LDAPUtils.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sdk/src/org/opends/sdk/ldap/LDAPUtils.java b/sdk/src/org/opends/sdk/ldap/LDAPUtils.java
index 48e11b2..872c9da 100644
--- a/sdk/src/org/opends/sdk/ldap/LDAPUtils.java
+++ b/sdk/src/org/opends/sdk/ldap/LDAPUtils.java
@@ -37,6 +37,7 @@
 import java.util.List;
 
 import org.opends.sdk.ByteSequence;
+import org.opends.sdk.ByteString;
 import org.opends.sdk.Filter;
 import org.opends.sdk.FilterVisitor;
 import org.opends.sdk.asn1.ASN1Reader;
@@ -82,7 +83,7 @@
 
 
     public IOException visitApproxMatchFilter(ASN1Writer writer,
-        String attributeDescription, ByteSequence assertionValue)
+        String attributeDescription, ByteString assertionValue)
     {
       try
       {
@@ -101,7 +102,7 @@
 
 
     public IOException visitEqualityMatchFilter(ASN1Writer writer,
-        String attributeDescription, ByteSequence assertionValue)
+        String attributeDescription, ByteString assertionValue)
     {
       try
       {
@@ -121,7 +122,7 @@
 
     public IOException visitExtensibleMatchFilter(ASN1Writer writer,
         String matchingRule, String attributeDescription,
-        ByteSequence assertionValue, boolean dnAttributes)
+        ByteString assertionValue, boolean dnAttributes)
     {
       try
       {
@@ -158,7 +159,7 @@
 
 
     public IOException visitGreaterOrEqualFilter(ASN1Writer writer,
-        String attributeDescription, ByteSequence assertionValue)
+        String attributeDescription, ByteString assertionValue)
     {
       try
       {
@@ -177,7 +178,7 @@
 
 
     public IOException visitLessOrEqualFilter(ASN1Writer writer,
-        String attributeDescription, ByteSequence assertionValue)
+        String attributeDescription, ByteString assertionValue)
     {
       try
       {
@@ -260,8 +261,8 @@
 
 
     public IOException visitSubstringsFilter(ASN1Writer writer,
-        String attributeDescription, ByteSequence initialSubstring,
-        List<ByteSequence> anySubstrings, ByteSequence finalSubstring)
+        String attributeDescription, ByteString initialSubstring,
+        List<ByteString> anySubstrings, ByteString finalSubstring)
     {
       try
       {
@@ -297,7 +298,7 @@
 
 
     public IOException visitUnrecognizedFilter(ASN1Writer writer,
-        byte filterTag, ByteSequence filterBytes)
+        byte filterTag, ByteString filterBytes)
     {
       try
       {
@@ -481,7 +482,7 @@
       throws IOException
   {
     String attributeDescription;
-    ByteSequence assertionValue;
+    ByteString assertionValue;
 
     reader.readStartSequence(TYPE_FILTER_APPROXIMATE);
     try
@@ -505,7 +506,7 @@
       throws IOException
   {
     String attributeDescription;
-    ByteSequence assertionValue;
+    ByteString assertionValue;
 
     reader.readStartSequence(TYPE_FILTER_EQUALITY);
     try
@@ -531,7 +532,7 @@
     String matchingRule;
     String attributeDescription;
     boolean dnAttributes;
-    ByteSequence assertionValue;
+    ByteString assertionValue;
 
     reader.readStartSequence(TYPE_FILTER_EXTENSIBLE_MATCH);
     try
@@ -572,7 +573,7 @@
       ASN1Reader reader) throws IOException
   {
     String attributeDescription;
-    ByteSequence assertionValue;
+    ByteString assertionValue;
 
     reader.readStartSequence(TYPE_FILTER_GREATER_OR_EQUAL);
     try
@@ -595,7 +596,7 @@
       throws IOException
   {
     String attributeDescription;
-    ByteSequence assertionValue;
+    ByteString assertionValue;
 
     reader.readStartSequence(TYPE_FILTER_LESS_OR_EQUAL);
     try
@@ -673,9 +674,9 @@
   private static Filter decodeSubstringsFilter(ASN1Reader reader)
       throws IOException
   {
-    ByteSequence initialSubstring = null;
-    List<ByteSequence> anySubstrings = null;
-    ByteSequence finalSubstring = null;
+    ByteString initialSubstring = null;
+    List<ByteString> anySubstrings = null;
+    ByteString finalSubstring = null;
     String attributeDescription;
 
     reader.readStartSequence(TYPE_FILTER_SUBSTRING);
@@ -694,7 +695,7 @@
         if (reader.hasNextElement()
             && (reader.peekType() == TYPE_SUBANY))
         {
-          anySubstrings = new LinkedList<ByteSequence>();
+          anySubstrings = new LinkedList<ByteString>();
           do
           {
             anySubstrings.add(reader.readOctetString(TYPE_SUBANY));

--
Gitblit v1.10.0