You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/11/04 13:09:38 UTC

svn commit: r832720 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/component/ core/src/main/java/org/apache/myfaces/tobago/taglib/component/ extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/ theme/...

Author: lofwyr
Date: Wed Nov  4 12:09:38 2009
New Revision: 832720

URL: http://svn.apache.org/viewvc?rev=832720&view=rev
Log:
TOBAGO-412: Cleanup: Rename UISelectBoolean to UISelectBooleanCheckbox

Added:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java   (contents, props changed)
      - copied, changed from r832328, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBoolean.java
Removed:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBoolean.java
Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectMany.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
    myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java
    myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java?rev=832720&r1=832719&r2=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIGridLayout.java Wed Nov  4 12:09:38 2009
@@ -212,11 +212,15 @@
 
           // compute the size of the cell
           Measure size = pixelMeasures[i];
-          for (int k = 1; k < span; k++) {
-            size = size.add(pixelMeasures[i + k]);
-            size = size.add(getSpacing(orientation));
+          if (size != null) {
+            for (int k = 1; k < span; k++) {
+              size = size.add(pixelMeasures[i + k]);
+              size = size.add(getSpacing(orientation));
+            }
+            LayoutUtils.setSize(orientation, component, size);
+          } else {
+            LOG.warn("Size is null, should be debugged... i=" + i + " grid="+grid, new RuntimeException());
           }
-          LayoutUtils.setSize(orientation, component, size);
 
           // call sub layout manager
           if (component instanceof LayoutContainer) {
@@ -243,7 +247,11 @@
           // compute the position of the cell
           Measure position = LayoutUtils.getBeginOffset(orientation, getLayoutContainer());
           for (int k = 0; k < i; k++) {
-            position = position.add(pixelMeasures[k]);
+            if (pixelMeasures[k] == null) {
+              LOG.warn("Measure is null, should be debugged... i=" + i + " k=" + k + " grid="+grid, new RuntimeException());
+            } else {
+              position = position.add(pixelMeasures[k]);
+            }
             position = position.add(getSpacing(orientation));
           }
           if (orientation) {
@@ -489,6 +497,9 @@
 
   public abstract String getColumns();
 
+  @Deprecated
+  public abstract Measure getCellspacing();
+
   public abstract Measure getRowSpacing();
 
   public abstract Measure getColumnSpacing();

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java (from r832328, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBoolean.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBoolean.java&r1=832328&r2=832720&rev=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBoolean.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java Wed Nov  4 12:09:38 2009
@@ -17,16 +17,14 @@
  * limitations under the License.
  */
 
+import org.apache.myfaces.tobago.layout.LayoutComponent;
 import org.apache.myfaces.tobago.util.MessageFactory;
 
-import javax.faces.context.FacesContext;
 import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
 
-/*
- * Date: Jan 30, 2007
- * Time: 8:16:45 AM
- */
-public abstract class AbstractUISelectBoolean extends javax.faces.component.UISelectBoolean implements SupportsMarkup {
+public abstract class AbstractUISelectBooleanCheckbox extends javax.faces.component.UISelectBoolean 
+    implements LayoutComponent, SupportsMarkup {
 
   public boolean isSelected() {
     Object value = getSubmittedValue();

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectBooleanCheckbox.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectMany.java?rev=832720&r1=832719&r2=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectMany.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISelectMany.java Wed Nov  4 12:09:38 2009
@@ -1,5 +1,9 @@
 package org.apache.myfaces.tobago.component;
 
+import org.apache.myfaces.tobago.layout.LayoutComponent;
+
+import javax.faces.component.UISelectMany;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -17,11 +21,6 @@
  * limitations under the License.
  */
 
-/*
- * User: weber
- * Date: May 31, 2005
- * Time: 7:47:11 PM
- */
-public abstract class AbstractUISelectMany extends javax.faces.component.UISelectMany implements SupportsMarkup {
+public abstract class AbstractUISelectMany extends UISelectMany implements SupportsMarkup, LayoutComponent {
 
 }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=832720&r1=832719&r2=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java Wed Nov  4 12:09:38 2009
@@ -38,24 +38,19 @@
 import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
 import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
 import org.apache.myfaces.tobago.taglib.decl.IsFocus;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
 import org.apache.myfaces.tobago.taglib.decl.IsInline;
 import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
 import org.apache.myfaces.tobago.taglib.decl.IsRequired;
-//import org.apache.myfaces.tobago.taglib.decl.IsImmediateComponent;
 
-/*
- * Created: Aug 5, 2005 5:18:50 PM
- * User: bommel
- * $Id$
- */
 /**
  * Renders a checkbox.
  */
 @Tag(name = "selectBooleanCheckbox")
 @BodyContentDescription(anyTagOf = "<f:facet>* ")
 @UIComponentTag(
-    uiComponent = "org.apache.myfaces.tobago.component.UISelectBoolean",
-    uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUISelectBoolean",
+    uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCheckbox",
+    uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUISelectBooleanCheckbox",
     rendererType = RendererTypes.SELECT_BOOLEAN_CHECKBOX,
     allowedChildComponenents = "NONE",
     facets = {
@@ -72,6 +67,6 @@
 public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
     HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasBooleanValue, IsDisabled,
     IsInline, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired, HasConverter, IsFocus,
-    HasValidatorMessage, HasRequiredMessage, HasConverterMessage /*, IsImmediateComponent */{
+    HasValidatorMessage, HasRequiredMessage, HasConverterMessage, IsGridLayoutComponent /*, IsImmediateComponent */{
 
 }

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java?rev=832720&r1=832719&r2=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/MenuCheckboxExtensionHandler.java Wed Nov  4 12:09:38 2009
@@ -18,7 +18,7 @@
  */
 
 import com.sun.facelets.tag.jsf.ComponentConfig;
-import org.apache.myfaces.tobago.component.UISelectBoolean;
+import org.apache.myfaces.tobago.component.UISelectBooleanCheckbox;
 
 /*
  * Date: Aug 10, 2007
@@ -31,7 +31,7 @@
   }
 
   protected String getSubComponentType() {
-    return UISelectBoolean.COMPONENT_TYPE;
+    return UISelectBooleanCheckbox.COMPONENT_TYPE;
   }
 
   protected String getSubRendererType() {

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java?rev=832720&r1=832719&r2=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SelectBooleanCheckboxExtensionHandler.java Wed Nov  4 12:09:38 2009
@@ -19,7 +19,7 @@
 
 import com.sun.facelets.tag.jsf.ComponentConfig;
 import org.apache.myfaces.tobago.component.RendererTypes;
-import org.apache.myfaces.tobago.component.UISelectBoolean;
+import org.apache.myfaces.tobago.component.UISelectBooleanCheckbox;
 
 /*
  * Date: Aug 9, 2007
@@ -33,7 +33,7 @@
   }
 
   protected String getSubComponentType() {
-    return UISelectBoolean.COMPONENT_TYPE;
+    return UISelectBooleanCheckbox.COMPONENT_TYPE;
   }
 
   protected String getSubRendererType() {

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=832720&r1=832719&r2=832720&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Wed Nov  4 12:09:38 2009
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.UISelectBoolean;
+import org.apache.myfaces.tobago.component.UISelectBooleanCheckbox;
 import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
@@ -70,12 +70,12 @@
 
   //
   public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
-    if (!(component instanceof UISelectBoolean)) {
-      LOG.error("Wrong type: Need " + UISelectBoolean.class.getName() + ", but was " + component.getClass().getName());
+    if (!(component instanceof UISelectBooleanCheckbox)) {
+      LOG.error("Wrong type: Need " + UISelectBooleanCheckbox.class.getName() + ", but was " + component.getClass().getName());
       return;
     }
 
-    UISelectBoolean selectBoolean = (UISelectBoolean) component;
+    UISelectBooleanCheckbox selectBoolean = (UISelectBooleanCheckbox) component;
 
     TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);