7:34 a.m.
Author: Alex.Kolonitsky
Date: 2009-12-07 08:34:21 -0500 (Mon, 07 Dec 2009)
New Revision: 16084
Added:
root/framework/trunk/impl/checkstyle-suppressions.xml
root/framework/trunk/test-base/checkstyle-suppressions.xml
Modified:
root/framework/trunk/test-base/src/main/java/org/richfaces/test/AbstractFacesTest.java
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingHttpSession.java
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingServletContext.java
Log:
RFPL-195 - Code style policy
Reformatting
Added: root/framework/trunk/impl/checkstyle-suppressions.xml
===================================================================
--- root/framework/trunk/impl/checkstyle-suppressions.xml (rev 0)
+++ root/framework/trunk/impl/checkstyle-suppressions.xml 2009-12-07 13:34:21 UTC (rev
16084)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="DoubleCheckedLocking"
files="MultipartRequestRegistry.java" />
+ <suppress checks="FallThrough" files="JSMin.java" />
+ <suppress checks="IllegalCatch" files="UISwitchablePanel.java"
/>
+ <suppress checks="ModifiedControlVariable"
files="MultipartRequest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java"
/>
+ <suppress checks="IllegalCatch"
files="PartialViewContextImpl.java" />
+ <suppress checks="FallThrough" files="StagingServer.java"
/>
+ <suppress checks="ModifiedControlVariable" files="Cookie.java"
/>
+ <suppress checks="IllegalCatch" files="CacheManager.java"
/>
+ <suppress checks="MissingSwitchDefault"
files="JSONTokener.java" />
+ <suppress checks="IllegalCatch" files="AjaxViewRoot.java"
/>
+ <suppress checks="FallThrough" files="XMLTokener.java" />
+ <suppress checks="IllegalCatch"
files="ResourceHandlerImpl.java" />
+ <suppress checks="IllegalThrows"
files="AbstractThreadedTest.java" />
+ <suppress checks="ModifiedControlVariable"
files="URLCodec.java" />
+</suppressions>
Added: root/framework/trunk/test-base/checkstyle-suppressions.xml
===================================================================
--- root/framework/trunk/test-base/checkstyle-suppressions.xml
(rev 0)
+++ root/framework/trunk/test-base/checkstyle-suppressions.xml 2009-12-07 13:34:21 UTC
(rev 16084)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+
+<suppressions>
+ <suppress checks="IllegalCatch"
files="AbstractThreadedTest.java" />
+ <suppress checks="IllegalCatch" files="StagingServer.java"
/>
+</suppressions>
Modified:
root/framework/trunk/test-base/src/main/java/org/richfaces/test/AbstractFacesTest.java
===================================================================
---
root/framework/trunk/test-base/src/main/java/org/richfaces/test/AbstractFacesTest.java 2009-12-07
13:22:33 UTC (rev 16083)
+++
root/framework/trunk/test-base/src/main/java/org/richfaces/test/AbstractFacesTest.java 2009-12-07
13:34:21 UTC (rev 16084)
@@ -59,7 +59,6 @@
* Current virtual connection. This field populated by the {@link #setupWebContent()}
method only.
*/
protected StagingConnection connection;
- private ClassLoader contextClassLoader;
/**
* Current {@link FacesContext} instance. This field populated by the {@link
#setupWebContent()} method only.
@@ -76,6 +75,8 @@
*/
protected Lifecycle lifecycle;
+ private ClassLoader contextClassLoader;
+
/**
* Setup staging server instance with JSF implementation. First, this method creates
a local test instance
* and calls the other template method in the next sequence:
@@ -328,7 +329,7 @@
* parameters.
* The default implementation does nothing.
*/
- protected void setupConnection() {}
+ protected void setupConnection() { }
/**
* Virtual server instance cleanup.
Modified:
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingHttpSession.java
===================================================================
---
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingHttpSession.java 2009-12-07
13:22:33 UTC (rev 16083)
+++
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingHttpSession.java 2009-12-07
13:34:21 UTC (rev 16084)
@@ -21,8 +21,9 @@
*/
@SuppressWarnings("deprecation")
abstract class StagingHttpSession implements HttpSession {
+ public static final String SESSION_ID = "1234567890";
+
private static final int DEFAULT_INACTIVE_TIME = 30;
- public static final String SESSION_ID = "1234567890";
private final Map<String, Object> attributes = new ConcurrentHashMap<String,
Object>();
private volatile int inactiveTime = DEFAULT_INACTIVE_TIME;
private final long creationTime;
Modified:
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingServletContext.java
===================================================================
---
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2009-12-07
13:22:33 UTC (rev 16083)
+++
root/framework/trunk/test-base/src/main/java/org/richfaces/test/staging/StagingServletContext.java 2009-12-07
13:34:21 UTC (rev 16084)
@@ -31,9 +31,11 @@
*
*/
abstract class StagingServletContext implements ServletContext {
+ public static final String CONTEXT_PATH = "";
+
private static final String APPLICATION_NAME = "stub";
- public static final String CONTEXT_PATH = "";
private static final Logger LOG = ServerLogger.SERVER.getLogger();
+
private final Map<String, Object> attributes = new ConcurrentHashMap<String,
Object>();
private final Map<String, String> initParameters = new HashMap<String,
String>();