You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2010/05/02 06:24:00 UTC
svn commit: r940158 - in /click/trunk/click:
build/checkstyle-suppressions.xml
extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java
extras/src/org/apache/click/extras/control/MenuFactory.java
Author: sabob
Date: Sun May 2 04:24:00 2010
New Revision: 940158
URL: http://svn.apache.org/viewvc?rev=940158&view=rev
Log:
checkstyle
Modified:
click/trunk/click/build/checkstyle-suppressions.xml
click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java
click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java
Modified: click/trunk/click/build/checkstyle-suppressions.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/build/checkstyle-suppressions.xml?rev=940158&r1=940157&r2=940158&view=diff
==============================================================================
--- click/trunk/click/build/checkstyle-suppressions.xml (original)
+++ click/trunk/click/build/checkstyle-suppressions.xml Sun May 2 04:24:00 2010
@@ -36,6 +36,9 @@
files="Tree.java"/>
<suppress checks="FileLength"
+ files="Table.java"/>
+
+ <suppress checks="FileLength"
files="XmlConfigService.java"/>
<!-- Javadoc Method -->
@@ -114,11 +117,11 @@
<suppress checks="MethodLength"
files="Form.java"
- lines="2316,2333"/>
+ lines="2425"/>
<suppress checks="MethodLength"
files="FieldSet.java"
- lines="915"/>
+ lines="1000"/>
<!-- Static Variable Name -->
Modified: click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java?rev=940158&r1=940157&r2=940158&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/cayenne/TabbedCayenneForm.java Sun May 2 04:24:00 2010
@@ -27,7 +27,6 @@ import org.apache.click.Context;
import org.apache.click.control.Field;
import org.apache.click.control.FieldSet;
import org.apache.click.element.CssImport;
-import org.apache.click.extras.control.TabbedForm;
import org.apache.click.util.ClickUtils;
import org.apache.click.util.HtmlStringBuffer;
Modified: click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java?rev=940158&r1=940157&r2=940158&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/MenuFactory.java Sun May 2 04:24:00 2010
@@ -162,17 +162,13 @@ public class MenuFactory implements Seri
// Class Variables --------------------------------------------------------
- /** The cached root Menu as defined in <tt>menu.xml</tt>. */
- protected static Menu CACHED_ROOT_MENU;
-
/** The default Menu XML attributes loaded into menu properties. */
- protected static Set<String> DEFAULT_ATTRIBUTES;
+ protected final static Set<String> DEFAULT_ATTRIBUTES = new HashSet<String>();
/** The menu cache. */
protected static Map<String, Menu> menuCache;
static {
- DEFAULT_ATTRIBUTES = new HashSet<String>();
DEFAULT_ATTRIBUTES.add("name");
DEFAULT_ATTRIBUTES.add("label");
DEFAULT_ATTRIBUTES.add("path");
@@ -491,7 +487,7 @@ public class MenuFactory implements Seri
String webinfFileName = null;
boolean absolute = fileName.startsWith("/");
- if(!absolute) {
+ if (!absolute) {
fileName = '/' + fileName;
webinfFileName = "/WEB-INF" + fileName;
}