directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r359095 - in /directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber: Asn1Decoder.java grammar/AbstractGrammar.java tlv/Value.java
Date Mon, 26 Dec 2005 20:34:02 GMT
Author: elecharny
Date: Mon Dec 26 12:33:55 2005
New Revision: 359095

URL: http://svn.apache.org/viewcvs?rev=359095&view=rev
Log:
Updated the code after having renamed StringUtils to Asn1StringUtils

Modified:
    directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
    directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java
    directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/tlv/Value.java

Modified: directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
URL: http://svn.apache.org/viewcvs/directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java?rev=359095&r1=359094&r2=359095&view=diff
==============================================================================
--- directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java (original)
+++ directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java Mon
Dec 26 12:33:55 2005
@@ -26,7 +26,7 @@
 import org.apache.asn1new.ber.tlv.Tag;
 import org.apache.asn1new.ber.tlv.UniversalTag;
 import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.asn1.codec.util.Asn1StringUtils;
 
 import org.apache.log4j.Logger;
 
@@ -228,7 +228,7 @@
         TLV current = container.getCurrentTLV();
         
         sb.append("TLV").
-        	append(StringUtils.dumpByte(current.getTag().getTagBytes()[0])).
+        	append(Asn1StringUtils.dumpByte(current.getTag().getTagBytes()[0])).
         	append("(").
         	append(current.getExpectedLength()).
         	append(")");
@@ -238,7 +238,7 @@
         while (current != null)
         {
             sb.append("-TLV").
-        		append(StringUtils.dumpByte(current.getTag().getTagBytes()[0])).
+        		append(Asn1StringUtils.dumpByte(current.getTag().getTagBytes()[0])).
         		append("(").
         		append(current.getExpectedLength()).
         		append(")");
@@ -410,7 +410,7 @@
 
                 if ( DEBUG )
                 {
-                    log.debug( "  current byte : " + StringUtils.dumpByte( octet ) );
+                    log.debug( "  current byte : " + Asn1StringUtils.dumpByte( octet ) );
                 }
 
                 length.incCurrentLength();
@@ -840,7 +840,7 @@
                 {
                     byte octet = stream.get(stream.position());
 
-                    log.debug( "  current byte : " + StringUtils.dumpByte( octet ) );
+                    log.debug( "  current byte : " + Asn1StringUtils.dumpByte( octet ) );
                 }
                 else
                 {

Modified: directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java
URL: http://svn.apache.org/viewcvs/directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java?rev=359095&r1=359094&r2=359095&view=diff
==============================================================================
--- directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java
(original)
+++ directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java
Mon Dec 26 12:33:55 2005
@@ -21,7 +21,7 @@
 import org.apache.asn1new.ber.containers.IAsn1Container;
 import org.apache.asn1new.ber.tlv.TLV;
 import org.apache.asn1new.ber.tlv.Tag;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.asn1.codec.util.Asn1StringUtils;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
@@ -167,7 +167,7 @@
                 {
                 	String errorMessage = "Bad transition from state " +
                         currentGrammar.getStatesEnum().getState( container.getCurrentGrammarType(),
-                            currentState ) + ", tag " + StringUtils.dumpByte( tag.getTagByte()
);
+                            currentState ) + ", tag " + Asn1StringUtils.dumpByte( tag.getTagByte()
);
                 	
                 	log.error( errorMessage );
                 	

Modified: directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/tlv/Value.java
URL: http://svn.apache.org/viewcvs/directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/tlv/Value.java?rev=359095&r1=359094&r2=359095&view=diff
==============================================================================
--- directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/tlv/Value.java (original)
+++ directory/asn1/trunk/new-ber/src/main/java/org/apache/asn1new/ber/tlv/Value.java Mon Dec
26 12:33:55 2005
@@ -18,7 +18,7 @@
 
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1new.primitives.OID;
-import org.apache.asn1.codec.util.StringUtils;
+import org.apache.asn1.codec.util.Asn1StringUtils;
 
 import java.io.Serializable;
 import java.nio.BufferOverflowException;
@@ -281,7 +281,7 @@
         {
             buffer.put( UniversalTag.OCTET_STRING_TAG );
             
-            byte[] value = StringUtils.getBytesUtf8( string );
+            byte[] value = Asn1StringUtils.getBytesUtf8( string );
             
             buffer.put( Length.getBytes( value.length ) );
     
@@ -457,7 +457,7 @@
         if ( data != null )
         {
             sb.append( '[' );
-            sb.append( StringUtils.dumpBytes( data ) );
+            sb.append( Asn1StringUtils.dumpBytes( data ) );
             sb.append( ']' );
         }
         else



Mime
View raw message