You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/05/03 15:29:38 UTC

svn commit: r534848 - in /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago: component/LayoutTokens.java component/RelativeLayoutToken.java util/LayoutInfo.java

Author: bommel
Date: Thu May  3 06:29:37 2007
New Revision: 534848

URL: http://svn.apache.org/viewvc?view=rev&rev=534848
Log:
checkstyle

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RelativeLayoutToken.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java?view=diff&rev=534848&r1=534847&r2=534848
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/LayoutTokens.java Thu May  3 06:29:37 2007
@@ -46,7 +46,7 @@
   }
 
   public void shrinkSizeTo(int size) {
-    for (int i = getSize()-1; i >= size; i-- ) {
+    for (int i = getSize()-1; i >= size; i--) {
       tokens.remove(i);
     }
   }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RelativeLayoutToken.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RelativeLayoutToken.java?view=diff&rev=534848&r1=534847&r2=534848
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RelativeLayoutToken.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/RelativeLayoutToken.java Thu May  3 06:29:37 2007
@@ -22,7 +22,7 @@
  * Time: 1:34:11 PM
  */
 public class RelativeLayoutToken extends LayoutToken {
-  public int factor = 1;
+  private int factor = 1;
 
   public RelativeLayoutToken(int factor) {
     this.factor = factor;

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java?view=diff&rev=534848&r1=534847&r2=534848
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutInfo.java Thu May  3 06:29:37 2007
@@ -55,8 +55,8 @@
       this.layoutTokens = layoutTokens;
     } else */
     if (layoutTokens.getSize() > cellCount) {
-      if (!ignoreMismatch ) {
-        LOG.error("More tokens (" + layoutTokens.getSize()
+      if (!ignoreMismatch) {
+        LOG.warn("More tokens (" + layoutTokens.getSize()
             + ") for layout than cells (" + cellCount + ") found! Ignoring"
             + " redundant tokens. Token string was: "
             + layoutTokens);
@@ -65,7 +65,7 @@
       layoutTokens.shrinkSizeTo(cellCount);
     } else {
       if (!ignoreMismatch && LOG.isWarnEnabled() && (cellCount - layoutTokens.getSize()) != 0) {
-        LOG.error("More cells (" + cellCount + ") than tokens (" + layoutTokens.getSize()
+        LOG.warn("More cells (" + cellCount + ") than tokens (" + layoutTokens.getSize()
             + ") for layout found! Setting missing tokens to '1*'."
             + " Token string was: " + layoutTokens);
       }