Author: wsmoak
Date: Wed Jul 12 20:43:08 2006
New Revision: 421488
URL: http://svn.apache.org/viewvc?rev=421488&view=rev
Log:
STR-2900 Fix Checkstyle errors in struts-examples.
Submitted by: Frank Zammetti
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForm.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForward.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionMapping.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomFormBean.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/HtmlSettersAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/ImageAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/SuccessAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/TestBean.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadForm.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/CityStateZip.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/LocaleAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationForm.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeAction.java
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeForm.java
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/ActionDispatcherExample.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/DispatchExampleAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventActionDispatcherExample.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@
*/
public class EventActionDispatcherExample extends Action {
- private ActionDispatcher dispatcher
+ private ActionDispatcher dispatcher
= new EventActionDispatcher(this);
private int fooCount;
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/EventDispatchActionExample.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/LookupDispatchExampleAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/dispatch/MappingDispatchExampleAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForm.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForm.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForm.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
*/
public String getExample() {
- return (this.example);
+ return (this.example);
}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForward.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForward.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForward.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionForward.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
*/
public String getExample() {
- return (this.example);
+ return (this.example);
}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionMapping.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionMapping.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionMapping.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomActionMapping.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,7 +49,7 @@
*/
public String getExample() {
- return (this.example);
+ return (this.example);
}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomFormBean.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomFormBean.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomFormBean.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/examples/CustomFormBean.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,7 +47,7 @@
*/
public String getExample() {
- return (this.example);
+ return (this.example);
}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/HtmlSettersAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/HtmlSettersAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/HtmlSettersAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/HtmlSettersAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/ImageAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/ImageAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/ImageAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/ImageAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,4 +73,4 @@
return null;
}
-}
\ No newline at end of file
+}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/SuccessAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/SuccessAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/SuccessAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/SuccessAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -52,4 +52,4 @@
}
-}
\ No newline at end of file
+}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/TestBean.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/TestBean.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/TestBean.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/exercise/TestBean.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadForm.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadForm.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/upload/UploadForm.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 1999-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
* @version $Rev$ $Date$
*/
public class UploadForm extends ValidatorForm {
-
+
/**
* The value of the text the user has sent as form data
*/
@@ -145,14 +145,14 @@
public ActionErrors validate(
ActionMapping mapping,
HttpServletRequest request) {
-
+
ActionErrors errors = super.validate(mapping, request);
//has the maximum length been exceeded?
Boolean maxLengthExceeded =
(Boolean) request.getAttribute(
MultipartRequestHandler.ATTRIBUTE_MAX_LENGTH_EXCEEDED);
-
+
if ((maxLengthExceeded != null) && (maxLengthExceeded.booleanValue()))
{
if (errors == null) {
errors = new ActionErrors();
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/CityStateZip.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/CityStateZip.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/CityStateZip.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/CityStateZip.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,27 +32,27 @@
public String getCity() {
- return sCity;
+ return sCity;
}
-
+
public void setCity(String sCity) {
- this.sCity = sCity;
+ this.sCity = sCity;
}
public String getStateProv() {
- return sStateProv;
+ return sStateProv;
}
-
+
public void setStateProv(String sStateProv) {
- this.sStateProv = sStateProv;
+ this.sStateProv = sStateProv;
}
public String getZipPostal(int index) {
- return sZipPostal[index];
+ return sZipPostal[index];
}
-
+
public void setZipPostal(int index, String value) {
- this.sZipPostal[index] = value;
+ this.sZipPostal[index] = value;
}
}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/EditTypeAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -79,8 +79,8 @@
ActionMapping mapping, ActionForm form,
HttpServletRequest request) {
- log.debug("initFromBeans");
-
+ log.debug("initFromBeans");
+
// Initialize
ArrayList satisfactionList = new ArrayList();
satisfactionList.add(new LabelValueBean("Very Satisfied", "4"));
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/LocaleAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/LocaleAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/LocaleAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/LocaleAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/MultiRegistrationAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -86,17 +86,17 @@
if (errors != null && errors.isEmpty()) {
if (info.getPage() == 1)
return mapping.findForward("input2");
-
+
if (info.getPage() == 2)
return mapping.findForward("success");
-
+
} else {
this.saveErrors(request, errors);
-
+
if (info.getPage() == 1){
return mapping.findForward("input" + info.getPage());
}
-
+
if (info.getPage() == 2){
return mapping.findForward("input" + info.getPage());
}
@@ -114,7 +114,7 @@
protected void removeFormBean(
ActionMapping mapping,
HttpServletRequest request) {
-
+
// Remove the obsolete form bean
if (mapping.getAttribute() != null) {
if ("request".equals(mapping.getScope())) {
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -88,7 +88,7 @@
protected void removeFormBean(
ActionMapping mapping,
HttpServletRequest request) {
-
+
// Remove the obsolete form bean
if (mapping.getAttribute() != null) {
if ("request".equals(mapping.getScope())) {
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationForm.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationForm.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/RegistrationForm.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,7 @@
*/
public final class RegistrationForm extends ValidatorForm implements
Serializable {
private String action = null;
-
+
private String sFirstName = null;
private String sLastName = null;
private String sAddr = null;
@@ -41,7 +41,7 @@
public String getAction() {
- return action;
+ return action;
}
public void setAction(String action) {
@@ -49,53 +49,53 @@
}
public String getFirstName() {
- return sFirstName;
+ return sFirstName;
}
-
+
public void setFirstName(String sFirstName) {
- this.sFirstName = sFirstName;
+ this.sFirstName = sFirstName;
}
-
+
public String getLastName() {
- return sLastName;
+ return sLastName;
}
-
+
public void setLastName(String sLastName) {
- this.sLastName = sLastName;
+ this.sLastName = sLastName;
}
public String getAddr() {
- return sAddr;
+ return sAddr;
}
-
+
public void setAddr(String sAddr) {
- this.sAddr = sAddr;
+ this.sAddr = sAddr;
}
public CityStateZip getCityStateZip() {
- return csz;
+ return csz;
}
-
+
public void setCityStateZip(CityStateZip csz) {
- this.csz = csz;
+ this.csz = csz;
}
public String getPhone() {
- return sPhone;
+ return sPhone;
}
-
+
public void setPhone(String sPhone) {
- this.sPhone = sPhone;
+ this.sPhone = sPhone;
}
public String getEmail() {
- return sEmail;
+ return sEmail;
}
-
+
public void setEmail(String sEmail) {
- this.sEmail = sEmail;
+ this.sEmail = sEmail;
}
-
+
/**
* Reset all properties to their default values.
*
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/ShowFileAction.java
Wed Jul 12 20:43:08 2006
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2005 The Apache Software Foundation.
*
@@ -37,7 +37,7 @@
* can be displayed.
*/
public class ShowFileAction extends Action {
-
+
/** Logging Instance. */
private static final Log log = LogFactory.getLog(ShowFileAction.class);
@@ -52,7 +52,7 @@
StringBuffer fileContents = new StringBuffer();
if(fileName != null) {
-
+
InputStream input =
servlet.getServletContext().getResourceAsStream(fileName);
if (input == null) {
log.warn("File Not Found: "+fileName);
@@ -71,12 +71,12 @@
} else {
log.error("No file name specified.");
}
-
+
// Store the File contents and name in the Request
request.setAttribute("fileName", fileName);
request.setAttribute("fileContents", fileContents.toString());
-
+
return mapping.findForward("success");
}
}
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeAction.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeAction.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeAction.java
Wed Jul 12 20:43:08 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified:
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeForm.java?rev=421488&r1=421487&r2=421488&view=diff
==============================================================================
---
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeForm.java
(original)
+++
struts/struts1/trunk/apps/examples/src/main/java/org/apache/struts/webapp/validator/TypeForm.java
Wed Jul 12 20:43:08 2006
@@ -1,5 +1,5 @@
/*
- * $Id$
+ * $Id$
*
* Copyright 2000-2006 The Apache Software Foundation.
*
@@ -78,7 +78,7 @@
}
public void setByte(String sByte) {
- this.sByte = sByte;
+ this.sByte = sByte;
}
public String getShort() {
@@ -86,7 +86,7 @@
}
public void setShort(String sShort) {
- this.sShort = sShort;
+ this.sShort = sShort;
}
public String getInteger() {
@@ -94,7 +94,7 @@
}
public void setInteger(String sInteger) {
- this.sInteger = sInteger;
+ this.sInteger = sInteger;
}
public String getIntRange() {
@@ -110,7 +110,7 @@
}
public void setLong(String sLong) {
- this.sLong = sLong;
+ this.sLong = sLong;
}
public String getFloat() {
@@ -118,7 +118,7 @@
}
public void setFloat(String sFloat) {
- this.sFloat = sFloat;
+ this.sFloat = sFloat;
}
/**
@@ -142,7 +142,7 @@
}
public void setDouble(String sDouble) {
- this.sDouble = sDouble;
+ this.sDouble = sDouble;
}
public String getDate() {
@@ -150,7 +150,7 @@
}
public void setDate(String sDate) {
- this.sDate = sDate;
+ this.sDate = sDate;
}
public String getCreditCard() {
@@ -158,7 +158,7 @@
}
public void setCreditCard(String sCreditCard) {
- this.sCreditCard = sCreditCard;
+ this.sCreditCard = sCreditCard;
}
public String getMinMaxLength() {
return sMinMaxLength;
@@ -197,7 +197,7 @@
}
public void setSatisfaction(String sSatisfaction) {
- this.sSatisfaction = sSatisfaction;
+ this.sSatisfaction = sSatisfaction;
}
public String[] getOsList() {
@@ -205,7 +205,7 @@
}
public void setOsList(String[] anOsList) {
- this.sOsList = anOsList;
+ this.sOsList = anOsList;
}
public String getOverallSatisfaction() {
@@ -213,7 +213,7 @@
}
public void setOverallSatisfaction(String anOverallSatisfaction) {
- this.sOverallSatisfaction = anOverallSatisfaction;
+ this.sOverallSatisfaction = anOverallSatisfaction;
}
public String getWouldRecommend() {
@@ -221,7 +221,7 @@
}
public void setWouldRecommend(String anWouldRecommend) {
- this.sWouldRecommend = anWouldRecommend;
+ this.sWouldRecommend = anWouldRecommend;
}
public String[] getUsedLanguages() {
@@ -229,7 +229,7 @@
}
public void setUsedLanguages(String[] anUsedLanguages) {
- this.sUsedLanguages = anUsedLanguages;
+ this.sUsedLanguages = anUsedLanguages;
}
public List getNameList() {
