Author: ptahchiev
Date: Sat Mar 29 14:19:08 2008
New Revision: 642615
URL: http://svn.apache.org/viewvc?rev=642615&view=rev
Log:
checkstyle improved.
Modified:
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/extension/jetty/Jetty6xTestSetup.java
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java
Modified:
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/extension/jetty/Jetty6xTestSetup.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/extension/jetty/Jetty6xTestSetup.java?rev=642615&r1=642614&r2=642615&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/extension/jetty/Jetty6xTestSetup.java
(original)
+++
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/extension/jetty/Jetty6xTestSetup.java
Sat Mar 29 14:19:08 2008
@@ -224,13 +224,16 @@
// command line.
if (getConfigFile() != null)
{
- Class xmlConfigClass = ClassLoaderUtils.loadClass(
+ Class xmlConfigClass = ClassLoaderUtils.loadClass(
"org.mortbay.xml.XmlConfiguration", this.getClass());
-
- Object xmlConfiguration = xmlConfigClass.getConstructor(new
Class[]{String.class})
- .newInstance(new Object[]{getConfigFile().toString()});
-
- xmlConfiguration.getClass().getMethod("configure", new Class[]
{Object.class}).invoke(xmlConfiguration, new Object[] {server});
+
+ Object xmlConfiguration = xmlConfigClass.getConstructor(
+ new Class[]{String.class}).newInstance(
+ new Object[]{getConfigFile().toString()});
+
+ xmlConfiguration.getClass().getMethod("configure",
+ new Class[] {Object.class})
+ .invoke(xmlConfiguration, new Object[] {server});
}
@@ -363,18 +366,21 @@
URL contextURL = new URL(theConfiguration.getContextURL());
Class serverConnectorClass = ClassLoaderUtils.loadClass(
- "org.mortbay.jetty.nio.SelectChannelConnector",
this.getClass());
+ "org.mortbay.jetty.nio.SelectChannelConnector",
+ this.getClass());
Object connector = serverConnectorClass.newInstance();
//Connector connector = new SelectChannelConnector();
connector.getClass().getMethod(
- "setPort", new Class[] {String.class})
- .invoke(connector, new Object[] {"" +
contextURL.getPort()});
+ "setPort", new Class[] {String.class})
+ .invoke(connector, new Object[] {"" + contextURL.getPort()});
connector.getClass().getMethod(
- "setHost", new Class[] {String.class})
- .invoke(connector, new Object[] {"" +
contextURL.getHost().toString()});
+ "setHost", new Class[] {String.class})
+ .invoke(connector,
+ new Object[] {"" + contextURL.getHost().toString()});
server.getClass().getMethod("addConnector",
- new Class[]
{ClassLoaderUtils.loadClass("org.mortbay.jetty.Connector", this.getClass())})
+ new Class[] {ClassLoaderUtils.loadClass(
+ "org.mortbay.jetty.Connector", this.getClass())})
.invoke(server, new Object[] {connector});
return server;
@@ -399,12 +405,15 @@
Class contextClass = ClassLoaderUtils.loadClass(
"org.mortbay.jetty.servlet.Context", this.getClass());
- Object context = contextClass.getConstructor(new Class[]{Class.class,
String.class})
- .newInstance(new Object[]{theServer,
contextURL.getPath().toString()});
+ Object context = contextClass.getConstructor(
+ new Class[]{Class.class, String.class})
+ .newInstance(new Object[]{theServer, contextURL.getPath()
+ .toString()});
- context.getClass().getMethod("setClassLoader", new
Class[]{ClassLoader.class})
- .invoke(context, new Object[]{getClass().getClassLoader()});
+ context.getClass().getMethod("setClassLoader",
+ new Class[]{ClassLoader.class})
+ .invoke(context, new Object[]{getClass().getClassLoader()});
return context;
}
@@ -420,9 +429,13 @@
private void addServletRedirector(Object theContext,
ServletConfiguration theConfiguration) throws Exception
{
-
- theContext.getClass().getMethod("addServlet", new Class[]{String.class,
String.class})
- .invoke(theContext, new
Object[]{"org.apache.cactus.server.ServletTestRedirector", "/" +
theConfiguration.getDefaultRedirectorName().toString()});
+
+ theContext.getClass().getMethod(
+ "addServlet",
+ new Class[]{String.class, String.class})
+ .invoke(theContext, new Object[]{
+ "org.apache.cactus.server.ServletTestRedirector", "/"
+ + theConfiguration.getDefaultRedirectorName().toString()});
}
/**
@@ -436,18 +449,23 @@
*/
private void addJspRedirector(Object theContext) throws Exception
{
-
+
if (getResourceDir() != null)
{
theContext.getClass().getMethod("addServlet",
new Class[] {String.class, String.class})
.invoke(theContext,
- new Object[]
{org.apache.jasper.servlet.JspServlet.class.getName(),"*.jsp"});
+ new Object[] {org.apache.jasper.servlet.JspServlet.class
+ .getName(), "*.jsp"});
- Object servletHandler =
theContext.getClass().getMethod("getServletHandler", new
Class[]{}).invoke(theContext, new Object[]{});
+ Object servletHandler = theContext.getClass().getMethod(
+ "getServletHandler", new Class[]{})
+ .invoke(theContext, new Object[]{});
- servletHandler.getClass().getMethod("addServletMapping", new
Class[]{String.class, String.class})
- .invoke(servletHandler, new
Object[]{"org.apache.jasper.servlet.JspServlet", "/jspRedirector.jsp"});
+ servletHandler.getClass().getMethod("addServletMapping",
+ new Class[]{String.class, String.class})
+ .invoke(servletHandler, new Object[]{
+ "org.apache.jasper.servlet.JspServlet", "/jspRedirector.jsp"});
}
}
@@ -468,11 +486,13 @@
{
if (getResourceDir() != null)
{
-
+
theContext.getClass().getMethod("addFilter",
new Class[] {String.class, String.class, Integer.TYPE})
.invoke(theContext,
- new Object[]
{org.apache.cactus.server.FilterTestRedirector.class.getName(),theConfiguration.getDefaultRedirectorName(),
new Integer(0)});
+ new Object[] {org.apache.cactus.server.FilterTestRedirector
+ .class.getName(), theConfiguration
+ .getDefaultRedirectorName(), new Integer(0)});
}
}
@@ -545,11 +565,14 @@
{
byte[] buf = new byte[256];
InputStream in = null;
- try {
- in = theConnection.getInputStream();
- } catch (FileNotFoundException fex) {
- //JAVA BUG #4160499
- return;
+ try
+ {
+ in = theConnection.getInputStream();
+ }
+ catch (FileNotFoundException fex)
+ {
+ //JAVA BUG #4160499
+ return;
}
while (in.read(buf) != -1)
{
Modified:
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java?rev=642615&r1=642614&r2=642615&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java
(original)
+++
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/AssertionFailedErrorWrapper.java
Sat Mar 29 14:19:08 2008
@@ -78,7 +78,7 @@
}
/**
- * Simulates a printing of a stack trace by printing the string stack trace
+ * Simulates a printing of a stack trace by printing the string stack
trace.
*
* @param thePs the stream to which to output the stack trace
*/
@@ -95,7 +95,7 @@
}
/**
- * Simulates a printing of a stack trace by printing the string stack trace
+ * Simulates a printing of a stack trace by printing the string stack
trace.
*
* @param thePw the writer to which to output the stack trace
*/
Modified:
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java?rev=642615&r1=642614&r2=642615&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java
(original)
+++
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/ClientTestCaseCaller.java
Sat Mar 29 14:19:08 2008
@@ -78,7 +78,7 @@
private Log logger;
/**
- * Pure JUnit Test Case that we are wrapping (if any)
+ * Pure JUnit Test Case that we are wrapping (if any).
*/
private Test wrappedTest;
@@ -193,7 +193,7 @@
}
/**
- * Call the test case end method
+ * Call the test case end method.
*
* @param theRequest the request data that were used to open the
* connection.
@@ -333,7 +333,7 @@
}
/**
- * Call a begin method which takes Cactus WebRequest as parameter
+ * Call a begin method which takes Cactus WebRequest as parameter.
*
* @param theRequest the request object which will contain data that will
* be used to connect to the Cactus server side redirectors.
Modified:
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java?rev=642615&r1=642614&r2=642615&view=diff
==============================================================================
---
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java
(original)
+++
jakarta/cactus/trunk/framework/framework-13-14/src/main/java/org/apache/cactus/internal/client/WebResponseObjectFactory.java
Sat Mar 29 14:19:08 2008
@@ -19,11 +19,9 @@
*/
package org.apache.cactus.internal.client;
-import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
@@ -73,7 +71,8 @@
// Is it a Html Unit WebResponse ?
}
- else if
(theClassName.equals("com.gargoylesoftware.htmlunit.WebResponse"))
+ else if (theClassName.equals(
+ "com.gargoylesoftware.htmlunit.WebResponse"))
{
responseObject = createHtmlUnitWebResponse(this.connection);
@@ -160,13 +159,14 @@
{
Class responseClass =
Class.forName("com.gargoylesoftware.htmlunit.StringWebResponse");
- Constructor method = responseClass.getConstructor(
+ Constructor method = responseClass.getConstructor(
new Class[] {String.class, URL.class});
InputStream input = theConnection.getInputStream();
byte[] buffer = new byte[input.available()];
input.read(buffer);
- webResponse = method.newInstance(new Object[] {new String(buffer),
theConnection.getURL()});
+ webResponse = method.newInstance(new Object[] {new String(buffer),
+ theConnection.getURL()});
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
