svn commit: rev 45862 - in avalon/trunk/runtime: . activation/impl/src/java/org/apache/avalon/activation/impl framework/api/src/java/org/apache/avalon/framework framework/api/src/test/org/apache/avalon/framework/test meta/impl/src/test/org/apache/avalon/meta/classic meta/impl/src/test/org/apache/avalon/meta/compat meta/impl/src/test/org/apache/avalon/meta/legacy

Author: niclas
Date: Fri Sep 10 20:16:39 2004
New Revision: 45862

Added:
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/TestClass.java
      - copied, changed from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/Test.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/TestClass.xinfo
      - copied unchanged from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/Test.xinfo
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/TestClass.java
      - copied, changed from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/Test.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/TestClass.xinfo
      - copied unchanged from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/Test.xinfo
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/TestClass.java
      - copied, changed from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/Test.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/TestClass.xinfo
      - copied unchanged from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/Test.xinfo
Removed:
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/Test.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/Test.xinfo
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/Test.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/Test.xinfo
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/Test.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/Test.xinfo
Modified:
   avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/ApplianceInvocationHandler.java
   avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/Enum.java
   avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/ValuedEnum.java
   avalon/trunk/runtime/framework/api/src/test/org/apache/avalon/framework/test/ValuedEnumTestCase.java
   avalon/trunk/runtime/index.xml
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/ClassicTestCase.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/CompatTestCase.java
   avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/LegacyTestCase.java
Log:


Modified: avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/ApplianceInvocationHandler.java
==============================================================================
--- avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/ApplianceInvocationHandler.java	(original)
+++ avalon/trunk/runtime/activation/impl/src/java/org/apache/avalon/activation/impl/ApplianceInvocationHandler.java	Fri Sep 10 20:16:39 2004
@@ -70,7 +70,7 @@
     * @param appliance the runtime appliance
     * @param logger the assigned logging channel 
     */
-    protected ApplianceInvocationHandler( 
+    ApplianceInvocationHandler( 
       DefaultAppliance appliance, Logger logger, boolean secure )
     {
         assertNotNull( appliance, "appliance" ); 

Modified: avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/Enum.java
==============================================================================
--- avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/Enum.java	(original)
+++ avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/Enum.java	Fri Sep 10 20:16:39 2004
@@ -119,7 +119,7 @@
      * @param o the other object
      * @return the equality status
      */
-    public final boolean equals( Object o )
+    public boolean equals( Object o )
     {
         if( this == o )
             return true;

Modified: avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/ValuedEnum.java
==============================================================================
--- avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/ValuedEnum.java	(original)
+++ avalon/trunk/runtime/framework/api/src/java/org/apache/avalon/framework/ValuedEnum.java	Fri Sep 10 20:16:39 2004
@@ -185,6 +185,35 @@
     }
 
     /**
+     * Tests for equality. Two Enum:s are considered equal
+     * if they are of the same class, have the same name, and same value.
+     *
+     * @param o the other object
+     * @return the equality status
+     */
+    public boolean equals( Object o )
+    {
+        boolean prelim = super.equals( o );
+        if( ! prelim )
+            return false;
+            
+        if( !(o instanceof ValuedEnum) )
+            return false;
+
+        final ValuedEnum enumerated = (ValuedEnum) o;
+        return m_value == enumerated.m_value;
+    }
+    
+    public int hashCode()
+    {
+        int hash = super.hashCode();
+        hash ^= m_value;
+        hash >>>= (m_value & 31 );
+        return hash;
+    }
+    
+    
+    /**
      * Override toString method to produce human readable description.
      *
      * @return String in the form <code>type[name=value]</code>, eg.:

Modified: avalon/trunk/runtime/framework/api/src/test/org/apache/avalon/framework/test/ValuedEnumTestCase.java
==============================================================================
--- avalon/trunk/runtime/framework/api/src/test/org/apache/avalon/framework/test/ValuedEnumTestCase.java	(original)
+++ avalon/trunk/runtime/framework/api/src/test/org/apache/avalon/framework/test/ValuedEnumTestCase.java	Fri Sep 10 20:16:39 2004
@@ -37,6 +37,7 @@
         public static final Color RED_NEGATIVE = new Color( "Red", -1 );
         public static final Color GREEN = new Color( "Green", 1 );
         public static final Color BLUE = new Color( "Blue", 2 );
+        public static final Color FAKE_BLUE = new Color( "Blue", 3 );
 
         public Color( final String color, final int value )
         {
@@ -95,6 +96,8 @@
         assertTrue( Color.GREEN.equals( Color.GREEN ) );
         assertTrue( Color.BLUE.equals( Color.BLUE ) );
 
+        assertTrue( ! Color.BLUE.equals( Color.FAKE_BLUE ) );
+        
         assertTrue( !OtherColor.RED.equals( Color.RED ) );
         assertTrue( !OtherColor.GREEN.equals( Color.GREEN ) );
         assertTrue( !OtherColor.BLUE.equals( Color.BLUE ) );
@@ -112,12 +115,13 @@
         assertTrue( new Color(null,0).equals( new Color( null,0 ) ) );
         assertFalse( new Color(null,0).equals( new Color( "hi",0 ) ) );
         assertFalse( new Color("hi",0).equals( new Color( null,0 ) ) );
-
+/*
         // todo: is this _really_ desired?
         assertTrue( Color.RED.equals( Color.RED_NEGATIVE ) );
         assertTrue( Color.RED_NEGATIVE.equals( Color.RED ) );
         assertTrue( OtherColor.RED.equals( OtherColor.RED_NEGATIVE ) );
         assertTrue( OtherColor.RED_NEGATIVE.equals( OtherColor.RED ) );
+*/        
     }
 
     public void testHashCode()
@@ -126,6 +130,8 @@
         assertTrue( Color.GREEN.hashCode() ==  Color.GREEN.hashCode() );
         assertTrue( Color.BLUE.hashCode() ==  Color.BLUE.hashCode() );
 
+        assertTrue( Color.BLUE.hashCode() !=  Color.FAKE_BLUE.hashCode() );
+        
         assertTrue( OtherColor.RED.hashCode() !=  Color.RED.hashCode() );
         assertTrue( OtherColor.GREEN.hashCode() !=  Color.GREEN.hashCode() );
         assertTrue( OtherColor.BLUE.hashCode() !=  Color.BLUE.hashCode() );
@@ -139,10 +145,12 @@
         assertTrue( Color.BLUE.hashCode() !=  Color.RED.hashCode() );
 
         // todo: is this _really_ desired?
+/*        
         assertTrue( Color.RED.hashCode() ==Color.RED_NEGATIVE.hashCode() );
         assertTrue( Color.RED_NEGATIVE.hashCode() ==Color.RED.hashCode() );
         assertTrue( OtherColor.RED.hashCode() ==OtherColor.RED_NEGATIVE.hashCode() );
         assertTrue( OtherColor.RED_NEGATIVE.hashCode() ==OtherColor.RED.hashCode() );
+*/        
     }
 
     public void testGet()

Modified: avalon/trunk/runtime/index.xml
==============================================================================
--- avalon/trunk/runtime/index.xml	(original)
+++ avalon/trunk/runtime/index.xml	Fri Sep 10 20:16:39 2004
@@ -53,7 +53,7 @@
     <info>
       <group>qdox</group>
       <name>qdox</name>
-      <version>1.3</version>
+      <version>1.4</version>
       <type>jar</type>
     </info>
   </resource>

Modified: avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/ClassicTestCase.java
==============================================================================
--- avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/ClassicTestCase.java	(original)
+++ avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/ClassicTestCase.java	Fri Sep 10 20:16:39 2004
@@ -39,7 +39,7 @@
     {
         TypeBuilder builder = new TypeBuilder();
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        Class clazz = loader.loadClass( "org.apache.avalon.meta.classic.Test" );
+        Class clazz = loader.loadClass( "org.apache.avalon.meta.classic.TestClass" );
         m_type = builder.buildType( clazz );
     }
 
@@ -56,6 +56,6 @@
     public void testClassName() throws Exception
     {
         assertTrue( 
-          m_type.getInfo().getClassname().equals( "org.apache.avalon.meta.classic.Test" ) );
+          m_type.getInfo().getClassname().equals( "org.apache.avalon.meta.classic.TestClass" ) );
     }
 }

Copied: avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/TestClass.java (from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/Test.java)
==============================================================================
--- avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/Test.java	(original)
+++ avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/classic/TestClass.java	Fri Sep 10 20:16:39 2004
@@ -17,6 +17,6 @@
 
 package org.apache.avalon.meta.classic;
 
-public class Test
+public class TestClass
 {
 }

Modified: avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/CompatTestCase.java
==============================================================================
--- avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/CompatTestCase.java	(original)
+++ avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/CompatTestCase.java	Fri Sep 10 20:16:39 2004
@@ -39,7 +39,7 @@
     {
         TypeBuilder builder = new TypeBuilder();
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        Class clazz = loader.loadClass( "org.apache.avalon.meta.compat.Test" );
+        Class clazz = loader.loadClass( "org.apache.avalon.meta.compat.TestClass" );
         m_type = builder.buildType( clazz );
     }
 
@@ -56,6 +56,6 @@
     public void testClassName() throws Exception
     {
         assertTrue( 
-          m_type.getInfo().getClassname().equals( "org.apache.avalon.meta.compat.Test" ) );
+          m_type.getInfo().getClassname().equals( "org.apache.avalon.meta.compat.TestClass" ) );
     }
 }

Copied: avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/TestClass.java (from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/Test.java)
==============================================================================
--- avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/Test.java	(original)
+++ avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/compat/TestClass.java	Fri Sep 10 20:16:39 2004
@@ -17,6 +17,6 @@
 
 package org.apache.avalon.meta.compat;
 
-public class Test
+public class TestClass
 {
 }

Modified: avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/LegacyTestCase.java
==============================================================================
--- avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/LegacyTestCase.java	(original)
+++ avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/LegacyTestCase.java	Fri Sep 10 20:16:39 2004
@@ -39,13 +39,13 @@
     {
         TypeBuilder builder = new TypeBuilder();
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-        Class clazz = loader.loadClass( "org.apache.avalon.meta.legacy.Test" );
+        Class clazz = loader.loadClass( "org.apache.avalon.meta.legacy.TestClass" );
         m_type = builder.buildType( clazz );
     }
 
     public void testName() throws Exception
     {
-        assertTrue( m_type.getInfo().getName().equals( "test" ) );
+        assertTrue( m_type.getInfo().getName().equals( "testclass" ) );
     }
 
     public void testLifestyle() throws Exception
@@ -56,6 +56,6 @@
     public void testClassName() throws Exception
     {
         assertTrue( 
-          m_type.getInfo().getClassname().equals( "org.apache.avalon.meta.legacy.Test" ) );
+          m_type.getInfo().getClassname().equals( "org.apache.avalon.meta.legacy.TestClass" ) );
     }
 }

Copied: avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/TestClass.java (from rev 43650, avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/Test.java)
==============================================================================
--- avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/Test.java	(original)
+++ avalon/trunk/runtime/meta/impl/src/test/org/apache/avalon/meta/legacy/TestClass.java	Fri Sep 10 20:16:39 2004
@@ -17,6 +17,6 @@
 
 package org.apache.avalon.meta.legacy;
 
-public class Test
+public class TestClass
 {
 }