Author: martinc
Date: Sat May 7 09:45:39 2005
New Revision: 169096
URL: http://svn.apache.org/viewcvs?rev=169096&view=rev
Log:
Start fixing our myriad Checkstyle errors. It seems we've become rather sloppy.
Modified:
struts/core/trunk/src/share/org/apache/struts/action/Action.java
struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java
struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java
struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java
struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java
struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java
struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java
struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java
Modified: struts/core/trunk/src/share/org/apache/struts/action/Action.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/Action.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/Action.java (original)
+++ struts/core/trunk/src/share/org/apache/struts/action/Action.java Sat May 7
09:45:39 2005
@@ -215,14 +215,14 @@
HttpServletRequest request,
ActionMessages messages) {
- if (messages == null){
+ if (messages == null) {
// bad programmer! *slap*
return;
}
// get any existing messages from the request, or make a new one
ActionMessages requestMessages = (ActionMessages)
request.getAttribute(Globals.MESSAGE_KEY);
- if (requestMessages == null){
+ if (requestMessages == null) {
requestMessages = new ActionMessages();
}
// add incoming messages
@@ -253,14 +253,14 @@
HttpServletRequest request,
ActionMessages errors) {
- if (errors == null){
+ if (errors == null) {
// bad programmer! *slap*
return;
}
// get any existing errors from the request, or make a new one
ActionMessages requestErrors =
(ActionMessages)request.getAttribute(Globals.ERROR_KEY);
- if (requestErrors == null){
+ if (requestErrors == null) {
requestErrors = new ActionMessages();
}
// add incoming errors
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionMessages.java
Sat May 7 09:45:39 2005
@@ -199,7 +199,7 @@
*
* @since Struts 1.1
*/
- public boolean isEmpty(){
+ public boolean isEmpty() {
return (messages.isEmpty());
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ActionServlet.java Sat
May 7 09:45:39 2005
@@ -635,7 +635,7 @@
* <p>Initialize the factory used to create the module configuration.</p>
* @since Struts 1.2
*/
- protected void initModuleConfigFactory(){
+ protected void initModuleConfigFactory() {
String configFactory =
getServletConfig().getInitParameter("configFactory");
if (configFactory != null) {
ModuleConfigFactory.setFactoryClass(configFactory);
Modified:
struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/action/ExceptionHandler.java
Sat May 7 09:45:39 2005
@@ -115,7 +115,7 @@
* @param e The Exception to log.
* @since Struts 1.2
*/
- protected void logException(Exception e){
+ protected void logException(Exception e) {
log.debug(messages.getMessage("exception.log"), e);
Modified: struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java Sat
May 7 09:45:39 2005
@@ -31,7 +31,7 @@
* @since Struts 1.3
*/
-public abstract class BaseAction extends Action{
+public abstract class BaseAction extends Action {
/**
* The message resources for this package.
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
Sat May 7 09:45:39 2005
@@ -171,7 +171,7 @@
// Prevent recursive calls
- if ("execute".equals(name) || "perform".equals(name)){
+ if ("execute".equals(name) || "perform".equals(name)) {
String message =
messages.getMessage("dispatch.recursive", mapping.getPath());
Modified:
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ActionContextBase.java
Sat May 7 09:45:39 2005
@@ -211,14 +211,14 @@
// do we want to add this to the public API?
public void addActionMessages(String key, ActionMessages msgs) {
- if (msgs == null){
+ if (msgs == null) {
// bad programmer! *slap*
return;
}
// get any existing messages from the request, or make a new one
ActionMessages requestMessages = (ActionMessages) this.get(key);
- if (requestMessages == null){
+ if (requestMessages == null) {
requestMessages = new ActionMessages();
}
// add incoming messages
Modified:
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/chain/contexts/ServletActionContext.java
Sat May 7 09:45:39 2005
@@ -141,7 +141,7 @@
if (messages == null) return;
ActionMessages requestMessages = getMessages();
- if (requestMessages == null){
+ if (requestMessages == null) {
requestMessages = new ActionMessages();
}
requestMessages.add(messages);
@@ -154,7 +154,7 @@
if (errors == null) return;
ActionMessages requestErrors = getErrors();
- if (requestErrors == null){
+ if (requestErrors == null) {
requestErrors = new ActionMessages();
}
requestErrors.add(errors);
Modified:
struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
Sat May 7 09:45:39 2005
@@ -31,7 +31,7 @@
*
* @version $Rev$ $Date$
*/
-public class DefaultModuleConfigFactory extends ModuleConfigFactory implements
Serializable{
+public class DefaultModuleConfigFactory extends ModuleConfigFactory implements
Serializable {
// --------------------------------------------------------- Public Methods
/**
Modified:
struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockActionServlet.java
Sat May 7 09:45:39 2005
@@ -43,8 +43,7 @@
*
* @version $Rev$ $Date$
*/
-public class MockActionServlet extends ActionServlet
-{
+public class MockActionServlet extends ActionServlet {
protected ServletContext servletContext;
protected ServletConfig servletConfig;
Modified: struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockFormBean.java Sat
May 7 09:45:39 2005
@@ -52,18 +52,18 @@
this(null);
}
- public MockFormBean(boolean throwException, boolean returnNulls){
+ public MockFormBean(boolean throwException, boolean returnNulls) {
super();
this.throwException = throwException;
this.returnNulls = returnNulls;
}
- public MockFormBean(boolean throwException){
+ public MockFormBean(boolean throwException) {
this.throwException = throwException;
}
public MockFormBean(boolean throwException,
- boolean returnNulls, String defaultValue){
+ boolean returnNulls, String defaultValue) {
this(throwException, returnNulls);
this.defaultValue = defaultValue;
@@ -74,14 +74,14 @@
public MockFormBean(boolean throwException,
- boolean returnNulls, String defaultValue, int arrayCount){
+ boolean returnNulls, String defaultValue, int arrayCount) {
this(throwException, returnNulls, defaultValue);
this.arrayCount = arrayCount;
}
public MockFormBean(boolean throwException,
- boolean returnNulls, Double defaultDouble){
+ boolean returnNulls, Double defaultDouble) {
this(throwException, returnNulls);
this.defaultDouble = defaultDouble;
@@ -89,17 +89,17 @@
// ------------------- public methods
- public String getJustThrowAnException() throws Exception{
+ public String getJustThrowAnException() throws Exception {
throw new Exception();
}
- public Object getThrowIllegalAccessException() throws Exception{
+ public Object getThrowIllegalAccessException() throws Exception {
if (true)
throw new IllegalAccessException();
return null;
}
- public String getStringValue() throws Exception{
+ public String getStringValue() throws Exception {
if (throwException)
throw new Exception();
if (returnNulls)
@@ -107,7 +107,7 @@
return defaultValue;
}
- public String[] getStringArray() throws Exception{
+ public String[] getStringArray() throws Exception {
if (throwException)
throw new Exception();
if (returnNulls)
@@ -120,7 +120,7 @@
return rtn;
}
- public Double getDoubleValue() throws Exception{
+ public Double getDoubleValue() throws Exception {
if (throwException)
throw new Exception();
if (returnNulls)
@@ -147,8 +147,8 @@
public Map getMapPropertyArrayValues() {
HashMap map = new HashMap();
- map.put("foo1", new String[]{"bar1", "baz1"});
- map.put("foo2", new String[]{"bar2", "baz2"});
+ map.put("foo1", new String[] {"bar1", "baz1"});
+ map.put("foo2", new String[] {"bar2", "baz2"});
return (map);
}
Modified:
struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/mock/MockPageContext.java Sat
May 7 09:45:39 2005
@@ -93,12 +93,12 @@
* @param returnBody Determines if getOut() should return a new
* <code>JspWriter</code> or a <code>BodyContent</code>.
*/
- public MockPageContext(boolean throwIOException, boolean returnBody){
+ public MockPageContext(boolean throwIOException, boolean returnBody) {
this.throwIOException = throwIOException;
this.returnBodyContent = returnBody;
}
- private void checkAndThrow() throws IOException{
- if (throwIOException){
+ private void checkAndThrow() throws IOException {
+ if (throwIOException) {
throw new IOException();
}
}
Modified:
struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/upload/BufferedMultipartInputStream.java
Sat May 7 09:45:39 2005
@@ -272,7 +272,7 @@
if (length == 0) {
contentLengthMet = true;
}
- if ((maxSize > -1) && (length > 0)){
+ if ((maxSize > -1) && (length > 0)) {
length = Math.min(length, ((int) maxSize - totalLength));
if (length == 0) {
maxLengthMet = true;
Modified: struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/FormFile.java Sat May
7 09:45:39 2005
@@ -30,8 +30,7 @@
* the only interface or class in upload package which is typically referenced
* directly by a Struts application.
*/
-public interface FormFile
-{
+public interface FormFile {
/**
* Returns the content type for this file.
*
Modified:
struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/upload/MultipartBoundaryInputStream.java
Sat May 7 09:45:39 2005
@@ -30,8 +30,7 @@
* @deprecated Use the Commons FileUpload based multipart handler instead. This
* class will be removed after Struts 1.2.
*/
-public class MultipartBoundaryInputStream extends InputStream
-{
+public class MultipartBoundaryInputStream extends InputStream {
private static final byte NEWLINE_BYTE = ((byte) '\n');
private static final byte CARRIAGE_RETURN = ((byte) '\r');
Modified:
struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartElement.java
Sat May 7 09:45:39 2005
@@ -31,8 +31,7 @@
* @deprecated Use the Commons FileUpload based multipart handler instead. This
* class will be removed after Struts 1.2.
*/
-public class MultipartElement
-{
+public class MultipartElement {
/**
* The content type of this element.
*/
Modified:
struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/upload/MultipartIterator.java
Sat May 7 09:45:39 2005
@@ -50,8 +50,7 @@
* @deprecated Use the Commons FileUpload based multipart handler instead. This
* class will be removed after Struts 1.2.
*/
-public class MultipartIterator
-{
+public class MultipartIterator {
/**
* The default encoding of a text element if none is specified.
Modified:
struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/upload/MultipartRequestHandler.java
Sat May 7 09:45:39 2005
@@ -30,8 +30,7 @@
* Providers must provide a no-argument constructor for initialization.
*
*/
-public interface MultipartRequestHandler
-{
+public interface MultipartRequestHandler {
/**
* This is the ServletRequest attribute that should be set when a
multipart request is being read
* and the maximum length is exceeded. The value is a Boolean. If the
maximum length isn't exceeded,
Modified: struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java?rev=169096&r1=169095&r2=169096&view=diff
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/util/ResponseUtils.java Sat
May 7 09:45:39 2005
@@ -64,7 +64,7 @@
try {
// get version of encode method with two String args
- Class[] args = new Class[]{String.class, String.class};
+ Class[] args = new Class[] {String.class, String.class};
encode = URLEncoder.class.getMethod("encode", args);
} catch (NoSuchMethodException e) {
log.debug("Could not find Java 1.4 encode method. Using
deprecated version.", e);
@@ -154,13 +154,13 @@
public static String encodeURL(String url, String enc) {
try {
- if(enc==null || enc.length()==0){
+ if(enc==null || enc.length()==0) {
enc = "UTF-8";
}
// encode url with new 1.4 method and UTF-8 encoding
if (encode != null) {
- return (String) encode.invoke(null, new Object[]{url, enc});
+ return (String) encode.invoke(null, new Object[] {url, enc});
}
} catch (IllegalAccessException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
