svn commit: r395029 - in /myfaces/tobago/trunk/core/src/main: java/org/apache/myfaces/tobago/component/ java/org/apache/myfaces/tobago/taglib/component/ resources/META-INF/

[bo...@apache.org]

Author: bommel
Date: Tue Apr 18 13:29:32 2006
New Revision: 395029

URL: http://svn.apache.org/viewcvs?rev=395029&view=rev
Log:
fixed errors for facelet support

Added:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java
Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTag.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java
    myfaces/tobago/trunk/core/src/main/resources/META-INF/faces-config.xml

Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java?rev=395029&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java (added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java Tue Apr 18 13:29:32 2006
@@ -0,0 +1,72 @@
+package org.apache.myfaces.tobago.component;
+
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ALIGN;
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SORTABLE;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: bommel
+ * Date: 18.04.2006
+ * Time: 21:50:29
+ * To change this template use File | Settings | File Templates.
+ */
+public class UIColumn extends javax.faces.component.UIColumn {
+  public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Column";
+  private Boolean sortable;
+  private String align;
+
+
+   public void restoreState(FacesContext context, Object state) {
+     Object[] values = (Object[]) state;
+     super.restoreState(context, values[0]);
+     align = (String) values[1];
+     sortable = (Boolean) values[2];
+   }
+
+   public Object saveState(FacesContext context) {
+     Object[] values = new Object[3];
+     values[0] = super.saveState(context);
+     values[1] = align;
+     values[2] = sortable;
+     return values;
+   }
+
+   public boolean isSortable() {
+     if (sortable != null) {
+       return sortable;
+     }
+     ValueBinding vb = getValueBinding(ATTR_SORTABLE);
+     if (vb != null) {
+       return (Boolean.TRUE.equals(vb.getValue(getFacesContext())));
+     } else {
+       return false;
+     }
+   }
+
+   public void setSortable(boolean sortable) {
+     this.sortable = sortable;
+   }
+
+  public String getAlign() {
+    if (align != null) {
+      return align;
+    }
+    ValueBinding vb = getValueBinding(ATTR_ALIGN);
+    if (vb != null) {
+      return (String) vb.getValue(getFacesContext());
+    } else {
+      return align;
+    }
+  }
+
+  public void setAlign(String align) {
+    this.align = align;
+  }
+
+
+
+}

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java?rev=395029&r1=395028&r2=395029&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java Tue Apr 18 13:29:32 2006
@@ -34,7 +34,6 @@
   public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Input";
 
   private Boolean readonly;
-  ;
   private javax.faces.el.MethodBinding suggestMethod;
 
   public void restoreState(FacesContext context, Object state) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTag.java?rev=395029&r1=395028&r2=395029&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTag.java Tue Apr 18 13:29:32 2006
@@ -20,7 +20,7 @@
 import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SORTABLE;
 import org.apache.myfaces.tobago.component.ComponentUtil;
 
-import javax.faces.component.UIColumn;
+import org.apache.myfaces.tobago.component.UIColumn;
 import javax.faces.component.UIComponent;
 
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java?rev=395029&r1=395028&r2=395029&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ColumnTagDeclaration.java Tue Apr 18 13:29:32 2006
@@ -37,7 +37,7 @@
  */
 @Tag(name = "column")
 @UIComponentTag(
-    uiComponent = "javax.faces.component.UIColumn")
+    uiComponent = "org.apache.myfaces.tobago.component.UIColumn")
 public interface ColumnTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasLabel {
   /**
    * Alignment of this column.

Modified: myfaces/tobago/trunk/core/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/resources/META-INF/faces-config.xml?rev=395029&r1=395028&r2=395029&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/core/src/main/resources/META-INF/faces-config.xml Tue Apr 18 13:29:32 2006
@@ -43,6 +43,10 @@
     <component-class>org.apache.myfaces.tobago.component.UICell</component-class>
   </component>
   <component>
+    <component-type>org.apache.myfaces.tobago.Column</component-type>
+    <component-class>org.apache.myfaces.tobago.component.UIColumn</component-class>
+  </component>
+  <component>
     <component-type>org.apache.myfaces.tobago.ColumnSelector</component-type>
     <component-class>org.apache.myfaces.tobago.component.UIColumnSelector</component-class>
   </component>