hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rola...@apache.org
Subject svn commit: r504209 - in /jakarta/httpcomponents/httpclient/trunk/src: examples/org/apache/http/examples/client/ examples/org/apache/http/examples/conn/ java/org/apache/http/conn/ java/org/apache/http/impl/conn/ test/org/apache/http/conn/
Date Tue, 06 Feb 2007 17:24:40 GMT
Author: rolandw
Date: Tue Feb  6 09:24:38 2007
New Revision: 504209

URL: http://svn.apache.org/viewvc?view=rev&rev=504209
Log:
renamed SchemeSet to SchemeRegistry

Added:
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeRegistry.java
      - copied, changed from r504181, jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeSet.java
Removed:
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeSet.java
Modified:
    jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteRequest.java
    jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
    jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
    jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
    jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
    jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
    jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java

Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteRequest.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteRequest.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteRequest.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/client/ClientExecuteRequest.java
Tue Feb  6 09:24:38 2007
@@ -49,7 +49,7 @@
 import org.apache.http.protocol.RequestUserAgent;
 
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.conn.PlainSocketFactory;
 import org.apache.http.conn.ClientConnectionManager;
@@ -147,7 +147,7 @@
         // Register the "http" protocol scheme, it is required
         // by the default operator to look up socket factories.
         SocketFactory sf = PlainSocketFactory.getSocketFactory();
-        SchemeSet.DEFAULT.register(new Scheme("http", sf, 80));
+        SchemeRegistry.DEFAULT.register(new Scheme("http", sf, 80));
 
         // Prepare parameters.
         // Since this example doesn't use the full core framework,

Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java
Tue Feb  6 09:24:38 2007
@@ -45,7 +45,7 @@
 import org.apache.http.protocol.HttpExecutionContext;
 
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.conn.PlainSocketFactory;
 import org.apache.http.conn.HostConfiguration;
@@ -84,7 +84,7 @@
      * The scheme set.
      * Instantiated in {@link #setup setup}.
      */
-    private static SchemeSet supportedSchemes;
+    private static SchemeRegistry supportedSchemes;
 
 
     /**
@@ -154,7 +154,7 @@
     private final static ClientConnectionManager createManager() {
 
         return new ThreadSafeClientConnManager(getParams()) {
-            //@@@ we need a better way to pass in the SchemeSet or operator
+            //@@@ need better way to pass in the SchemeRegistry or operator
             protected ClientConnectionOperator createConnectionOperator() {
                 return new DefaultClientConnectionOperator(supportedSchemes);
             }
@@ -170,7 +170,7 @@
 
         // Register the "http" protocol scheme, it is required
         // by the default operator to look up socket factories.
-        supportedSchemes = new SchemeSet();
+        supportedSchemes = new SchemeRegistry();
         SocketFactory sf = PlainSocketFactory.getSocketFactory();
         supportedSchemes.register(new Scheme("http", sf, 80));
 

Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java
Tue Feb  6 09:24:38 2007
@@ -45,7 +45,7 @@
 import org.apache.http.protocol.HttpExecutionContext;
 
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.conn.PlainSocketFactory;
 import org.apache.http.conn.ssl.SSLSocketFactory;
@@ -85,7 +85,7 @@
      * The scheme set.
      * Instantiated in {@link #setup setup}.
      */
-    private static SchemeSet supportedSchemes;
+    private static SchemeRegistry supportedSchemes;
 
 
     /**
@@ -181,7 +181,7 @@
     private final static ClientConnectionManager createManager() {
 
         return new ThreadSafeClientConnManager(getParams()) {
-            //@@@ we need a better way to pass in the SchemeSet or operator
+            //@@@ need better way to pass in the SchemeRegistry or operator
             protected ClientConnectionOperator createConnectionOperator() {
                 return new DefaultClientConnectionOperator(supportedSchemes);
             }
@@ -197,7 +197,7 @@
 
         // Register the "http" and "https" protocol schemes, they are
         // required by the default operator to look up socket factories.
-        supportedSchemes = new SchemeSet();
+        supportedSchemes = new SchemeRegistry();
         SocketFactory sf = PlainSocketFactory.getSocketFactory();
         supportedSchemes.register(new Scheme("http", sf, 80));
         sf = SSLSocketFactory.getSocketFactory();

Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
Tue Feb  6 09:24:38 2007
@@ -45,7 +45,7 @@
 import org.apache.http.protocol.HttpExecutionContext;
 
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.conn.PlainSocketFactory;
 import org.apache.http.conn.OperatedClientConnection;
@@ -82,7 +82,7 @@
      * The scheme set.
      * Instantiated in {@link #setup setup}.
      */
-    private static SchemeSet supportedSchemes;
+    private static SchemeRegistry supportedSchemes;
 
 
     /**
@@ -146,7 +146,7 @@
 
         // Register the "http" protocol scheme, it is required
         // by the default operator to look up socket factories.
-        supportedSchemes = new SchemeSet();
+        supportedSchemes = new SchemeRegistry();
         SocketFactory sf = PlainSocketFactory.getSocketFactory();
         supportedSchemes.register(new Scheme("http", sf, 80));
 

Modified: jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
Tue Feb  6 09:24:38 2007
@@ -45,7 +45,7 @@
 import org.apache.http.protocol.HttpExecutionContext;
 
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.conn.PlainSocketFactory;
 import org.apache.http.conn.ssl.SSLSocketFactory;
@@ -83,7 +83,7 @@
      * The scheme set.
      * Instantiated in {@link #setup setup}.
      */
-    private static SchemeSet supportedSchemes;
+    private static SchemeRegistry supportedSchemes;
 
 
     /**
@@ -178,7 +178,7 @@
 
         // Register the "http" and "https" protocol schemes, they are
         // required by the default operator to look up socket factories.
-        supportedSchemes = new SchemeSet();
+        supportedSchemes = new SchemeRegistry();
         SocketFactory sf = PlainSocketFactory.getSocketFactory();
         supportedSchemes.register(new Scheme("http", sf, 80));
         sf = SSLSocketFactory.getSocketFactory();

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/Scheme.java Tue
Feb  6 09:24:38 2007
@@ -40,7 +40,8 @@
 /**
  * Encapsulates specifics of a protocol scheme such as "http" or "https".
  * Schemes are identified by lowercase names.
- * Supported schemes are typically collected in a {@link SchemeSet SchemeSet}.
+ * Supported schemes are typically collected in a
+ * {@link SchemeRegistry SchemeRegistry}.
  *
  * <p>
  * For example, to configure support for "https://" URLs,
@@ -48,7 +49,7 @@
  * </p>
  * <pre>
  * Scheme https = new Scheme("https", new MySecureSocketFactory(), 443);
- * SchemeSet.DEFAULT.register(https);
+ * SchemeRegistry.DEFAULT.register(https);
  * </pre>
  *
  * @author <a href="mailto:rolandw at apache.org">Roland Weber</a>

Copied: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeRegistry.java
(from r504181, jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeSet.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeRegistry.java?view=diff&rev=504209&p1=jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeSet.java&r1=504181&p2=jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeRegistry.java&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeSet.java (original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/conn/SchemeRegistry.java
Tue Feb  6 09:24:38 2007
@@ -50,27 +50,27 @@
  *
  * @since 4.0
  */
-public final class SchemeSet {
+public final class SchemeRegistry {
 
     /**
-     * A default scheme set.
+     * A default scheme registry.
      * It is empty by default, but can be initialized by any application.
      * The default scheme set should only be used by applications that
      * know for sure that this class is NOT shared with any other applications.
      * For example a Servlet, Portlet or EJB should not rely on being the
      * only user of this class.
      */
-    public final static SchemeSet DEFAULT = new SchemeSet();
+    public final static SchemeRegistry DEFAULT = new SchemeRegistry();
 
 
-    /** The available schemes in this set. */
+    /** The available schemes in this registry. */
     private final Map registeredSchemes;
 
 
     /**
-     * Creates a new, empty scheme set.
+     * Creates a new, empty scheme registry.
      */
-    public SchemeSet() {
+    public SchemeRegistry() {
         registeredSchemes = Collections.synchronizedMap(new HashMap());
     }
 
@@ -115,7 +115,7 @@
 
 
     /**
-     * Registers a scheme in this set.
+     * Registers a scheme.
      * The scheme can later be retrieved by it's name
      * using {@link #getScheme getScheme} or {@link #get get}.
      *
@@ -134,7 +134,7 @@
 
 
     /**
-     * Unregisters a scheme from this set.
+     * Unregisters a scheme.
      *
      * @param name      the name of the scheme to unregister (in lowercase)
      *
@@ -163,5 +163,5 @@
     }
 
 
-} // class SchemeSet
+} // class SchemeRegistry
 

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
Tue Feb  6 09:24:38 2007
@@ -41,7 +41,7 @@
 import org.apache.http.protocol.HttpContext;
 
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.conn.SecureSocketFactory;
 import org.apache.http.conn.OperatedClientConnection;
@@ -51,7 +51,7 @@
 /**
  * Default implementation of a
  * {@link ClientConnectionOperator ClientConnectionOperator}.
- * It uses a {@link SchemeSet SchemeSet} to look up
+ * It uses a {@link SchemeRegistry SchemeRegistry} to look up
  * {@link SocketFactory SocketFactory} objects.
  *
  * @author <a href="mailto:rolandw at apache.org">Roland Weber</a>
@@ -67,12 +67,12 @@
 
 
     /** The scheme set for looking up socket factories. */
-    protected SchemeSet schemeSet;
+    protected SchemeRegistry schemeRegistry;
 
 
     /**
      * Creates a new client connection operator.
-     * Uses {@link SchemeSet#DEFAULT SchemeSet.DEFAULT}
+     * Uses {@link SchemeRegistry#DEFAULT SchemeRegistry.DEFAULT}
      * as the scheme set.
      */
     public DefaultClientConnectionOperator() {
@@ -83,10 +83,10 @@
      * Creates a new client connection operator for the given scheme set.
      *
      * @param schemes   the scheme set, or <code>null</code> to use
-     *                  {@link SchemeSet#DEFAULT SchemeSet.DEFAULT}
+     *                  {@link SchemeRegistry#DEFAULT SchemeRegistry.DEFAULT}
      */
-    public DefaultClientConnectionOperator(SchemeSet schemes) {
-        schemeSet = (schemes != null) ? schemes : SchemeSet.DEFAULT;
+    public DefaultClientConnectionOperator(SchemeRegistry schemes) {
+        schemeRegistry = (schemes != null) ? schemes : SchemeRegistry.DEFAULT;
     }
 
 
@@ -119,7 +119,7 @@
         InetAddress local = null;
         //@@@ TODO: deal with local address stuff (from context?)
 
-        final Scheme schm = schemeSet.getScheme(target.getSchemeName());
+        final Scheme schm = schemeRegistry.getScheme(target.getSchemeName());
         if (schm == null) {
             throw new IllegalArgumentException
                 ("Unknown scheme '" + target.getSchemeName() +
@@ -169,7 +169,7 @@
                 ("Connection must be open.");
         }
 
-        final Scheme schm = schemeSet.getScheme(target.getSchemeName());
+        final Scheme schm = schemeRegistry.getScheme(target.getSchemeName());
         if (schm == null) {
             throw new IllegalArgumentException
                 ("Unknown scheme '" + target.getSchemeName() +

Modified: jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/java/org/apache/http/impl/conn/DefaultHttpHostConnection.java
Tue Feb  6 09:24:38 2007
@@ -41,7 +41,7 @@
 import org.apache.http.conn.HttpConnectionManager;
 import org.apache.http.conn.HttpHostConnection;
 import org.apache.http.conn.Scheme;
-import org.apache.http.conn.SchemeSet;
+import org.apache.http.conn.SchemeRegistry;
 import org.apache.http.conn.SecureSocketFactory;
 import org.apache.http.conn.SocketFactory;
 import org.apache.http.impl.SocketHttpClientConnection;
@@ -131,7 +131,7 @@
         }
 
         // Determine the type of the connection
-        Scheme scheme = SchemeSet.DEFAULT.getScheme(host.getSchemeName());
+        Scheme scheme = SchemeRegistry.DEFAULT.getScheme(host.getSchemeName());
         SocketFactory socketFactory = scheme.getSocketFactory();
         boolean secure = (socketFactory instanceof SecureSocketFactory);
         boolean proxied = (proxyHost != null);
@@ -151,10 +151,10 @@
            port = scheme.getDefaultPort(); 
         }
         if (secure && proxied) {
-            scheme = SchemeSet.DEFAULT.getScheme("http");
+            scheme = SchemeRegistry.DEFAULT.getScheme("http");
             socketFactory = scheme.getSocketFactory();
         } else {
-            scheme = SchemeSet.DEFAULT.getScheme(target.getSchemeName());
+            scheme = SchemeRegistry.DEFAULT.getScheme(target.getSchemeName());
         }
         socketFactory = scheme.getSocketFactory();
         Socket socket = socketFactory.connectSocket(
@@ -194,7 +194,7 @@
             LOG.debug("Secure tunnel to " + host);
         }
         
-        Scheme scheme = SchemeSet.DEFAULT.getScheme(host.getSchemeName());
+        Scheme scheme = SchemeRegistry.DEFAULT.getScheme(host.getSchemeName());
         SocketFactory socketFactory = scheme.getSocketFactory();
         boolean secure = (socketFactory instanceof SecureSocketFactory);
         boolean proxied = (proxyHost != null);

Modified: jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java?view=diff&rev=504209&r1=504208&r2=504209
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/src/test/org/apache/http/conn/TestScheme.java
Tue Feb  6 09:24:38 2007
@@ -40,7 +40,7 @@
 import junit.framework.TestSuite;
 
 /**
- * Unit tests for {@link Scheme} and {@link SchemeSet}.
+ * Unit tests for {@link Scheme} and {@link SchemeRegistry}.
  *
  * @author <a href="mailto:rolandw at apache.org">Roland Weber</a>
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
@@ -108,7 +108,7 @@
     }
 
     public void testRegisterUnregister() {
-        SchemeSet schmset = new SchemeSet();
+        SchemeRegistry schmreg = new SchemeRegistry();
 
         Scheme http = new Scheme
             ("http", PlainSocketFactory.getSocketFactory(), 80);
@@ -117,18 +117,18 @@
         Scheme myhttp = new Scheme
             ("http", PlainSocketFactory.getSocketFactory(), 80);
 
-    	assertNull(schmset.register(myhttp));
-    	assertNull(schmset.register(https));
-    	assertSame(myhttp, schmset.register(http));
-    	assertSame(http, schmset.getScheme("http"));
-    	assertSame(https, schmset.getScheme("https"));
+    	assertNull(schmreg.register(myhttp));
+    	assertNull(schmreg.register(https));
+    	assertSame(myhttp, schmreg.register(http));
+    	assertSame(http, schmreg.getScheme("http"));
+    	assertSame(https, schmreg.getScheme("https"));
 
-    	schmset.unregister("http");
-    	schmset.unregister("https");
+    	schmreg.unregister("http");
+    	schmreg.unregister("https");
 
-        assertNull(schmset.get("http")); // get() does not throw exception
+        assertNull(schmreg.get("http")); // get() does not throw exception
     	try {
-            schmset.getScheme("http"); // getScheme() does throw exception
+            schmreg.getScheme("http"); // getScheme() does throw exception
             fail("IllegalStateException should have been thrown");
     	} catch (IllegalStateException ex) {
             // expected
@@ -137,9 +137,9 @@
 
 
     public void testIterator() {
-        SchemeSet schmset = new SchemeSet();
+        SchemeRegistry schmreg = new SchemeRegistry();
 
-        Iterator iter = schmset.getSchemeNames();
+        Iterator iter = schmreg.getSchemeNames();
         assertNotNull(iter);
         assertFalse(iter.hasNext());
 
@@ -148,10 +148,10 @@
         Scheme https = new Scheme
             ("https", SSLSocketFactory.getSocketFactory(), 443);
 
-    	schmset.register(http);
-    	schmset.register(https);
+    	schmreg.register(http);
+    	schmreg.register(https);
 
-        iter = schmset.getSchemeNames();
+        iter = schmreg.getSchemeNames();
         assertNotNull(iter);
         assertTrue(iter.hasNext());
 
@@ -167,10 +167,10 @@
         else
             fail("unexpected name in iterator: " + name);
 
-        assertNotNull(schmset.get(name));
+        assertNotNull(schmreg.get(name));
         iter.remove();
         assertTrue(iter.hasNext());
-        assertNull(schmset.get(name));
+        assertNull(schmreg.get(name));
 
         name = (String) iter.next();
         assertFalse(iter.hasNext());
@@ -183,31 +183,31 @@
             fail("unexpected name in iterator: " + name);
         }
 
-        assertNotNull(schmset.get(name));
+        assertNotNull(schmreg.get(name));
     }
 
     public void testIllegalRegisterUnregister() {
-        SchemeSet schmset = new SchemeSet();
+        SchemeRegistry schmreg = new SchemeRegistry();
         try {
-        	schmset.register(null);
+        	schmreg.register(null);
         	fail("IllegalArgumentException should have been thrown");
         } catch (IllegalArgumentException ex) {
         	// expected
         }
         try {
-        	schmset.unregister(null);
+        	schmreg.unregister(null);
         	fail("IllegalArgumentException should have been thrown");
         } catch (IllegalArgumentException ex) {
         	// expected
         }
         try {
-        	schmset.get(null);
+        	schmreg.get(null);
         	fail("IllegalArgumentException should have been thrown");
         } catch (IllegalArgumentException ex) {
         	// expected
         }
         try {
-        	schmset.getScheme(null);
+        	schmreg.getScheme(null);
         	fail("IllegalArgumentException should have been thrown");
         } catch (IllegalArgumentException ex) {
         	// expected



Mime
View raw message