Changeset 28134 for main/trunk/ant-tasks/src

Timestamp:

2013-08-26T17:25:29+12:00 (11 years ago)

Author:

davidb

Message:

Introduction of 'verbosity' attribute to control the level of output generated by running this task

File:

• main/trunk/ant-tasks/src/org/greenstone/anttasks/RegexSearchReplace.java (modified) (5 diffs)

main/trunk/ant-tasks/src/org/greenstone/anttasks/RegexSearchReplace.java

@@ -37 +37 @@
     private String pattern = null;
     private String replacement = null;
+    private int verbosity = 1;
     private int fromLine = -1;
     private int toLine = -1;
@@ -107 +108 @@
 
         //output greeting
-        System.out.println( "--------------------" );
-        System.out.println( " RegexSearchReplace " );
-        System.out.println( "--------------------" );
-
-        //output replacement(s)
-        System.out.println( "Replacements:" );
-        if ( pattern != null ) {
+        if (verbosity >= 3) {
+            System.out.println( "--------------------" );
+            System.out.println( " RegexSearchReplace " );
+            System.out.println( "--------------------" );
+
+
+            //output replacement(s)
+            System.out.println( "Replacements:" );
+
+            if ( pattern != null ) {
             System.out.println( " " + pattern + " -> " + replacement );
-        } else {
+            } else {
             for ( int i=0; i<jobs.size(); i++ ) {
                 System.out.println( " " + ((RegexSearchReplaceJob)(jobs.get(i))).getPattern() + " -> " + ((RegexSearchReplaceJob)(jobs.get(i))).getReplacement() );
             }
-        }
-        System.out.println();
-
-        //output lines if necessary
-        if ( this.fromLine != -1 || this.toLine != -1 ) {
+            }
+            System.out.println();
+
+
+            //output lines if necessary
+            if ( this.fromLine != -1 || this.toLine != -1 ) {
             System.out.println( "Lines: " + (this.fromLine==-1?"Start":Integer.toString(this.fromLine)) + " ~ " + (this.toLine==-1?"End":Integer.toString(this.toLine)) );
             System.out.println();
-        }
-
-        System.out.println( "Files: " );
+            }
+        }
+
+        if (verbosity == 1) {
+            System.out.println( "Regex Search and Replace on File(s): " );
+        }
+        else if (verbosity > 1) {
+            System.out.println( "File(s): " );
+        }
+
         for ( int fileIndex=0; fileIndex<files.length; fileIndex++ ) {
 
@@ -134 +146 @@
 
             File inputFile = files[fileIndex];
-            System.out.println( " " + inputFile );
+            if (verbosity >= 1) {
+                System.out.println( " " + inputFile );
+            }
 
             //create the output stream
@@ -250 +264 @@
 
         
-            if ( noReplaces == 0 ) {
+            if (verbosity >= 2) {
+                if ( noReplaces == 0 ) {
                 System.out.println( " No Changes Made" );
-            } else if ( noReplaces == 1 ) {
+                } else if ( noReplaces == 1 ) {
                 System.out.println( " Successfully changed 1 line" );
-            } else {
+                } else {
                 System.out.println( " Successfully changed " + noReplaces + " lines" );
-            }
-            System.out.println();
+                }
+                System.out.println();
+            }
 
         }
@@ -297 +313 @@
     }
 
+    public void setVerbosity(String verbosity_str) {
+
+        //trim
+        verbosity_str.replaceAll("\\s","");
+
+        if (verbosity_str == "" ) {
+            throw new BuildException("Error - no value found in 'verbosity' attribute!");
+        }
+
+        try {
+            this.verbosity = Integer.parseInt(verbosity_str);
+        } catch( NumberFormatException nfe ) {
+            throw new BuildException("Error - invalid line numbers given in 'verbosity' attribute! '" 
+                         + verbosity_str + "'" );
+        }
+
+    }
 
     public void setPattern(String pattern) {