directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r359131 - /directory/shared/ldap/trunk/snacc-provider/src/main/java/org/apache/ldap/common/berlib/snacc/FilterTransform.java
Date Mon, 26 Dec 2005 23:37:58 GMT
Author: elecharny
Date: Mon Dec 26 15:37:53 2005
New Revision: 359131

URL: http://svn.apache.org/viewcvs?rev=359131&view=rev
Log:
Use StringTools instead of StringUtils

Modified:
    directory/shared/ldap/trunk/snacc-provider/src/main/java/org/apache/ldap/common/berlib/snacc/FilterTransform.java

Modified: directory/shared/ldap/trunk/snacc-provider/src/main/java/org/apache/ldap/common/berlib/snacc/FilterTransform.java
URL: http://svn.apache.org/viewcvs/directory/shared/ldap/trunk/snacc-provider/src/main/java/org/apache/ldap/common/berlib/snacc/FilterTransform.java?rev=359131&r1=359130&r2=359131&view=diff
==============================================================================
--- directory/shared/ldap/trunk/snacc-provider/src/main/java/org/apache/ldap/common/berlib/snacc/FilterTransform.java
(original)
+++ directory/shared/ldap/trunk/snacc-provider/src/main/java/org/apache/ldap/common/berlib/snacc/FilterTransform.java
Mon Dec 26 15:37:53 2005
@@ -30,7 +30,6 @@
 import java.util.ArrayList ;
 import java.util.Enumeration ;
 
-import org.apache.asn1.codec.util.StringUtils;
 import org.apache.ldap.common.filter.ExprNode ;
 import org.apache.ldap.common.filter.LeafNode ;
 import org.apache.ldap.common.filter.BranchNode ;
@@ -40,6 +39,7 @@
 import org.apache.ldap.common.filter.ExtensibleNode ;
 
 import org.apache.ldap.common.message.spi.ProviderException ;
+import org.apache.ldap.common.util.StringTools;
 
 import org.apache.ldap.common.berlib.snacc.ldap_v3.Filter ;
 import org.apache.ldap.common.berlib.snacc.ldap_v3.FilterSetOf ;
@@ -234,14 +234,14 @@
     private static SubstringFilter getSubstringFilter( SubstringNode a_node )
     {
         SubstringFilter l_subStrFilter = new SubstringFilter() ;
-        l_subStrFilter.type = StringUtils.getBytesUtf8( a_node.getAttribute() ) ;
+        l_subStrFilter.type = StringTools.getBytesUtf8( a_node.getAttribute() ) ;
         SubstringFilterSeqOf l_seq = new SubstringFilterSeqOf() ;
         l_subStrFilter.substrings = l_seq ;
 
         SubstringFilterSeqOfChoice l_initial =
             new SubstringFilterSeqOfChoice() ;
         l_initial.choiceId = SubstringFilterSeqOfChoice.INITIAL_CID ;
-        l_initial.initial = StringUtils.getBytesUtf8( a_node.getInitial() ) ;
+        l_initial.initial = StringTools.getBytesUtf8( a_node.getInitial() ) ;
         l_seq.add( l_initial ) ;
 
         for( int ii = 0; ii < a_node.getAny().size(); ii ++ )
@@ -249,14 +249,14 @@
             SubstringFilterSeqOfChoice l_any =
                 new SubstringFilterSeqOfChoice() ;
             l_any.choiceId = SubstringFilterSeqOfChoice.ANY_CID ;
-            l_any.any = StringUtils.getBytesUtf8( ( ( String ) a_node.getAny().get( ii )
) ) ;
+            l_any.any = StringTools.getBytesUtf8( ( ( String ) a_node.getAny().get( ii )
) ) ;
             l_seq.add( l_any ) ;
         }
 
         SubstringFilterSeqOfChoice l_final =
             new SubstringFilterSeqOfChoice() ;
         l_final.choiceId = SubstringFilterSeqOfChoice.FINAL1_CID ;
-        l_final.final1 = StringUtils.getBytesUtf8( a_node.getFinal() ) ;
+        l_final.final1 = StringTools.getBytesUtf8( a_node.getFinal() ) ;
         l_seq.add( l_final ) ;
 
         return l_subStrFilter ;
@@ -273,9 +273,9 @@
     private static MatchingRuleAssertion getMra( ExtensibleNode a_node )
     {
         MatchingRuleAssertion l_mra = new MatchingRuleAssertion() ;
-        l_mra.type = StringUtils.getBytesUtf8( a_node.getAttribute() ) ;
+        l_mra.type = StringTools.getBytesUtf8( a_node.getAttribute() ) ;
         l_mra.matchValue = a_node.getValue() ;
-        l_mra.matchingRule = StringUtils.getBytesUtf8( a_node.getMatchingRuleId() ) ;
+        l_mra.matchingRule = StringTools.getBytesUtf8( a_node.getMatchingRuleId() ) ;
         l_mra.dnAttributes = a_node.dnAttributes() ;
 
         return l_mra ;
@@ -293,8 +293,8 @@
         throws ProviderException
     {
         AttributeValueAssertion l_ava = new AttributeValueAssertion() ;
-        l_ava.attributeDesc = StringUtils.getBytesUtf8( a_node.getAttribute() ) ;
-        l_ava.assertionValue = StringUtils.getBytesUtf8( a_node.getValue() );
+        l_ava.attributeDesc = StringTools.getBytesUtf8( a_node.getAttribute() ) ;
+        l_ava.assertionValue = StringTools.getBytesUtf8( a_node.getValue() );
 
         return l_ava ;
     }
@@ -343,7 +343,7 @@
             case( LeafNode.PRESENCE ):
                 a_filter.choiceId = Filter.PRESENT_CID ;
                 a_filter.present =
-                    StringUtils.getBytesUtf8( ( ( PresenceNode ) a_node ).getAttribute()
) ;
+                    StringTools.getBytesUtf8( ( ( PresenceNode ) a_node ).getAttribute()
) ;
                 break ;
             case( LeafNode.SUBSTRING ):
                 a_filter.choiceId = Filter.SUBSTRINGS_CID ;



Mime
View raw message