Changeset 17349 for other-projects/trunk/anttasks/src

Timestamp:

2008-09-19T13:50:50+12:00 (16 years ago)

Author:

oranfry

Message:

fixed winpath option to rsr and made the test framwork better, plus merged test.xml and build.xml

Location:

other-projects/trunk/anttasks

Files:

• . (modified) (1 prop)
• src/org/greenstone/anttasks/RegexSearchReplace.java (modified) (2 diffs)
• src/org/greenstone/anttasks/RegexSearchReplaceJob.java (modified) (3 diffs)

other-projects/trunk/anttasks

@@ -1 +1 @@
 classes
 lib
+test
 

@@ -1 +1 @@
 classes
 lib
+test
 

other-projects/trunk/anttasks/src/org/greenstone/anttasks/RegexSearchReplace.java

@@ -130 +130 @@
                 String oldLine = line;
                 if ( pattern != null ) {
-                    line = line.replaceAll((String)pattern, (String)replacement);
+                    String rp = replacement;
+                    if ( winPath ) {
+                        rp = rp.replaceAll("\\\\","\\\\\\\\");
+                    }
+                    line = line.replaceAll((String)pattern, (String)rp);
                 } else {
                     for ( int i=0; i<jobs.size(); i++ ) {
                         String rp = ((RegexSearchReplaceJob)(jobs.get(i))).getReplacement();
-                        if ( winPath ) {
+                        if ( ((RegexSearchReplaceJob)(jobs.get(i))).getWinPath() ) {
                             rp = rp.replaceAll("\\\\","\\\\\\\\");
                         }
@@ -211 +215 @@
     public void setReplacement(String replacement) {
         replacement = replacement.replaceAll( "\\\\", "\\\\\\\\" );
-        if ( winPath ) {
-            replacement = replacement.replaceAll("\\\\","\\\\\\\\");
-        }
         this.replacement = replacement;
     }

other-projects/trunk/anttasks/src/org/greenstone/anttasks/RegexSearchReplaceJob.java

@@ -2 +2 @@
 public class RegexSearchReplaceJob extends org.apache.tools.ant.types.DataType {
 
-    public String pattern = null;
-    public String replacement = null;
+    String pattern = null;
+    String replacement = null;
+    boolean winPath = false;
 
     public void setPattern(String pattern) {
@@ -14 +15 @@
     }
 
+    public void setWinPath( boolean winPath ) {
+        this.winPath = winPath;
+    }
+
     public String getPattern() {
         return pattern;
@@ -20 +25 @@
         return replacement;
     }
+    public boolean getWinPath() {
+        return winPath;
+    }
 
 }

@@ -1 +1 @@
 classes
 lib
+test