Author: jcompagner
Date: Sun Dec 16 09:15:22 2007
New Revision: 604652
URL: http://svn.apache.org/viewvc?rev=604652&view=rev
Log:
code cleanup: WICKET-830
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java?rev=604652&r1=604651&r2=604652&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
Sun Dec 16 09:15:22 2007
@@ -66,7 +66,6 @@
{
if (Strings.isEmpty(licenseHeader))
{
- String header = "";
LineNumberReader lineNumberReader = null;
InputStream inputStream = null;
InputStreamReader inputStreamReader = null;
@@ -78,14 +77,16 @@
inputStreamReader = new
InputStreamReader(inputStream);
lineNumberReader = new
LineNumberReader(inputStreamReader);
+ StringBuffer header = new StringBuffer();
String line = lineNumberReader.readLine();
while (line != null)
{
- header += line + LINE_ENDING;
+ header.append(line);
+ header.append(LINE_ENDING);
line = lineNumberReader.readLine();
}
- licenseHeader = header.trim();
+ licenseHeader = header.toString().trim();
}
catch (Exception e)
{
@@ -103,7 +104,6 @@
{ /* Ignore */
}
}
- ;
if (inputStream != null)
{
try
@@ -114,7 +114,6 @@
{ /* Ignore */
}
}
- ;
if (inputStreamReader != null)
{
try
@@ -125,7 +124,6 @@
{ /* Ignore */
}
}
- ;
}
}
@@ -134,7 +132,7 @@
protected String extractLicenseHeader(File file, int start, int length)
{
- String header = "";
+ StringBuffer header = new StringBuffer();
FileReader fileReader = null;
try
@@ -144,7 +142,8 @@
for (int i = start; i < length; i++)
{
- header += lineNumberReader.readLine() +
LINE_ENDING;
+ header.append(lineNumberReader.readLine());
+ header.append(LINE_ENDING);
}
}
catch (Exception e)
@@ -166,7 +165,7 @@
}
}
- return header.trim();
+ return header.toString().trim();
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java?rev=604652&r1=604651&r2=604652&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
Sun Dec 16 09:15:22 2007
@@ -62,15 +62,16 @@
{
// Then only take the first 16 lines
String[] headers = header.split(LINE_ENDING);
- header = "";
+ StringBuffer sb = new StringBuffer();
for (int i = 0; i < 16 && i < headers.length;
i++)
{
- if (header.length() > 0)
+ if (sb.length() > 0)
{
- header += LINE_ENDING;
+ sb.append(LINE_ENDING);
}
- header += headers[i];
+ sb.append(headers[i]);
}
+ header = sb.toString();
}
revision =
Diff.diff(getLicenseHeader().split(LINE_ENDING), header.split(LINE_ENDING));
Modified:
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java?rev=604652&r1=604651&r2=604652&view=diff
==============================================================================
---
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
(original)
+++
wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
Sun Dec 16 09:15:22 2007
@@ -44,30 +44,34 @@
String p1 = "CANNOT RESOLVE FROM URL";
if (parameters.containsKey("param1"))
{
- p1 = "";
+ StringBuffer sb = new StringBuffer();
String[] array = parameters.getStringArray("param1");
for (int i = 0; i < array.length; i++)
{
- p1 += array[i];
+ sb.append(array[i]);
if (array.length - 1 != i)
{
- p1 += ", ";
+ sb.append(", ");
}
}
+
+ p1 = sb.toString();
}
String p2 = "CANNOT RESOLVE FROM URL";
if (parameters.containsKey("param2"))
{
- p2 = "";
+ StringBuffer sb = new StringBuffer();
String[] array = parameters.getStringArray("param2");
for (int i = 0; i < array.length; i++)
{
- p2 += array[i];
+ sb.append(array[i]);
if (array.length - 1 != i)
{
- p2 += ", ";
+ sb.append(", ");
}
}
+
+ p2 = sb.toString();
}
add(new Label("p1", p1));
