svn commit: r523026 - /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/license/AbstractLicenseHeaderHandler.java

[gw...@apache.org]

Author: gwynevans
Date: Tue Mar 27 11:37:28 2007
New Revision: 523026

URL: http://svn.apache.org/viewvc?view=rev&rev=523026
Log:
Changed to use LineNumberReader to also read the license header, as using the same (line-based) method as to read the file being tested ensures that we're testing like-with-like.

Modified:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/license/AbstractLicenseHeaderHandler.java

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/license/AbstractLicenseHeaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/license/AbstractLicenseHeaderHandler.java?view=diff&rev=523026&r1=523025&r2=523026
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/license/AbstractLicenseHeaderHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/util/license/AbstractLicenseHeaderHandler.java Tue Mar 27 11:37:28 2007
@@ -20,10 +20,10 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 
 import junit.framework.Assert;
-import wicket.util.io.Streams;
 import wicket.util.string.Strings;
 
 
@@ -35,7 +35,7 @@
 
 	/**
 	 * Construct.
-	 * 
+	 *
 	 * @param ignoreFiles
 	 */
 	public AbstractLicenseHeaderHandler(String[] ignoreFiles)
@@ -65,24 +65,35 @@
 	{
 		if (Strings.isEmpty(licenseHeader))
 		{
+			String header = "";
+			LineNumberReader lineNumberReader = null;
+			InputStream inputStream = null;
+			InputStreamReader inputStreamReader = null;
+
 			try
 			{
-				InputStream in = ApacheLicenseHeaderTestCase.class
-						.getResourceAsStream(getLicenseHeaderFilename());
-				try
-				{
-					licenseHeader = Streams.readString(in);
-				}
-				finally
+				inputStream = ApacheLicenseHeaderTestCase.class.getResourceAsStream(getLicenseHeaderFilename());
+				inputStreamReader = new InputStreamReader(inputStream);
+				lineNumberReader = new LineNumberReader(inputStreamReader);
+
+				String line = lineNumberReader.readLine();
+				while (line != null)
 				{
-					in.close();
+					header += line + LINE_ENDING;
+					line = lineNumberReader.readLine();
 				}
-				licenseHeader = licenseHeader.trim();
+
+				licenseHeader = header.trim();
 			}
 			catch (Exception e)
 			{
 				Assert.fail(e.getMessage());
-
+			}
+			finally
+			{
+				if (lineNumberReader != null)  try { lineNumberReader.close(); }  catch (Exception e) { /* Ignore */ };
+				if (inputStream != null)       try { inputStream.close(); }	  catch (Exception e) { /* Ignore */ };
+				if (inputStreamReader != null) try { inputStreamReader.close(); } catch (Exception e) { /* Ignore */ };
 			}
 		}
 
@@ -129,7 +140,7 @@
 	/**
 	 * Add the license header to the start of the file without caring about
 	 * existing license headers.
-	 * 
+	 *
 	 * @param file
 	 *            The file to add the license header to.
 	 */