ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r385804 - /ant/core/trunk/src/main/org/apache/tools/ant/Target.java
Date Tue, 14 Mar 2006 13:52:38 GMT
Author: stevel
Date: Tue Mar 14 05:52:37 2006
New Revision: 385804

URL: http://svn.apache.org/viewcvs?rev=385804&view=rev
Log:
flip tests as the IDE was complaining that we werent handing null tokens properly

Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/Target.java

Modified: ant/core/trunk/src/main/org/apache/tools/ant/Target.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/Target.java?rev=385804&r1=385803&r2=385804&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Target.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Target.java Tue Mar 14 05:52:37 2006
@@ -128,7 +128,7 @@
                 String token = tok.nextToken().trim();
 
                 // Make sure the dependency is not empty string
-                if (token.equals("") || token.equals(",")) {
+                if ("".equals(token) || ",".equals(token)) {
                     throw new BuildException("Syntax Error: Depend "
                         + "attribute for target \"" + getName()
                         + "\" has an empty string for dependency.");
@@ -140,7 +140,7 @@
                 // end in a ,
                 if (tok.hasMoreTokens()) {
                     token = tok.nextToken();
-                    if (!tok.hasMoreTokens() || !token.equals(",")) {
+                    if (!tok.hasMoreTokens() || !",".equals(token)) {
                         throw new BuildException("Syntax Error: Depend "
                             + "attribute for target \"" + getName()
                             + "\" ends with a , character");
@@ -256,7 +256,7 @@
      *                 no "if" test is performed.
      */
     public void setIf(String property) {
-        this.ifCondition = (property == null) ? "" : property;
+        ifCondition = (property == null) ? "" : property;
     }
 
     /**
@@ -284,7 +284,7 @@
      *                 no "unless" test is performed.
      */
     public void setUnless(String property) {
-        this.unlessCondition = (property == null) ? "" : property;
+        unlessCondition = (property == null) ? "" : property;
     }
 
     /**
@@ -361,11 +361,11 @@
             }
         } else if (!testIfCondition()) {
             project.log(this, "Skipped because property '"
-                        + project.replaceProperties(this.ifCondition)
+                        + project.replaceProperties(ifCondition)
                         + "' not set.", Project.MSG_VERBOSE);
         } else {
             project.log(this, "Skipped because property '"
-                        + project.replaceProperties(this.unlessCondition)
+                        + project.replaceProperties(unlessCondition)
                         + "' set.", Project.MSG_VERBOSE);
         }
     }
@@ -453,5 +453,29 @@
         }
         String test = project.replaceProperties(unlessCondition);
         return project.getProperty(test) == null;
+    }
+
+    /**
+     * Equality check is based on target name
+     * @param that other thing to check
+     * @return true iff type and name are equal
+     */
+    public boolean equals(Object that) {
+        if (this == that) return true;
+        if (that == null || getClass() != that.getClass()) return false;
+
+        final Target target = (Target) that;
+
+        if (name != null ? !name.equals(target.name) : target.name != null) return false;
+
+        return true;
+    }
+
+    /**
+     * Hash code is based on name, is 0 if the name==null
+     * @return hash code
+     */
+    public int hashCode() {
+        return (name != null ? name.hashCode() : 0);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message