svn commit: r369082 - /beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/MutableURI.java

[ek...@apache.org]

Author: ekoneil
Date: Sat Jan 14 11:17:30 2006
New Revision: 369082

URL: http://svn.apache.org/viewcvs?rev=369082&view=rev
Log:
Remove a block of commented out code that should have been removed in my last checkin.

BB: self
Test: NetUI DRT pass


Modified:
    beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/MutableURI.java

Modified: beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/MutableURI.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/MutableURI.java?rev=369082&r1=369081&r2=369082&view=diff
==============================================================================
--- beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/MutableURI.java (original)
+++ beehive/trunk/netui/src/core/org/apache/beehive/netui/core/urls/MutableURI.java Sat Jan 14 11:17:30 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -714,19 +714,15 @@
     }
 
     /**
-     * Returns an unmodifiable Map of all parameters.
+     * Returns an unmodifiable {@link Map} of all parameters.
      *
      * @return an unmodifiable {@link java.util.Map} of names and values for all parameters
      */
     public Map/*< String, List< String > >*/ getParameters()
     {
-        if(_parameters == null || !_parameters.hasParameters()) {
-            /* return an unmodifiable map */
+        if(_parameters == null || !_parameters.hasParameters())
             return Collections.EMPTY_MAP;
-        }
-        else {
-            return _parameters.getParameters();
-        }
+        else return _parameters.getParameters();
     }
 
     /**
@@ -1026,14 +1022,6 @@
         {
             if(_parameters == testURI._parameters || _parameters != null && _parameters.equals(testURI._parameters))
                 return true;
-/*
-            Map params = getParameters();
-            Map testParams = testURI.getParameters();
-
-            if ( params == testParams || ( params != null && params.equals( testParams ) ) ) {
-                return true;
-            }
-*/
         }
 
         return false;
@@ -1246,7 +1234,7 @@
      */
     private static class QueryParameters {
 
-        /* todo: could probably invent a more complex but faster data structure to store these */
+        /* todo: could probably use a more complex yet faster data structure to store Parameter objects */
         /**
          * The list of query parameters, maintained in FIFO order.
          */
@@ -1383,7 +1371,7 @@
        }
 
        public int hashCode() {
-           return (_orderedQueryParameters != null ? _orderedQueryParameters.hashCode() : 0);
+           return _orderedQueryParameters != null ? _orderedQueryParameters.hashCode() : 0;
        }
 
        /**