Changeset 16532 for release-kits/shared

Timestamp:

2008-07-24T13:20:48+12:00 (16 years ago)

Author:

oranfry

Message:

made the rsr task safer

Location:

release-kits/shared/ant-tasks/orans

Files:

• RegexSearchReplace.class (modified) ( previous)
• RegexSearchReplace.java (modified) (7 diffs)

release-kits/shared/ant-tasks/orans/RegexSearchReplace.java

@@ -16 +16 @@
      */
     public static void main( String[] args ) {
+
         RegexSearchReplace rsr = new RegexSearchReplace();
         rsr.setFile(new File (args[0]));
@@ -36 +37 @@
 
         if (replacement == null) {
-            replacement = "";
+            throw new BuildException( "Error - No replacement specified !!" );
         }
 
@@ -44 +45 @@
         File temp = null;
         try {
-            // Create temp file.
+            //create temp file.
             temp = File.createTempFile("rsr", ".tmp");
 
-            // Delete temp file when program exits.
+            //delete temp file when program exits.
             temp.deleteOnExit();
 
-            // Write to temp file
+            //writer to temp file
             out = new BufferedWriter(new FileWriter(temp));
 
-        } catch (IOException e) {}
+        } catch (IOException e) {
+            throw new BuildException( "Error - Couldn't create the temp file" );
+        }
 
 
@@ -60 +63 @@
         try {
             in = new BufferedReader(new FileReader( file ));
-        } catch ( Exception e ) {}
+        } catch ( Exception e ) {
+            throw new BuildException( "Error - Couldn't open the specified file" );
+        }
 
         //pass the file through, searching and replacing
@@ -70 +75 @@
                 out.newLine();
             }
+        } catch ( Exception e ) {
+            throw new BuildException( "Error - Couldn't read from the specified file" );
+        }
+
+        try {
+
             //close them both up
             in.close();
@@ -75 +86 @@
 
         } catch ( Exception e ) {
-            e.printStackTrace();
+            throw new BuildException( "Error - Couldn't close a file" );
         }
 
 
+        //copy the new file (temp) over the original
+        InputStream i;
+        OutputStream o;
+        try {
+            i = new FileInputStream(temp);
+            o = new FileOutputStream(file);
 
-        //copy the new file (temp) over the original
+        } catch ( Exception e ) {
+            throw new BuildException( "Error - Couldn't open the temp file" );
+        }
+
         try {
-            InputStream i = new FileInputStream(temp);
-            OutputStream o = new FileOutputStream(file);
-
+    
             // Transfer bytes from in to out
             byte[] buf = new byte[1024];
@@ -95 +113 @@
             i.close();
             o.close();
-        } catch ( Exception e ) {}
+        } catch ( Exception e ) {
+            throw new BuildException( "Error - Couldn't write to the specified file" );
+        }
         
     }