svn commit: r424470 - in /maven/maven-1/core/trunk/src: java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java java/org/apache/maven/werkz/Goal.java test/java/org/apache/maven/werkz/ProjectTest.java

[aheritier]

Author: aheritier
Date: Fri Jul 21 14:55:19 2006
New Revision: 424470

URL: http://svn.apache.org/viewvc?rev=424470&view=rev
Log:
Avoid using == and != for Objects comparaisons

Modified:
    
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
    maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java
    
maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java

Modified: 
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
URL: 
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java?rev=424470&r1=424469&r2=424470&view=diff
==============================================================================
--- 
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
 (original)
+++ 
maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/GoalToJellyScriptHousingMapper.java
 Fri Jul 21 14:55:19 2006
@@ -512,7 +512,7 @@
         for ( Iterator i = goalPluginMap.keySet().iterator(); i.hasNext(); )
         {
             String goal = (String) i.next();
-            if ( goalPluginMap.get( goal ) == housing )
+            if ( goalPluginMap.get( goal ).equals( housing ) )
             {
                 i.remove();
                 goalProject.removeGoal( goal );

Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java
URL: 
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java?rev=424470&r1=424469&r2=424470&view=diff
==============================================================================
--- maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java 
(original)
+++ maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java Fri Jul 
21 14:55:19 2006
@@ -278,7 +278,7 @@
      */
     public void addPostGoalCallback( PostGoalCallback callback )
     {
-        if ( this.postGoalCallbacks == Collections.EMPTY_LIST )
+        if ( this.postGoalCallbacks.equals( Collections.EMPTY_LIST ) )
         {
             this.postGoalCallbacks = new ArrayList( 3 );
         }
@@ -317,7 +317,7 @@
      */
     public void addPreActionCallback( PreActionCallback callback )
     {
-        if ( this.preActionCallbacks == Collections.EMPTY_LIST )
+        if ( this.preActionCallbacks.equals( Collections.EMPTY_LIST ) )
         {
             this.preActionCallbacks = new ArrayList( 3 );
         }
@@ -356,7 +356,7 @@
      */
     public void addPostActionCallback( PostActionCallback callback )
     {
-        if ( this.postActionCallbacks == Collections.EMPTY_LIST )
+        if ( this.postActionCallbacks.equals( Collections.EMPTY_LIST ) )
         {
             this.postActionCallbacks = new ArrayList( 3 );
         }
@@ -414,7 +414,7 @@
     public void addPrecursor( Goal precursor )
         throws CyclicGoalChainException
     {
-        if ( this.precursors == Collections.EMPTY_LIST )
+        if ( this.precursors.equals( Collections.EMPTY_LIST ) )
         {
             this.precursors = new ArrayList();
         }
@@ -458,7 +458,7 @@
      */
     private void addInternalPostcursor( Goal postcursor )
     {
-        if ( this.postcursors == Collections.EMPTY_LIST )
+        if ( this.postcursors.equals( Collections.EMPTY_LIST ) )
         {
             this.postcursors = new ArrayList();
         }

Modified: 
maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java?rev=424470&r1=424469&r2=424470&view=diff
==============================================================================
--- 
maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java 
(original)
+++ 
maven/maven-1/core/trunk/src/test/java/org/apache/maven/werkz/ProjectTest.java 
Fri Jul 21 14:55:19 2006
@@ -202,7 +202,7 @@
 
         for ( int i = 0; i < chain.length; ++i )
         {
-            if ( chain[i] == first )
+            if ( chain[i].equals( first ) )
             {
                 firstIndex = i;
             }