svn commit: r1494690 - /commons/sandbox/commons-javadocfix-plugin/trunk/src/main/java/org/apache/commons/plugins/javadocfix/JavadocFixTool.java

[se...@apache.org]

Author: sebb
Date: Wed Jun 19 16:44:37 2013
New Revision: 1494690

URL: http://svn.apache.org/r1494690
Log:
Bug fixes

Modified:
    commons/sandbox/commons-javadocfix-plugin/trunk/src/main/java/org/apache/commons/plugins/javadocfix/JavadocFixTool.java

Modified: commons/sandbox/commons-javadocfix-plugin/trunk/src/main/java/org/apache/commons/plugins/javadocfix/JavadocFixTool.java
URL: http://svn.apache.org/viewvc/commons/sandbox/commons-javadocfix-plugin/trunk/src/main/java/org/apache/commons/plugins/javadocfix/JavadocFixTool.java?rev=1494690&r1=1494689&r2=1494690&view=diff
==============================================================================
--- commons/sandbox/commons-javadocfix-plugin/trunk/src/main/java/org/apache/commons/plugins/javadocfix/JavadocFixTool.java (original)
+++ commons/sandbox/commons-javadocfix-plugin/trunk/src/main/java/org/apache/commons/plugins/javadocfix/JavadocFixTool.java Wed Jun 19 16:44:37 2013
@@ -83,6 +83,16 @@
  * 
  * Last updated: 14 June 2013
  */
+
+/*
+ * Updates made at the ASF:
+ * - moved from default package
+ * - closed br in replaceStringInFile method. This allows input file to be deleted on Windows
+ * - closed br in applyPatch method
+ */
+
+package org.apache.commons.plugins.javadocfix;
+
 import java.io.*;
 
 /*
@@ -143,7 +153,7 @@ public class JavadocFixTool {
     private final String[] quickFix = {"        var pos = url.indexOf(\".html\");",
                                        "        if (pos == -1 || pos != url.length - 5)"};
     private static String readme = null;
-    private static String version = "Java Documentation Updater Tool version 1.2 06/14/2013\n";
+    private static String version = "Java Documentation Updater Tool version 1.2.1 2013-06-19\n";
 
     private static boolean doPatch = true; // By default patch file
     private static boolean recursive = false; // By default only look in the folder in parameter
@@ -280,6 +290,7 @@ public class JavadocFixTool {
             line = br.readLine();
             if (line == null) {
                 // File less than 80 lines long, no signature encountered
+                br.close();
                 return;
             }
             if (line.trim().equals("function validURL(url) {")) { // Already patched
@@ -302,8 +313,10 @@ public class JavadocFixTool {
                         replaceStringInFile(currentFolder, file, failedString, patch);
                     }
                 }
+                br.close();
                 return;
             }
+            br.close();
         }
     }
 
@@ -338,6 +351,7 @@ public class JavadocFixTool {
                 pw.println(line);
             }
         }
+        br.close();
         pw.flush();
         pw.close();
         if (!temporaryFile.renameTo(new File(folder, name))) {