[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/component/AbstractDest...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb  8 11:54:42 2012
New Revision: 233

URL: http://svn.shibboleth.net/view/utilities?rev=233&view=rev
Log:
Add slightly more noise to the failures form AbstractDestructableInitializeableComponent
Change BasicParserPool to use a built in
Remove noise from QNameTest

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/component/AbstractDestructableInitializableComponent.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/component/AbstractDestructableInitializableComponent.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/component/AbstractDestructableInitializableComponent.java?rev=233&r1=232&r2=233&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/component/AbstractDestructableInitializableComponent.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/component/AbstractDestructableInitializableComponent.java Wed Feb  8 11:54:42 2012
@@ -80,7 +80,7 @@
                 throw new DestroyedComponentException("Component '" + trimmedId
                         + "' has already been destroyed and can no longer be used.");
             } else {
-                throw new DestroyedComponentException();
+                throw new DestroyedComponentException(this);
             }
         }
     }
@@ -103,7 +103,7 @@
                 throw new UninitializedComponentException("Component '" + trimmedId
                         + "' has not yet been initialized and so can not be used.");
             } else {
-                throw new UninitializedComponentException();
+                throw new UninitializedComponentException(this);
             }
         }
     }

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java?rev=233&r1=232&r2=233&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/BasicParserPool.java Wed Feb  8 11:54:42 2012
@@ -39,7 +39,6 @@
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
 import net.shibboleth.utilities.java.support.component.AbstractDestructableInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.component.DestroyedComponentException;
 import net.shibboleth.utilities.java.support.logic.Assert;
 
 import org.slf4j.Logger;
@@ -186,9 +185,7 @@
     /** Helper method to test class state. */
     private void checkInitializedNotDestroyed() {
         ifNotInitializedThrowUninitializedComponentException();
-        if (isDestroyed()) {
-            throw new DestroyedComponentException("Parser pool has been destroyed");
-        }        
+        ifDestroyedThrowDestroyedComponentException();
     }
 
     /** Helper method to test class state.

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java?rev=233&r1=232&r2=233&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/xml/QNameSupportTest.java Wed Feb  8 11:54:42 2012
@@ -44,26 +44,17 @@
     private static final String NAME_2 = "name2";
     
     private static final String NAME_3 = "name3";
-    
-    private static final String NAME_4 = "name4";
-    
+
     private static final String NAMESPACE_1 = "http://example.org/NameSpace1";
 
     private static final String NAMESPACE_2 = "http://example.org/NameSpace2";
 
-    private static final String NAMESPACE_3 = "http://example.org/NameSpace3";
-
-    private static final String NAMESPACE_4 = "http://example.org/NameSpace4";
 
     private static final String DEFAULT_NAMESPACE = "http://example.org/DefaultSpace";
 
     private static final String PREFIX_1 = "myns1";
 
     private static final String PREFIX_2 = "myns2";
-
-    private static final String PREFIX_3 = "myns3";
-
-    private static final String PREFIX_4 = "myns4";
 
     private ParserPool parserPool;
     private Element parent;