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/08/06 19:30:09 UTC
svn commit: r801737 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/component/ core/src/main/java/org/apache/myfaces/tobago/taglib/component/ example/demo/src/main/webapp/overview/ example/test/src/main/webapp/tx/in/

Author: lofwyr
Date: Thu Aug  6 17:30:09 2009
New Revision: 801737

URL: http://svn.apache.org/viewvc?rev=801737&view=rev
Log:
TOBAGO-606: Layout-Manager
 - Make separator to a layout component

Added:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISeparator.java
      - copied, changed from r801603, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java
Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java
    myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
    myfaces/tobago/trunk/example/test/src/main/webapp/tx/in/in.xhtml

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISeparator.java (from r801603, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISeparator.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISeparator.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java&r1=801603&r2=801737&rev=801737&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUIImage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUISeparator.java Thu Aug  6 17:30:09 2009
@@ -19,7 +19,7 @@
 
 import org.apache.myfaces.tobago.layout.LayoutComponent;
 
-import javax.faces.component.UIGraphic;
+import javax.faces.component.UIComponentBase;
 
-public abstract class AbstractUIImage extends UIGraphic implements LayoutComponent {
-}
+public abstract class AbstractUISeparator extends UIComponentBase implements LayoutComponent {
+}
\ No newline at end of file

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java?rev=801737&r1=801736&r2=801737&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java Thu Aug  6 17:30:09 2009
@@ -23,6 +23,7 @@
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
+import org.apache.myfaces.tobago.taglib.decl.IsGridLayoutComponent;
 
 /**
  * Renders a separator.
@@ -30,11 +31,12 @@
 @Tag(name = "separator")
 @UIComponentTag(rendererType = RendererTypes.SEPARATOR,
     uiComponent = "org.apache.myfaces.tobago.component.UISeparator",
+    uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUISeparator",
     componentFamily = "org.apache.myfaces.tobago.Separator",
     componentType = "org.apache.myfaces.tobago.Separator",
     allowedChildComponenents = "NONE",
     facets = { @Facet(name= Facets.LABEL, description = "This facet contains a UILabel",
                       allowedChildComponenents = "org.apache.myfaces.tobago.Label") })
 
-public interface SeparatorTagDeclaration extends HasIdBindingAndRendered {
+public interface SeparatorTagDeclaration extends HasIdBindingAndRendered, IsGridLayoutComponent {
 }

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml?rev=801737&r1=801736&r2=801737&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.xhtml Thu Aug  6 17:30:09 2009
@@ -32,7 +32,8 @@
     </f:facet>
     -->
     <f:facet name="layout">
-      <tc:gridLayout border="0" rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed"/>
+<!--      <tc:gridLayout rows="fixed;fixed;*;*;fixed;*;*;fixed;*;*"/>-->
+      <tc:gridLayout border="0" rows="*;*;*;*;*;*;*;*;*;*"/>
     </f:facet>
 
     <!-- row -->

Modified: myfaces/tobago/trunk/example/test/src/main/webapp/tx/in/in.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/test/src/main/webapp/tx/in/in.xhtml?rev=801737&r1=801736&r2=801737&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/test/src/main/webapp/tx/in/in.xhtml (original)
+++ myfaces/tobago/trunk/example/test/src/main/webapp/tx/in/in.xhtml Thu Aug  6 17:30:09 2009
@@ -9,11 +9,14 @@
 
   <tc:page>
     <f:facet name="layout">
-      <tc:gridLayout/>
+      <tc:gridLayout rows="auto;auto;auto;auto"/>
     </f:facet>
-    <tc:gridLayoutConstraint width="600px" height="300px"/>
+    <tc:gridLayoutConstraint width="600px" height="60px"/>
 
     <tx:in label="Label" value="Some Value"/>
+    <tx:in label="Label" value="Some Value"/>
+    <tx:in label="Label" value="Some Value"/>
+    <tx:in label="Label" value="Some Value"/>
 
   </tc:page>
 </f:view>