Changeset 16535 for release-kits/shared/ant-tasks/orans/RegexSearchReplace.java

Timestamp:

2008-07-24T15:01:34+12:00 (16 years ago)

Author:

oranfry

Message:

more specific error messages

File:

• release-kits/shared/ant-tasks/orans/RegexSearchReplace.java (modified) (4 diffs)

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

@@ -60 +60 @@
 
         } catch (IOException e) {
-            throw new BuildException( "Error - Couldn't create the temp file" );
+            throw new BuildException( "Error - Couldn't create or open the temp file" );
         }
 
@@ -67 +67 @@
         BufferedReader in = null;
         try {
-            in = new BufferedReader(new FileReader( file ));
+            in = new BufferedReader( new FileReader( file ) );
         } catch ( Exception e ) {
             throw new BuildException( "Error - Couldn't open the specified file" );
@@ -74 +74 @@
         //pass the file through, searching and replacing
         String line;
-        try {
-            while ( (line = in.readLine()) != null ) {
+        boolean hasMoreLines = true;
+        while ( hasMoreLines ) {
+
+            try {
+                line = in.readLine();
+            } catch ( Exception e ) {
+                throw new BuildException( "Error - Couldn't read from the specified file" );
+            }
+
+            if ( line == null ) {
+                hasMoreLines = false;
+            } else {
 
                 String oldLine = line;
@@ -83 +93 @@
                 }
 
-                out.write(line);
-                out.newLine();
+                try {
+                    out.write(line);
+                    out.newLine();
+                } catch ( Exception e ) {
+                    throw new BuildException( "Error - Couldn't write to the temp file" );
+                }
             }
-        } catch ( Exception e ) {
-            throw new BuildException( "Error - Couldn't read from the specified file" );
         }
+            
 
         try {
-
             //close them both up
             in.close();
             out.close();
-
         } catch ( Exception e ) {
             throw new BuildException( "Error - Couldn't close a file" );