directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1485500 - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/ ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/ ldap/co...
Date Wed, 22 May 2013 23:24:29 GMT
Author: elecharny
Date: Wed May 22 23:24:28 2013
New Revision: 1485500

URL: http://svn.apache.org/r1485500
Log:
Removed commented code

Modified:
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java
    directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
    directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
    directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/ActionTime.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/LdapUriException.java
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java
    directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
(original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/ParserUtils.java
Wed May 22 23:24:28 2013
@@ -94,7 +94,7 @@ public final class ParserUtils
     {
         String type = null;
         int nbAttributes = xpp.getAttributeCount();
-        
+
         for ( int i = 0; i < nbAttributes; i++ )
         {
             // Checking if the attribute 'type' from XML Schema Instance namespace is used.
@@ -105,7 +105,7 @@ public final class ParserUtils
                 break;
             }
         }
-        
+
         return type;
     }
 
@@ -123,11 +123,11 @@ public final class ParserUtils
         {
             return false;
         }
-        
+
         // We are looking for something that should look like that: "aNameSpace:base64Binary"
         // We split the String. The first element should be the namespace prefix and the
second "base64Binary"
         String[] splitedString = attrValue.split( ":" );
-        
+
         return ( splitedString.length == 2 ) && ( XML_SCHEMA_URI.equals( parser.getNamespace(
splitedString[0] ) ) )
             && ( BASE64BINARY.equals( splitedString[1] ) );
     }
@@ -141,14 +141,14 @@ public final class ParserUtils
      */
     public static boolean needsBase64Encoding( Object value )
     {
-        if( value instanceof StringValue )
+        if ( value instanceof StringValue )
         {
             return false;
         }
-        else if( value instanceof BinaryValue )
+        else if ( value instanceof BinaryValue )
         {
             return false;
-        } 
+        }
         else if ( value instanceof byte[] )
         {
             return true;
@@ -157,7 +157,7 @@ public final class ParserUtils
         {
             return !LdifUtils.isLDIFSafe( ( String ) value );
         }
-        
+
         return true;
     }
 
@@ -236,7 +236,7 @@ public final class ParserUtils
                 }
 
                 byte[] value;
-                
+
                 if ( control instanceof CodecControl<?> )
                 {
                     value = ( ( org.apache.directory.api.ldap.codec.api.CodecControl<?>
) control ).getValue();
@@ -299,7 +299,7 @@ public final class ParserUtils
         // load the transformer using JAXP
         TransformerFactory factory = TransformerFactory.newInstance();
         Transformer transformer = null;
-        
+
         try
         {
             transformer = factory.newTransformer( new StreamSource( ParserUtils.class
@@ -315,7 +315,7 @@ public final class ParserUtils
         // now lets style the given document
         DocumentSource source = new DocumentSource( document );
         DocumentResult result = new DocumentResult();
-        
+
         try
         {
             transformer.transform( source, result );
@@ -330,8 +330,7 @@ public final class ParserUtils
         Document transformedDoc = result.getDocument();
         return transformedDoc;
     }
-    
-    
+
     /**
      * GrammarAction that reads the SOAP header data
      */
@@ -370,8 +369,6 @@ public final class ParserUtils
 
                 // change the state to header end
                 container.setState( Dsmlv2StatesEnum.SOAP_HEADER_END_TAG );
-
-                //System.out.println( sb );
             }
             catch ( IOException e )
             {
@@ -380,5 +377,5 @@ public final class ParserUtils
 
         }
     };
-    
+
 }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java
(original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/api/dsmlv2/request/AddRequestDsml.java
Wed May 22 23:24:28 2013
@@ -198,7 +198,6 @@ public class AddRequestDsml
      */
     public void initEntry()
     {
-        //( ( AddRequest ) getDecoratedMessage() ).initEntry();
     }
 
 

Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Wed May 22 23:24:28 2013
@@ -509,12 +509,6 @@ public class LdapNetworkConnection exten
                 addSslFilter();
             }
 
-            // Add an executor so that this connection can be used
-            // for handling more than one request (mainly because
-            // we may have to handle some abandon request)
-            /*connector.getFilterChain().addLast( "executor",
-                new ExecutorFilter( new OrderedThreadPoolExecutor( 10 ), IoEventType.MESSAGE_RECEIVED
) );*/
-
             // Inject the protocolHandler
             connector.setHandler( this );
         }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/api/LdapConstants.java
Wed May 22 23:24:28 2013
@@ -166,51 +166,4 @@ public final class LdapConstants
     public static final int APPROX_MATCH_FILTER_TAG = 0xA8;
 
     public static final int EXTENSIBLE_MATCH_FILTER_TAG = 0xA9;
-
-    // The messages types
-    /*
-    public static final int ABANDON_REQUEST = 0;
-
-    public static final int ADD_REQUEST = 1;
-
-    public static final int ADD_RESPONSE = 2;
-
-    public static final int BIND_REQUEST = 3;
-
-    public static final int BIND_RESPONSE = 4;
-
-    public static final int COMPARE_REQUEST = 5;
-
-    public static final int COMPARE_RESPONSE = 6;
-
-    public static final int DEL_REQUEST = 7;
-
-    public static final int DEL_RESPONSE = 8;
-
-    public static final int EXTENDED_REQUEST = 9;
-
-    public static final int EXTENDED_RESPONSE = 10;
-
-    public static final int MODIFYDN_REQUEST = 11;
-
-    public static final int MODIFYDN_RESPONSE = 12;
-
-    public static final int MODIFY_REQUEST = 13;
-
-    public static final int MODIFY_RESPONSE = 14;
-
-    public static final int SEARCH_REQUEST = 15;
-
-    public static final int SEARCH_RESULT_DONE = 16;
-
-    public static final int SEARCH_RESULT_ENTRY = 17;
-
-    public static final int SEARCH_RESULT_REFERENCE = 18;
-
-    public static final int UNBIND_REQUEST = 19;
-    
-    public static final int INTERMEDIATE_RESPONSE = 20;
-
-    public static final int UNKNOWN = -1; // Just in case ...
-    */
 }

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
(original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/api/ldap/codec/osgi/DefaultLdapCodecService.java
Wed May 22 23:24:28 2013
@@ -338,23 +338,6 @@ public class DefaultLdapCodecService imp
     public javax.naming.ldap.ExtendedResponse toJndi( final ExtendedResponse modelResponse
) throws EncoderException
     {
         throw new NotImplementedException( "Figure out how to transform" );
-        //        final byte[] encodedValue = new byte[ modelResponse.getEncodedValue().length
];
-        //        System.arraycopy( modelResponse.getEncodedValue(), 0, encodedValue, 0,
modelResponse.getEncodedValue().length );
-        //        
-        //        return new javax.naming.ldap.ExtendedResponse()
-        //        {
-        //            private static final long serialVersionUID = 2955142105375495493L;
-        //
-        //            public String getID()
-        //            {
-        //                return modelResponse.getID();
-        //            }
-        //
-        //            public byte[] getEncodedValue()
-        //            {
-        //                return encodedValue;
-        //            }
-        //        };
     }
 
 
@@ -364,25 +347,6 @@ public class DefaultLdapCodecService imp
     public ExtendedResponse fromJndi( javax.naming.ldap.ExtendedResponse jndiResponse ) throws
DecoderException
     {
         throw new NotImplementedException( "Figure out how to transform" );
-        //        ExtendedResponse modelResponse;
-        //        ExtendedRequestFactory<?,?> extendedRequestFactory = extReqFactories.get(
jndiResponse.getID() );
-        //        UnsolicitedResponseFactory<?> unsolicitedResponseFactory = unsolicitedFactories.get(
jndiResponse.getID() );
-        //        
-        //        if ( unsolicitedResponseFactory != null )
-        //        {
-        //            modelResponse = unsolicitedResponseFactory.newResponse( jndiResponse.getEncodedValue()
);
-        //        }
-        //        else if ( extendedRequestFactory != null )
-        //        {
-        //            modelResponse = extendedRequestFactory.newResponse( jndiResponse.getEncodedValue()
);
-        //        }
-        //        else
-        //        {
-        //            modelResponse = new ExtendedResponseImpl( jndiResponse.getID() );
-        //            modelResponse.setResponseValue( jndiResponse.getEncodedValue() );
-        //        }
-        //        
-        //        return modelResponse;
     }
 
 

Modified: directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
(original)
+++ directory/shared/trunk/ldap/codec/standalone/src/main/java/org/apache/directory/api/ldap/codec/standalone/StandaloneLdapApiService.java
Wed May 22 23:24:28 2013
@@ -168,12 +168,6 @@ public class StandaloneLdapApiService im
         // Load the extended operations
         loadExtendedOperations();
 
-        // Load the schema elements
-        //loadSchemaElements();
-
-        // Load the network layer
-        //loadNetworkLayer()
-
         if ( protocolCodecFactory == null )
         {
             try

Modified: directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/ActionTime.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/ActionTime.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/ActionTime.java
(original)
+++ directory/shared/trunk/ldap/extras/trigger/src/main/java/org/apache/directory/api/ldap/trigger/ActionTime.java
Wed May 22 23:24:28 2013
@@ -29,13 +29,9 @@ package org.apache.directory.api.ldap.tr
  */
 public final class ActionTime
 {
-    //public static final ActionTime BEFORE = new ActionTime( "BEFORE" );
-
     /** The AFTER instance. */
     public static final ActionTime AFTER = new ActionTime( "AFTER" );
 
-    //public static final ActionTime INSTEADOF = new ActionTime( "INSTEADOF" );
-
     /** The name. */
     private final String name;
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/entry/DefaultEntry.java
Wed May 22 23:24:28 2013
@@ -516,21 +516,6 @@ public final class DefaultEntry implemen
     {
         h = 37;
         h = h * 17 + dn.hashCode();
-
-        /*
-        // We have to sort the Attributes if we want to compare two entries
-        SortedMap<String, EntryAttribute> sortedMap = new TreeMap<String, EntryAttribute>();
-
-        for ( String id:attributes.keySet() )
-        {
-            sortedMap.put( id, attributes.get( id ) );
-        }
-
-        for ( String id:sortedMap.keySet() )
-        {
-            h = h*17 + sortedMap.get( id ).hashCode();
-        }
-        */
     }
 
 

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/LdapUriException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/LdapUriException.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/LdapUriException.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/exception/LdapUriException.java
Wed May 22 23:24:28 2013
@@ -49,25 +49,6 @@ public class LdapUriException extends Ld
     public static final int UNKNOWN = 0;
 
     /**
-     * The URI parsing error.
-     */
-    // public static final int PARSING = 1;
-
-    /**
-     * The unsupported character encoding.
-     */
-    // public static final int UNSUPPORTED_ENCODING = 2;
-
-    /**
-     * The URI escape encoding and decoding error.
-     */
-    // public static final int ESCAPING = 3;
-
-    /**
-     * The DNS punycode encoding or decoding error.
-     */
-    // public static final int PUNYCODE = 4;
-    /**
      * The reason code.
      */
     protected int reasonCode;

Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
(original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
Wed May 22 23:24:28 2013
@@ -172,18 +172,6 @@ public class DefaultAttributeTypeRegistr
 
         // Add the current type as a descendant
         descendants.add( attributeType );
-
-        /*
-        try
-        {
-            // And recurse until we reach the top of the hierarchy
-            registerDescendants( attributeType, ancestor.getSuperior() );
-        }
-        catch ( LdapException ne )
-        {
-            throw new NoSuchAttributeException( ne.getMessage() );
-        }
-        */
     }
 
 
@@ -210,18 +198,6 @@ public class DefaultAttributeTypeRegistr
                 oidToDescendantSet.remove( ancestor.getOid() );
             }
         }
-
-        /*
-        try
-        {
-            // And recurse until we reach the top of the hierarchy
-            unregisterDescendants( attributeType, ancestor.getSuperior() );
-        }
-        catch ( LdapException ne )
-        {
-            throw new NoSuchAttributeException( ne.getMessage() );
-        }
-        */
     }
 
 

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java
(original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemaextractor/impl/DefaultSchemaLdifExtractor.java
Wed May 22 23:24:28 2013
@@ -30,9 +30,9 @@ import java.io.InvalidObjectException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Stack;
 import java.util.UUID;
-import java.util.Map.Entry;
 import java.util.regex.Pattern;
 
 import org.apache.directory.api.i18n.I18n;
@@ -324,23 +324,6 @@ public class DefaultSchemaLdifExtractor 
             parent = parent.getParentFile();
         }
 
-        /*
-
-           this seems retarded so I replaced it for now with what is below it
-           will not break from loop above unless parent == null so the if is
-           never executed - just the else is executed every time
-
-        if ( parent != null )
-        {
-            return assembleDestinationFile( fileComponentStack );
-        }
-        else
-        {
-            throw new IllegalStateException( "parent cannot be null" );
-        }
-        
-        */
-
         throw new IllegalStateException( I18n.err( I18n.ERR_08006 ) );
     }
 

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java
(original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schemamanager/impl/DefaultSchemaManager.java
Wed May 22 23:24:28 2013
@@ -266,9 +266,6 @@ public class DefaultSchemaManager implem
         {
             throw new LdapOtherException( ioe.getMessage() );
         }
-
-        // TODO Add some listener handling at this point
-        //notifyListenerOrRegistries( schema, registries );
     }
 
 

Modified: directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java?rev=1485500&r1=1485499&r2=1485500&view=diff
==============================================================================
--- directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java
(original)
+++ directory/shared/trunk/util/src/main/java/org/apache/directory/api/util/SequencedHashMap.java
Wed May 22 23:24:28 2013
@@ -91,7 +91,7 @@ public class SequencedHashMap implements
         Entry prev = null;
 
 
-        public Entry(Object key, Object value)
+        public Entry( Object key, Object value )
         {
             this.key = key;
             this.value = value;
@@ -138,12 +138,12 @@ public class SequencedHashMap implements
             {
                 return false;
             }
-            
+
             if ( obj == this )
             {
                 return true;
             }
-            
+
             if ( !( obj instanceof Map.Entry ) )
             {
                 return false;
@@ -216,7 +216,7 @@ public class SequencedHashMap implements
      *            the initial size for the hash table
      * @see HashMap#HashMap(int)
      */
-    public SequencedHashMap(int initialSize)
+    public SequencedHashMap( int initialSize )
     {
         sentinel = createSentinel();
         entries = new HashMap( initialSize );
@@ -233,7 +233,7 @@ public class SequencedHashMap implements
      *            the load factor for the hash table.
      * @see HashMap#HashMap(int,float)
      */
-    public SequencedHashMap(int initialSize, float loadFactor)
+    public SequencedHashMap( int initialSize, float loadFactor )
     {
         sentinel = createSentinel();
         entries = new HashMap( initialSize, loadFactor );
@@ -245,7 +245,7 @@ public class SequencedHashMap implements
      * specified map. The order in which the mappings in the specified map are
      * added is defined by {@link #putAll(Map)}.
      */
-    public SequencedHashMap(Map m)
+    public SequencedHashMap( Map m )
     {
         this();
         putAll( m );
@@ -355,7 +355,7 @@ public class SequencedHashMap implements
     {
         // find entry for the specified key object
         Entry entry = ( Entry ) entries.get( o );
-        
+
         if ( entry == null )
         {
             return null;
@@ -579,15 +579,15 @@ public class SequencedHashMap implements
     private Entry removeImpl( Object key )
     {
         Entry e = ( Entry ) entries.remove( key );
-        
+
         if ( e == null )
         {
             return null;
         }
-        
+
         modCount++;
         removeEntry( e );
-        
+
         return e;
     }
 
@@ -639,7 +639,7 @@ public class SequencedHashMap implements
         {
             return false;
         }
-        
+
         if ( obj == this )
         {
             return true;
@@ -675,19 +675,19 @@ public class SequencedHashMap implements
     {
         StringBuffer buf = new StringBuffer();
         buf.append( '[' );
-        
+
         for ( Entry pos = sentinel.next; pos != sentinel; pos = pos.next )
         {
             buf.append( pos.getKey() );
             buf.append( '=' );
             buf.append( pos.getValue() );
-            
+
             if ( pos.next != sentinel )
             {
                 buf.append( ',' );
             }
         }
-        
+
         buf.append( ']' );
 
         return buf.toString();
@@ -833,7 +833,7 @@ public class SequencedHashMap implements
                 {
                     return null;
                 }
-                
+
                 if ( !( o instanceof Map.Entry ) )
                 {
                     return null;
@@ -841,7 +841,7 @@ public class SequencedHashMap implements
 
                 Map.Entry e = ( Map.Entry ) o;
                 Entry entry = ( Entry ) entries.get( e.getKey() );
-                
+
                 if ( entry != null && entry.equals( e ) )
                 {
                     return entry;
@@ -863,7 +863,7 @@ public class SequencedHashMap implements
             public boolean remove( Object o )
             {
                 Entry e = findEntry( o );
-                
+
                 if ( e == null )
                 {
                     return false;
@@ -941,20 +941,10 @@ public class SequencedHashMap implements
          * specified by <code>returnType</code> which must be either KEY,
          * VALUE, or ENTRY.
          */
-        public OrderedIterator(int returnType)
+        public OrderedIterator( int returnType )
         {
-            // // Since this is a private inner class, nothing else should have
-            // // access to the constructor. Since we know the rest of the outer
-            // // class uses the iterator correctly, we can leave of the
-            // following
-            // // check:
-            // if(returnType >= 0 && returnType <= 2) {
-            // throw new IllegalArgumentException("Invalid iterator type");
-            // }
-
             // Set the "removed" bit so that the iterator starts in a state
-            // where
-            // "next" must be called before "remove" will succeed.
+            // where "next" must be called before "remove" will succeed.
             this.returnType = returnType | REMOVED_MASK;
         }
 



Mime
View raw message