You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2006/07/25 05:27:27 UTC

svn commit: r425291 [2/6] - in /incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src: main/java/org/apache/myfaces/adfdemo/ main/java/org/apache/myfaces/adfdemo/change/ main/java/org/apache/myfaces/adfdemo/composite/ main/...

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/CustomMessageConvertValidateBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/CustomMessageConvertValidateBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/CustomMessageConvertValidateBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/CustomMessageConvertValidateBean.java Mon Jul 24 22:27:24 2006
@@ -13,153 +13,153 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import java.awt.Color;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-public class CustomMessageConvertValidateBean implements java.io.Serializable
-{
-  public CustomMessageConvertValidateBean()
-  {
-    _date1 = new Date();
-    _date2 = new Date();
-    _minDate = new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000);
-    _maxDate = new Date();
-
-    _messages.put("DOB_REQD_ID","You should specify \"{0}\" to apply for license");
-    _messages.put("PIN_NO_MATCH_ID","Value \"{1}\" is not a valid \"{0}\". It should be a valid three digit number, first digit not being zero. The expected pattern is \"{2}\".");
-  }
-
-
-  public String action()
-  {
-    return "success";
-  }
-
-  public Date getDate1()
-  {
-    return _date1;
-  }
-
-  public void setDate1(Date date)
-  {
-    _date1 = date;
-  }
-
-  public Date getDate2()
-  {
-    return _date2;
-  }
-
-  public void setDate2(Date date)
-  {
-    _date2 = date;
-  }
-
-  public void setMinDate(Date minDate)
-  {
-    _minDate = minDate;
-  }
-
-   public Date getMinDate()
-  {
-    return _minDate;
-  }
-
-  public void setMaxDate(Date maxDate)
-  {
-    _maxDate = maxDate;
-  }
-
-   public Date getMaxDate()
-  {
-    return _maxDate;
-  }
-
-  public Date getCurrentDate()
-  {
-    return new Date();
-  }
-
-  public void setCurrentDate(Date date)
-  {
-    return;
-  }
-
-  public String getRegExpValue()
-  {
-    return _regExpValue;
-  }
-
-  public void setRegExpValue(String regExpValue)
-  {
-    _regExpValue = regExpValue;
-  }
-
-   public String getByteLengthValue()
-  {
-    return _byteLegthValue;
-  }
-
-  public void setByteLengthValue(String value)
-  {
-    _byteLegthValue = value;
-  }
-
-  public Color getColor()
-  {
-    return _color;
-  }
-
-  public void setColor(Color colorValue)
-  {
-    _color = colorValue;
-  }
-
-  public Map getMessages()
-  {
-    return _messages;
-  }
-
-  public String getMinDateTip()
-  {
-    if (_dft instanceof SimpleDateFormat)
-    {
-      ((SimpleDateFormat)_dft).applyPattern("M/d/yyyy");
-    }
-    return _dft.format(_minDate);
-  }
-
-  public String getMaxDateTip()
-  {
-    if (_dft instanceof SimpleDateFormat)
-    {
-      ((SimpleDateFormat)_dft).applyPattern("M/d/yyyy");
-    }
-    return _dft.format(_maxDate);
-  }
-
-
-  private DateFormat _dft = DateFormat.getDateInstance();
-
-  private Map _messages = new HashMap();
-
-  private Color _color = new Color(255,0,0);
-
-  private String _byteLegthValue = null;
-
-  private String _regExpValue = null;
-
-  private Date _date1;
-
-  private Date _date2;
-
-  private Date _minDate;
-
-  private Date _maxDate;
-
-}
+package org.apache.myfaces.adfdemo;
+import java.awt.Color;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CustomMessageConvertValidateBean implements java.io.Serializable
+{
+  public CustomMessageConvertValidateBean()
+  {
+    _date1 = new Date();
+    _date2 = new Date();
+    _minDate = new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000);
+    _maxDate = new Date();
+
+    _messages.put("DOB_REQD_ID","You should specify \"{0}\" to apply for license");
+    _messages.put("PIN_NO_MATCH_ID","Value \"{1}\" is not a valid \"{0}\". It should be a valid three digit number, first digit not being zero. The expected pattern is \"{2}\".");
+  }
+
+
+  public String action()
+  {
+    return "success";
+  }
+
+  public Date getDate1()
+  {
+    return _date1;
+  }
+
+  public void setDate1(Date date)
+  {
+    _date1 = date;
+  }
+
+  public Date getDate2()
+  {
+    return _date2;
+  }
+
+  public void setDate2(Date date)
+  {
+    _date2 = date;
+  }
+
+  public void setMinDate(Date minDate)
+  {
+    _minDate = minDate;
+  }
+
+   public Date getMinDate()
+  {
+    return _minDate;
+  }
+
+  public void setMaxDate(Date maxDate)
+  {
+    _maxDate = maxDate;
+  }
+
+   public Date getMaxDate()
+  {
+    return _maxDate;
+  }
+
+  public Date getCurrentDate()
+  {
+    return new Date();
+  }
+
+  public void setCurrentDate(Date date)
+  {
+    return;
+  }
+
+  public String getRegExpValue()
+  {
+    return _regExpValue;
+  }
+
+  public void setRegExpValue(String regExpValue)
+  {
+    _regExpValue = regExpValue;
+  }
+
+   public String getByteLengthValue()
+  {
+    return _byteLegthValue;
+  }
+
+  public void setByteLengthValue(String value)
+  {
+    _byteLegthValue = value;
+  }
+
+  public Color getColor()
+  {
+    return _color;
+  }
+
+  public void setColor(Color colorValue)
+  {
+    _color = colorValue;
+  }
+
+  public Map getMessages()
+  {
+    return _messages;
+  }
+
+  public String getMinDateTip()
+  {
+    if (_dft instanceof SimpleDateFormat)
+    {
+      ((SimpleDateFormat)_dft).applyPattern("M/d/yyyy");
+    }
+    return _dft.format(_minDate);
+  }
+
+  public String getMaxDateTip()
+  {
+    if (_dft instanceof SimpleDateFormat)
+    {
+      ((SimpleDateFormat)_dft).applyPattern("M/d/yyyy");
+    }
+    return _dft.format(_maxDate);
+  }
+
+
+  private DateFormat _dft = DateFormat.getDateInstance();
+
+  private Map _messages = new HashMap();
+
+  private Color _color = new Color(255,0,0);
+
+  private String _byteLegthValue = null;
+
+  private String _regExpValue = null;
+
+  private Date _date1;
+
+  private Date _date2;
+
+  private Date _minDate;
+
+  private Date _maxDate;
+
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/CustomMessageConvertValidateBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DataBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DataBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DataBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DataBean.java Mon Jul 24 22:27:24 2006
@@ -13,72 +13,72 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.adf.context.AdfFacesContext;
-
-public class DataBean implements java.io.Serializable
-{
-  public DataBean()
-  {
-    // This isn't thread-safe.  I don't care. :)
-    _int = _sCount++;
-    _string = "String " + _int;
-    _boolean = ((_int % 2) == 0);
-  }
-
-  public String action()
-  {
-    FacesContext context = FacesContext.getCurrentInstance();
-    FacesMessage message = new FacesMessage("CLICKED ON ROW " + _int + ", " +
-                                            _string);
-    context.addMessage(null, message);
-    return null;
-  }
-
-  public String showDetail()
-  {
-    AdfFacesContext.getCurrentInstance().
-      getPageFlowScope().put("detail", this);
-    return "showDetail";
-  }
-
-  public boolean getBoolean()
-  {
-    return _boolean;
-  }
-
-  public void setBoolean(boolean aBoolean)
-  {
-    _boolean = aBoolean;
-  }
-
-
-  public int getInt()
-  {
-    return _int;
-  }
-
-  public void setInt(int anInt)
-  {
-    _int = anInt;
-  }
-
-  public String getString()
-  {
-    return _string;
-  }
-
-  public void setString(String aString)
-  {
-    _string = aString;
-  }
-
-  private int _int;
-  private boolean  _boolean;
-  private String _string;
-
-  static private int _sCount = 0;
-}
+package org.apache.myfaces.adfdemo;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.adf.context.AdfFacesContext;
+
+public class DataBean implements java.io.Serializable
+{
+  public DataBean()
+  {
+    // This isn't thread-safe.  I don't care. :)
+    _int = _sCount++;
+    _string = "String " + _int;
+    _boolean = ((_int % 2) == 0);
+  }
+
+  public String action()
+  {
+    FacesContext context = FacesContext.getCurrentInstance();
+    FacesMessage message = new FacesMessage("CLICKED ON ROW " + _int + ", " +
+                                            _string);
+    context.addMessage(null, message);
+    return null;
+  }
+
+  public String showDetail()
+  {
+    AdfFacesContext.getCurrentInstance().
+      getPageFlowScope().put("detail", this);
+    return "showDetail";
+  }
+
+  public boolean getBoolean()
+  {
+    return _boolean;
+  }
+
+  public void setBoolean(boolean aBoolean)
+  {
+    _boolean = aBoolean;
+  }
+
+
+  public int getInt()
+  {
+    return _int;
+  }
+
+  public void setInt(int anInt)
+  {
+    _int = anInt;
+  }
+
+  public String getString()
+  {
+    return _string;
+  }
+
+  public void setString(String aString)
+  {
+    _string = aString;
+  }
+
+  private int _int;
+  private boolean  _boolean;
+  private String _string;
+
+  static private int _sCount = 0;
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DataBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DateBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DateBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DateBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DateBean.java Mon Jul 24 22:27:24 2006
@@ -13,102 +13,102 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import java.util.Date;
-
-public class DateBean implements java.io.Serializable
-{
-  public DateBean()
-  {
-
-    _date1 = new Date();
-    _date2 = new Date();
-    _date3 = new Date();
-    _date4 = new Date();
-    _minDate = new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000);
-    _maxDate = new Date();
-  }
-
-  public String action()
-  {
-    return "success";
-  }
-
-  public Date getDate1()
-  {
-    return _date1;
-  }
-
-  public void setDate1(Date date)
-  {
-    _date1 = date;
-  }
-
-  public Date getDate2()
-  {
-    return _date2;
-  }
-
-  public void setDate2(Date date)
-  {
-    _date2 = date;
-  }
-
-  public Date getDate3()
-  {
-    return _date3;
-  }
-
-  public void setDate3(Date date)
-  {
-    _date3 = date;
-  }
-
-  public Date getDate4()
-  {
-    return _date4;
-  }
-
-  public void setDate4(Date date)
-  {
-    _date4 = date;
-  }
-
-  public void setMinDate(Date minDate)
-  {
-    _minDate = minDate;
-  }
-
-   public Date getMinDate()
-  {
-    return _minDate;
-  }
-
-  public void setMaxDate(Date maxDate)
-  {
-    _maxDate = maxDate;
-  }
-
-   public Date getMaxDate()
-  {
-    return _maxDate;
-  }
-
-  public Date getCurrentDate()
-  {
-    return new Date();
-  }
-
-  public void setCurrentDate(Date date)
-  {
-    return;
-  }
-
-  private Date _date1;
-  private Date _date2;
-  private Date _date3;
-  private Date _date4;
-  private Date _minDate;
-  private Date _maxDate;
-
-}
+package org.apache.myfaces.adfdemo;
+import java.util.Date;
+
+public class DateBean implements java.io.Serializable
+{
+  public DateBean()
+  {
+
+    _date1 = new Date();
+    _date2 = new Date();
+    _date3 = new Date();
+    _date4 = new Date();
+    _minDate = new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000);
+    _maxDate = new Date();
+  }
+
+  public String action()
+  {
+    return "success";
+  }
+
+  public Date getDate1()
+  {
+    return _date1;
+  }
+
+  public void setDate1(Date date)
+  {
+    _date1 = date;
+  }
+
+  public Date getDate2()
+  {
+    return _date2;
+  }
+
+  public void setDate2(Date date)
+  {
+    _date2 = date;
+  }
+
+  public Date getDate3()
+  {
+    return _date3;
+  }
+
+  public void setDate3(Date date)
+  {
+    _date3 = date;
+  }
+
+  public Date getDate4()
+  {
+    return _date4;
+  }
+
+  public void setDate4(Date date)
+  {
+    _date4 = date;
+  }
+
+  public void setMinDate(Date minDate)
+  {
+    _minDate = minDate;
+  }
+
+   public Date getMinDate()
+  {
+    return _minDate;
+  }
+
+  public void setMaxDate(Date maxDate)
+  {
+    _maxDate = maxDate;
+  }
+
+   public Date getMaxDate()
+  {
+    return _maxDate;
+  }
+
+  public Date getCurrentDate()
+  {
+    return new Date();
+  }
+
+  public void setCurrentDate(Date date)
+  {
+    return;
+  }
+
+  private Date _date1;
+  private Date _date2;
+  private Date _date3;
+  private Date _date4;
+  private Date _minDate;
+  private Date _maxDate;
+
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DateBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoCommandNavigationItemBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoCommandNavigationItemBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoCommandNavigationItemBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoCommandNavigationItemBean.java Mon Jul 24 22:27:24 2006
@@ -13,55 +13,55 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import java.util.List;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionEvent;
-
-import org.apache.myfaces.adf.bean.FacesBean;
-import org.apache.myfaces.adf.bean.PropertyKey;
-import org.apache.myfaces.adf.component.UIXCommand;
-import org.apache.myfaces.adf.component.UIXNavigationHierarchy;
-import org.apache.myfaces.adf.context.AdfFacesContext;
-
-public class DemoCommandNavigationItemBean
-{
-  /**
-   * Changes the selected state of all of the navigation items in the
-   * parent component so that the clicked navigation item becomes
-   * selected and the others become deselected.
-   * @param event the ActionEvent associated with the action
-   */
-  public void navigationItemAction(ActionEvent event)
-  {
-    UIComponent actionItem = event.getComponent();
-    UIComponent parent = actionItem.getParent();
-    while (! (parent instanceof UIXNavigationHierarchy) )
-    {
-      parent = parent.getParent();
-      if (parent == null)
-      {
-        System.err.println(
-          "Unexpected component hierarchy, no UIXNavigationHierarchy found.");
-        return;
-      }
-    }
-
-    List<UIXCommand> children = parent.getChildren();
-    for (UIXCommand child : children)
-    {
-      FacesBean childFacesBean = child.getFacesBean();
-      FacesBean.Type type = childFacesBean.getType();
-      PropertyKey selectedKey = type.findKey("selected");
-      if (selectedKey != null)
-      {
-        childFacesBean.setProperty(selectedKey, (child == actionItem));
-      }
-    }
-
-    AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
-    adfContext.addPartialTarget(parent);
-  }
+package org.apache.myfaces.adfdemo;
+
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
+
+import org.apache.myfaces.adf.bean.FacesBean;
+import org.apache.myfaces.adf.bean.PropertyKey;
+import org.apache.myfaces.adf.component.UIXCommand;
+import org.apache.myfaces.adf.component.UIXNavigationHierarchy;
+import org.apache.myfaces.adf.context.AdfFacesContext;
+
+public class DemoCommandNavigationItemBean
+{
+  /**
+   * Changes the selected state of all of the navigation items in the
+   * parent component so that the clicked navigation item becomes
+   * selected and the others become deselected.
+   * @param event the ActionEvent associated with the action
+   */
+  public void navigationItemAction(ActionEvent event)
+  {
+    UIComponent actionItem = event.getComponent();
+    UIComponent parent = actionItem.getParent();
+    while (! (parent instanceof UIXNavigationHierarchy) )
+    {
+      parent = parent.getParent();
+      if (parent == null)
+      {
+        System.err.println(
+          "Unexpected component hierarchy, no UIXNavigationHierarchy found.");
+        return;
+      }
+    }
+
+    List<UIXCommand> children = parent.getChildren();
+    for (UIXCommand child : children)
+    {
+      FacesBean childFacesBean = child.getFacesBean();
+      FacesBean.Type type = childFacesBean.getType();
+      PropertyKey selectedKey = type.findKey("selected");
+      if (selectedKey != null)
+      {
+        childFacesBean.setProperty(selectedKey, (child == actionItem));
+      }
+    }
+
+    AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
+    adfContext.addPartialTarget(parent);
+  }
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoCommandNavigationItemBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoTreeData.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoTreeData.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoTreeData.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoTreeData.java Mon Jul 24 22:27:24 2006
@@ -13,73 +13,73 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
-package org.apache.myfaces.adfdemo;
-
-import java.util.ArrayList;
-
-/**
- *
- * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-demo/src/main/java/oracle/adfdemo/view/faces/DemoTreeData.java#1 $) $Date: 16-aug-2005.15:12:27 $
- * @author ADF Faces Team
- */
-
-public class DemoTreeData extends ArrayList
-{
-
-  // data
-
-  /**
-   * @param text the text label of the tree node
-   */
-  private static TreeNodeImpl _createNode(
-    String text
-    )
-  {
-    TreeNodeImpl data = new TreeNodeImpl();
-    data.setText(text);
-    data.setDestination( "http://www.oracle.com");
-    return data;
-  }
-
-  public DemoTreeData()
-  {
-    TreeNodeImpl node_0 = _createNode("node_0");
-    TreeNodeImpl node_0_0 = _createNode("node_0_0");
-    TreeNodeImpl node_0_0_0 = _createNode("node_0_0_0");
-    TreeNodeImpl node_0_0_0_0 = _createNode("node_0_0_0_0");
-    TreeNodeImpl node_0_0_1 = _createNode("node_0_0_1");
-    TreeNodeImpl node_0_1 = _createNode("node_0_1");
-    TreeNodeImpl node_0_1_0 = _createNode("node_0_1_0");
-    TreeNodeImpl node_0_1_1 = _createNode("node_0_1_1");
-    TreeNodeImpl node_0_2 = _createNode("node_0_2");
-    TreeNodeImpl node_0_3 = _createNode("node_0_3");
-    TreeNodeImpl node_0_4 = _createNode("node_0_4");
-    TreeNodeImpl node_0_5 = _createNode("node_0_5");
-
-    add(node_0);
-
-    ArrayList list_0 = new ArrayList();
-    list_0.add(node_0_0);
-    list_0.add(node_0_1);
-    list_0.add(node_0_2);
-    list_0.add(node_0_3);
-    list_0.add(node_0_4);
-    list_0.add(node_0_5);
-    node_0.setChildren(list_0);
-
-    ArrayList list_0_0 = new ArrayList();
-    list_0_0.add(node_0_0_0);
-    list_0_0.add(node_0_0_1);
-    node_0_0.setChildren(list_0_0);
-
-    ArrayList list_0_0_0 = new ArrayList();
-    list_0_0_0.add(node_0_0_0_0);
-    node_0_0_0.setChildren(list_0_0_0);
-
-    ArrayList list_0_1 = new ArrayList();
-    list_0_1.add(node_0_1_0);
-    list_0_1.add(node_0_1_1);
-    node_0_1.setChildren(list_0_1);
-  }
-}
+
+package org.apache.myfaces.adfdemo;
+
+import java.util.ArrayList;
+
+/**
+ *
+ * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-demo/src/main/java/oracle/adfdemo/view/faces/DemoTreeData.java#1 $) $Date: 16-aug-2005.15:12:27 $
+ * @author ADF Faces Team
+ */
+
+public class DemoTreeData extends ArrayList
+{
+
+  // data
+
+  /**
+   * @param text the text label of the tree node
+   */
+  private static TreeNodeImpl _createNode(
+    String text
+    )
+  {
+    TreeNodeImpl data = new TreeNodeImpl();
+    data.setText(text);
+    data.setDestination( "http://www.oracle.com");
+    return data;
+  }
+
+  public DemoTreeData()
+  {
+    TreeNodeImpl node_0 = _createNode("node_0");
+    TreeNodeImpl node_0_0 = _createNode("node_0_0");
+    TreeNodeImpl node_0_0_0 = _createNode("node_0_0_0");
+    TreeNodeImpl node_0_0_0_0 = _createNode("node_0_0_0_0");
+    TreeNodeImpl node_0_0_1 = _createNode("node_0_0_1");
+    TreeNodeImpl node_0_1 = _createNode("node_0_1");
+    TreeNodeImpl node_0_1_0 = _createNode("node_0_1_0");
+    TreeNodeImpl node_0_1_1 = _createNode("node_0_1_1");
+    TreeNodeImpl node_0_2 = _createNode("node_0_2");
+    TreeNodeImpl node_0_3 = _createNode("node_0_3");
+    TreeNodeImpl node_0_4 = _createNode("node_0_4");
+    TreeNodeImpl node_0_5 = _createNode("node_0_5");
+
+    add(node_0);
+
+    ArrayList list_0 = new ArrayList();
+    list_0.add(node_0_0);
+    list_0.add(node_0_1);
+    list_0.add(node_0_2);
+    list_0.add(node_0_3);
+    list_0.add(node_0_4);
+    list_0.add(node_0_5);
+    node_0.setChildren(list_0);
+
+    ArrayList list_0_0 = new ArrayList();
+    list_0_0.add(node_0_0_0);
+    list_0_0.add(node_0_0_1);
+    node_0_0.setChildren(list_0_0);
+
+    ArrayList list_0_0_0 = new ArrayList();
+    list_0_0_0.add(node_0_0_0_0);
+    node_0_0_0.setChildren(list_0_0_0);
+
+    ArrayList list_0_1 = new ArrayList();
+    list_0_1.add(node_0_1_0);
+    list_0_1.add(node_0_1_1);
+    node_0_1.setChildren(list_0_1);
+  }
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/DemoTreeData.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/InfiniteTree.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/InfiniteTree.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/InfiniteTree.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/InfiniteTree.java Mon Jul 24 22:27:24 2006
@@ -13,80 +13,80 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import java.io.Serializable;
-import java.util.AbstractList;
-import java.util.List;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
-public class InfiniteTree extends AbstractList implements Serializable
-{
-  public InfiniteTree(String id)
-  {
-    _id = id;
-  }
-
-  public InfiniteTree()
-  {
-    this("");
-  }
-
-  public int size()
-  {
-    return _GENES.length;
-  }
-
-  public Object get(int index)
-  {
-    return new Bean(index);
-  }
-
-  // must be public for bean introspection:
-  public final class Bean
-  {
-    public Bean(int index)
-    {
-      _index = index;
-    }
-
-    public String action()
-    {
-      FacesContext context = FacesContext.getCurrentInstance();
-      FacesMessage message = new FacesMessage("Clicked on Gene " + getLabel());
-      context.addMessage(null, message);
-      return null;
-    }
-
-    public String getLabel()
-    {
-      char ch = _GENES[_index];
-      return _id + ch;
-    }
-
-    public String getParentLabel()
-    {
-      return _id;
-    }
-
-    public int getIndex()
-    {
-      return _index;
-    }
-
-    public int getDepth()
-    {
-      return getLabel().length();
-    }
-
-    public List getKids()
-    {
-      return new InfiniteTree(getLabel());
-    }
-
-    private final int _index;
-  }
-
-  private final String _id;
-  private static final char[] _GENES = {'A', 'C', 'G', 'T'};
+package org.apache.myfaces.adfdemo;
+import java.io.Serializable;
+import java.util.AbstractList;
+import java.util.List;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+
+public class InfiniteTree extends AbstractList implements Serializable
+{
+  public InfiniteTree(String id)
+  {
+    _id = id;
+  }
+
+  public InfiniteTree()
+  {
+    this("");
+  }
+
+  public int size()
+  {
+    return _GENES.length;
+  }
+
+  public Object get(int index)
+  {
+    return new Bean(index);
+  }
+
+  // must be public for bean introspection:
+  public final class Bean
+  {
+    public Bean(int index)
+    {
+      _index = index;
+    }
+
+    public String action()
+    {
+      FacesContext context = FacesContext.getCurrentInstance();
+      FacesMessage message = new FacesMessage("Clicked on Gene " + getLabel());
+      context.addMessage(null, message);
+      return null;
+    }
+
+    public String getLabel()
+    {
+      char ch = _GENES[_index];
+      return _id + ch;
+    }
+
+    public String getParentLabel()
+    {
+      return _id;
+    }
+
+    public int getIndex()
+    {
+      return _index;
+    }
+
+    public int getDepth()
+    {
+      return getLabel().length();
+    }
+
+    public List getKids()
+    {
+      return new InfiniteTree(getLabel());
+    }
+
+    private final int _index;
+  }
+
+  private final String _id;
+  private static final char[] _GENES = {'A', 'C', 'G', 'T'};
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/InfiniteTree.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ListTestBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ListTestBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ListTestBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ListTestBean.java Mon Jul 24 22:27:24 2006
@@ -13,241 +13,241 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import java.lang.reflect.Array;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ValueChangeEvent;
-import javax.faces.model.SelectItem;
-
-public class ListTestBean implements java.io.Serializable
-{
-  public void valueChanged(ValueChangeEvent vce)
-  {
-    String oldValue = _toString(vce.getOldValue());
-    Object newValue = _toString(vce.getNewValue());
-    FacesContext context = FacesContext.getCurrentInstance();
-    String message =
-      "Value changed from " + oldValue + " to " + newValue;
-    context.addMessage(vce.getComponent().getClientId(context),
-                       new FacesMessage(message));
-  }
-
-  public Integer getSingleInt()
-  {
-    return _int;
-  }
-
-  public void setSingleInt(Integer val)
-  {
-    _int = val;
-  }
-
-  public int[] getIntArray()
-  {
-    return _intArray;
-  }
-
-  public void setIntArray(int[] val)
-  {
-    _intArray = val;
-  }
-
-  public String getSingleString()
-  {
-    return _string;
-  }
-
-  public void setSingleString(String val)
-  {
-    _string = val;
-  }
-
-  public String[] getStringArray()
-  {
-    return _stringArray;
-  }
-
-  public void setStringArray(String[] val)
-  {
-    _stringArray = val;
-  }
-
-  public List getObjectList()
-  {
-    return _objectList;
-  }
-
-  public void setObjectList(List val)
-  {
-    _objectList = val;
-  }
-
-  public List getStringList()
-  {
-    return _stringList;
-  }
-
-  public void setSelectedSelectItems(List val)
-  {
-    _selectedSelectItems = val;
-  }
-
-  public List getSelectedSelectItems()
-  {
-    return _selectedSelectItems;
-  }
-  
-  public void setSelectedCars(List selectedCars)
-  {
-    _selectedCars = selectedCars;
-  }
-
-  public List getSelectedCars()
-  {
-    return _selectedCars;
-  }
-    
-  public List getMakes()
-  {
-    return _MAKE_ITEMS;
-  }
-
-  
-  public SelectItem getFirstSelectItemString()
-  {
-    return _FIRST_CAR;
-  }
-  
-  public SelectItem getSecondSelectItemString()
-  {
-    return _SECOND_CAR;
-  }
-  
-  public SelectItem getThirdSelectItemString()
-  {
-    return _THIRD_CAR;
-  }  
-  
-  public SelectItem getFirstSelectItemCar()
-  {
-    return _FIRST_SELECT_ITEM_CAR;
-  }
-  
-  public SelectItem getSecondSelectItemCar()
-  {
-    return _SECOND_SELECT_ITEM_CAR;
-  }
-  
-  public SelectItem getThirdSelectItemCar()
-  {
-    return _THIRD_SELECT_ITEM_CAR;
-  }  
-  
-  static private String _toString(Object o)
-  {
-    if (o == null)
-      return "null";
-
-    if (o instanceof List)
-    {
-      String s = "List[";
-      for (int i = 0; i < ((List) o).size(); i++)
-      {
-        if (i != 0)
-          s += ",";
-
-        s += _toString(((List) o).get(i));
-      }
-
-      return s + "]";
-    }
-    else if (o.getClass().isArray())
-    {
-      String s = "Array[";
-      int size = Array.getLength(o);
-      for (int i = 0; i < size; i++)
-      {
-        if (i != 0)
-          s += ",";
-
-        s += _toString(Array.get(o, i));
-      }
-
-      return s + "]";
-    }
-
-    if (o instanceof Car)
-      return "\"" + ((Car)o).getName() + "\"";
-      
-    if (o instanceof String)
-      return "\"" + o.toString() + "\"";
-
-    return o.toString();
-  }
-
-  // this is used to test a Car Object instead of a String in SelectItem
-  // when we use this, we also need to set "useIndexValue" attribute to true.
-  static public class Car  implements java.io.Serializable
-  {
-    public Car(){}
-    
-    public Car (String name)
-    {
-      _name = name;
-    }
-    public String getName()
-    {
-      return _name;
-    }
-    private String _name;
-  } 
-  
-  static private final List _MAKE_ITEMS = new ArrayList();
-  
-  static private final SelectItem _FIRST_CAR = 
-    new SelectItem("cordera", "Cordera Ltd.");
-  static private final SelectItem _SECOND_CAR = 
-    new SelectItem("automno", "Autumno Inc.");
-  static private final SelectItem _THIRD_CAR  = 
-    new SelectItem("grabowski", "Grabowski Motors");
-
-  static private final SelectItem _FIRST_SELECT_ITEM_CAR = 
-    new SelectItem(new Car("cordera"), "Cordera Ltd.");
-  static private final SelectItem _SECOND_SELECT_ITEM_CAR = 
-    new SelectItem(new Car("automno"), "Autumno Inc.");
-  static private final SelectItem _THIRD_SELECT_ITEM_CAR  = 
-    new SelectItem(new Car("grabowski"), "Grabowski Motors"); 
-
-
-  static
-  {
-    // test a Car Object instead of a String in SelectItem.
-    // If you do not have a converter, 
-    // make sure to use "useIndexValue='true'" in selectOne/selectMany
-    // component.
-    _MAKE_ITEMS.add(_FIRST_SELECT_ITEM_CAR);
-    _MAKE_ITEMS.add(_SECOND_SELECT_ITEM_CAR);
-    _MAKE_ITEMS.add(_THIRD_SELECT_ITEM_CAR);
-  }   
-  
-  private List _selectedCars;
-  private List _selectedSelectItems;
-    
-  private Integer _int = 1;
-  private int[] _intArray;
-
-  private String _string;
-  private String[] _stringArray;
-
-  private List _stringList;
-  private List _objectList;
-  
-
-  
-}
+package org.apache.myfaces.adfdemo;
+
+import java.lang.reflect.Array;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.SelectItem;
+
+public class ListTestBean implements java.io.Serializable
+{
+  public void valueChanged(ValueChangeEvent vce)
+  {
+    String oldValue = _toString(vce.getOldValue());
+    Object newValue = _toString(vce.getNewValue());
+    FacesContext context = FacesContext.getCurrentInstance();
+    String message =
+      "Value changed from " + oldValue + " to " + newValue;
+    context.addMessage(vce.getComponent().getClientId(context),
+                       new FacesMessage(message));
+  }
+
+  public Integer getSingleInt()
+  {
+    return _int;
+  }
+
+  public void setSingleInt(Integer val)
+  {
+    _int = val;
+  }
+
+  public int[] getIntArray()
+  {
+    return _intArray;
+  }
+
+  public void setIntArray(int[] val)
+  {
+    _intArray = val;
+  }
+
+  public String getSingleString()
+  {
+    return _string;
+  }
+
+  public void setSingleString(String val)
+  {
+    _string = val;
+  }
+
+  public String[] getStringArray()
+  {
+    return _stringArray;
+  }
+
+  public void setStringArray(String[] val)
+  {
+    _stringArray = val;
+  }
+
+  public List getObjectList()
+  {
+    return _objectList;
+  }
+
+  public void setObjectList(List val)
+  {
+    _objectList = val;
+  }
+
+  public List getStringList()
+  {
+    return _stringList;
+  }
+
+  public void setSelectedSelectItems(List val)
+  {
+    _selectedSelectItems = val;
+  }
+
+  public List getSelectedSelectItems()
+  {
+    return _selectedSelectItems;
+  }
+  
+  public void setSelectedCars(List selectedCars)
+  {
+    _selectedCars = selectedCars;
+  }
+
+  public List getSelectedCars()
+  {
+    return _selectedCars;
+  }
+    
+  public List getMakes()
+  {
+    return _MAKE_ITEMS;
+  }
+
+  
+  public SelectItem getFirstSelectItemString()
+  {
+    return _FIRST_CAR;
+  }
+  
+  public SelectItem getSecondSelectItemString()
+  {
+    return _SECOND_CAR;
+  }
+  
+  public SelectItem getThirdSelectItemString()
+  {
+    return _THIRD_CAR;
+  }  
+  
+  public SelectItem getFirstSelectItemCar()
+  {
+    return _FIRST_SELECT_ITEM_CAR;
+  }
+  
+  public SelectItem getSecondSelectItemCar()
+  {
+    return _SECOND_SELECT_ITEM_CAR;
+  }
+  
+  public SelectItem getThirdSelectItemCar()
+  {
+    return _THIRD_SELECT_ITEM_CAR;
+  }  
+  
+  static private String _toString(Object o)
+  {
+    if (o == null)
+      return "null";
+
+    if (o instanceof List)
+    {
+      String s = "List[";
+      for (int i = 0; i < ((List) o).size(); i++)
+      {
+        if (i != 0)
+          s += ",";
+
+        s += _toString(((List) o).get(i));
+      }
+
+      return s + "]";
+    }
+    else if (o.getClass().isArray())
+    {
+      String s = "Array[";
+      int size = Array.getLength(o);
+      for (int i = 0; i < size; i++)
+      {
+        if (i != 0)
+          s += ",";
+
+        s += _toString(Array.get(o, i));
+      }
+
+      return s + "]";
+    }
+
+    if (o instanceof Car)
+      return "\"" + ((Car)o).getName() + "\"";
+      
+    if (o instanceof String)
+      return "\"" + o.toString() + "\"";
+
+    return o.toString();
+  }
+
+  // this is used to test a Car Object instead of a String in SelectItem
+  // when we use this, we also need to set "useIndexValue" attribute to true.
+  static public class Car  implements java.io.Serializable
+  {
+    public Car(){}
+    
+    public Car (String name)
+    {
+      _name = name;
+    }
+    public String getName()
+    {
+      return _name;
+    }
+    private String _name;
+  } 
+  
+  static private final List _MAKE_ITEMS = new ArrayList();
+  
+  static private final SelectItem _FIRST_CAR = 
+    new SelectItem("cordera", "Cordera Ltd.");
+  static private final SelectItem _SECOND_CAR = 
+    new SelectItem("automno", "Autumno Inc.");
+  static private final SelectItem _THIRD_CAR  = 
+    new SelectItem("grabowski", "Grabowski Motors");
+
+  static private final SelectItem _FIRST_SELECT_ITEM_CAR = 
+    new SelectItem(new Car("cordera"), "Cordera Ltd.");
+  static private final SelectItem _SECOND_SELECT_ITEM_CAR = 
+    new SelectItem(new Car("automno"), "Autumno Inc.");
+  static private final SelectItem _THIRD_SELECT_ITEM_CAR  = 
+    new SelectItem(new Car("grabowski"), "Grabowski Motors"); 
+
+
+  static
+  {
+    // test a Car Object instead of a String in SelectItem.
+    // If you do not have a converter, 
+    // make sure to use "useIndexValue='true'" in selectOne/selectMany
+    // component.
+    _MAKE_ITEMS.add(_FIRST_SELECT_ITEM_CAR);
+    _MAKE_ITEMS.add(_SECOND_SELECT_ITEM_CAR);
+    _MAKE_ITEMS.add(_THIRD_SELECT_ITEM_CAR);
+  }   
+  
+  private List _selectedCars;
+  private List _selectedSelectItems;
+    
+  private Integer _int = 1;
+  private int[] _intArray;
+
+  private String _string;
+  private String[] _stringArray;
+
+  private List _stringList;
+  private List _objectList;
+  
+
+  
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ListTestBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoStatusBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoStatusBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoStatusBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoStatusBean.java Mon Jul 24 22:27:24 2006
@@ -13,158 +13,158 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import java.text.SimpleDateFormat;
-
-import java.util.Date;
-
-public class PartialDemoStatusBean implements java.io.Serializable
-{
-  public PartialDemoStatusBean()
-  {
-    reset();
-  }
-
-  public boolean getChecked()
-  {
-    return Boolean.TRUE.equals(_checkBoxState);
-  }
-
-  public int getCheckBoxUpdateCount()
-  {
-    return _checkBoxUpdateCount;
-  }
-
-  public String getCheckBoxStateText()
-  {
-    if (_checkBoxState == null)
-      return _DEFAULT_CHECK_STATE;
-
-    if (Boolean.TRUE.equals(_checkBoxState))
-      return _CHECKED_STATE;
-
-    return _NOT_CHECKED_STATE;
-  }
-
-  public String getChoiceInt()
-  {
-    if (_choiceInt == null)
-      return "1";
-    return _choiceInt.toString();
-  }
-
-  public String getChoiceText()
-  {
-    if (_choiceInt == null)
-      return _DEFAULT_CHOICE_TEXT;
-
-    return "value #" + _choiceInt;
-  }
-
-  public String getLinkUpdate()
-  {
-    return _linkUpdate;
-  }
-
-  public String getRadioStateText()
-  {
-    return _radioState;
-  }
-
-  public String getTextStateText()
-  {
-    if (_DEFAULT_TEXT_VALUE.equals(_textValue))
-      return _DEFAULT_TEXT_STATE;
-    return _textValue;
-  }
-
-  public String getTextValue()
-  {
-    return _textValue;
-  }
-
-  public void setChecked(boolean checked)
-  {
-    _checkBoxState = (checked ? Boolean.TRUE : Boolean.FALSE);
-  }
-
-  public void setChecked(Boolean checked)
-  {
-    _checkBoxState = checked;
-  }
-
-  public void setChoiceText(String txt)
-  {
-    // does nothing
-  }
-
-  public void setChoiceInt(String ci)
-  {
-    _choiceInt = new Integer(ci);
-  }
-
-  public void setLinkUpdate()
-  {
-    SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-    _linkUpdate = sdf.format(new Date());
-  }
-
-  public void setRadioStateText(String t)
-  {
-    _radioState = t;
-  }
-
-  void setSelectBooleanState(String value)
-  {
-    _radioState = "selectBoolean set, " + value;
-  }
-
-  void setSelectOneState(String value)
-  {
-    _radioState = "selectOne set, item " + value;
-  }
-
-  public void setTextValue(String t)
-  {
-    _textValue = t;
-  }
-
-  public void resetCheckBox()
-  {
-    _checkBoxUpdateCount = 0;
-    _checkBoxState = null;
-  }
-
-  public void incrementCheckBoxUpdateCount()
-  {
-    _checkBoxUpdateCount++;
-  }
-
-  public void reset()
-  {
-    resetCheckBox();
-    _choiceInt = null;
-    _linkUpdate = _DEFAULT_LINK_UPDATE;
-    _radioState = _DEFAULT_RADIO_STATE;
-    _textValue = _DEFAULT_TEXT_VALUE;
-  }
-
-  private int     _checkBoxUpdateCount;
-  // This is kept as a Boolean so we can reset to the default value.
-  private Boolean _checkBoxState;
-  private Integer _choiceInt;
-  private String  _linkUpdate;
-  private String  _radioState;
-  private String  _textValue;
-
-  private static String _NOTHING              = "nothing yet.";
-  private static String _DEFAULT_CHECK_STATE  = "updates this text.";
-  private static String _CHECKED_STATE        = "is checked.";
-  private static String _NOT_CHECKED_STATE    = "is not checked.";
-  private static String _DEFAULT_CHOICE_TEXT  = _NOTHING;
-  private static String _DEFAULT_LINK_UPDATE  = "never.";
-  private static String _DEFAULT_RADIO_STATE  = "no selection yet.";
-  private static String _DEFAULT_TEXT_STATE   = _NOTHING;
-  private static String _DEFAULT_TEXT_VALUE   = "Change this text";
-}
+package org.apache.myfaces.adfdemo;
+
+import java.text.SimpleDateFormat;
+
+import java.util.Date;
+
+public class PartialDemoStatusBean implements java.io.Serializable
+{
+  public PartialDemoStatusBean()
+  {
+    reset();
+  }
+
+  public boolean getChecked()
+  {
+    return Boolean.TRUE.equals(_checkBoxState);
+  }
+
+  public int getCheckBoxUpdateCount()
+  {
+    return _checkBoxUpdateCount;
+  }
+
+  public String getCheckBoxStateText()
+  {
+    if (_checkBoxState == null)
+      return _DEFAULT_CHECK_STATE;
+
+    if (Boolean.TRUE.equals(_checkBoxState))
+      return _CHECKED_STATE;
+
+    return _NOT_CHECKED_STATE;
+  }
+
+  public String getChoiceInt()
+  {
+    if (_choiceInt == null)
+      return "1";
+    return _choiceInt.toString();
+  }
+
+  public String getChoiceText()
+  {
+    if (_choiceInt == null)
+      return _DEFAULT_CHOICE_TEXT;
+
+    return "value #" + _choiceInt;
+  }
+
+  public String getLinkUpdate()
+  {
+    return _linkUpdate;
+  }
+
+  public String getRadioStateText()
+  {
+    return _radioState;
+  }
+
+  public String getTextStateText()
+  {
+    if (_DEFAULT_TEXT_VALUE.equals(_textValue))
+      return _DEFAULT_TEXT_STATE;
+    return _textValue;
+  }
+
+  public String getTextValue()
+  {
+    return _textValue;
+  }
+
+  public void setChecked(boolean checked)
+  {
+    _checkBoxState = (checked ? Boolean.TRUE : Boolean.FALSE);
+  }
+
+  public void setChecked(Boolean checked)
+  {
+    _checkBoxState = checked;
+  }
+
+  public void setChoiceText(String txt)
+  {
+    // does nothing
+  }
+
+  public void setChoiceInt(String ci)
+  {
+    _choiceInt = new Integer(ci);
+  }
+
+  public void setLinkUpdate()
+  {
+    SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+    _linkUpdate = sdf.format(new Date());
+  }
+
+  public void setRadioStateText(String t)
+  {
+    _radioState = t;
+  }
+
+  void setSelectBooleanState(String value)
+  {
+    _radioState = "selectBoolean set, " + value;
+  }
+
+  void setSelectOneState(String value)
+  {
+    _radioState = "selectOne set, item " + value;
+  }
+
+  public void setTextValue(String t)
+  {
+    _textValue = t;
+  }
+
+  public void resetCheckBox()
+  {
+    _checkBoxUpdateCount = 0;
+    _checkBoxState = null;
+  }
+
+  public void incrementCheckBoxUpdateCount()
+  {
+    _checkBoxUpdateCount++;
+  }
+
+  public void reset()
+  {
+    resetCheckBox();
+    _choiceInt = null;
+    _linkUpdate = _DEFAULT_LINK_UPDATE;
+    _radioState = _DEFAULT_RADIO_STATE;
+    _textValue = _DEFAULT_TEXT_VALUE;
+  }
+
+  private int     _checkBoxUpdateCount;
+  // This is kept as a Boolean so we can reset to the default value.
+  private Boolean _checkBoxState;
+  private Integer _choiceInt;
+  private String  _linkUpdate;
+  private String  _radioState;
+  private String  _textValue;
+
+  private static String _NOTHING              = "nothing yet.";
+  private static String _DEFAULT_CHECK_STATE  = "updates this text.";
+  private static String _CHECKED_STATE        = "is checked.";
+  private static String _NOT_CHECKED_STATE    = "is not checked.";
+  private static String _DEFAULT_CHOICE_TEXT  = _NOTHING;
+  private static String _DEFAULT_LINK_UPDATE  = "never.";
+  private static String _DEFAULT_RADIO_STATE  = "no selection yet.";
+  private static String _DEFAULT_TEXT_STATE   = _NOTHING;
+  private static String _DEFAULT_TEXT_VALUE   = "Change this text";
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoStatusBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoUtilBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoUtilBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoUtilBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoUtilBean.java Mon Jul 24 22:27:24 2006
@@ -13,108 +13,108 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.ValueChangeEvent;
-
-import org.apache.myfaces.adf.component.UIXOutput;
-import org.apache.myfaces.adf.context.AdfFacesContext;
-
-public class PartialDemoUtilBean
-{
-  public void action(ActionEvent action)
-  {
-    // Just update the string which says when the last update was.
-    _status.setLinkUpdate();
-  }
-
-  // This is called for the resetButton
-  public void reset(ActionEvent action)
-  {
-    _status.reset();
-    _resetList();
-  }
-
-  public void valueChanged(ValueChangeEvent vce)
-  {
-    Object newValue = vce.getNewValue();
-    UIComponent component = vce.getComponent();
-
-    String rendererType = component.getRendererType();
-
-    // For these first components the listeners have registered themselves
-    // by setting the partialTriggers attribute. So we just update the model.
-    if (rendererType.equals("org.apache.myfaces.adf.Checkbox"))
-    {
-      _status.setChecked((Boolean) newValue);
-      _status.incrementCheckBoxUpdateCount();
-    }
-    else if (rendererType.equals("org.apache.myfaces.adf.Radio"))
-    {
-      if (Boolean.TRUE.equals(newValue))
-      {
-        String text = (String) component.getAttributes().get("text");
-        _status.setSelectBooleanState(text);
-      }
-      else if (newValue instanceof String)
-        _status.setSelectOneState((String) newValue);
-    }
-    else if (rendererType.equals("org.apache.myfaces.adf.Text"))
-    {
-      if (newValue instanceof String)
-        _status.setTextValue((String) newValue);
-    }
-    else if (rendererType.equals("org.apache.myfaces.adf.Choice"))
-    {
-      if (newValue instanceof String)
-        _status.setChoiceInt((String) newValue);
-    }
-
-    // This component illustrates a method of dynamically adding a
-    // partialTarget (i.e. without setting the partialTriggers attribute). It
-    // updates a component binding and adds the updated component directly to
-    // the list of partial targets.
-    else if (rendererType.equals("org.apache.myfaces.adf.Listbox"))
-    {
-      _listUpdate.setValue(component.getAttributes().get("value"));
-      _addTarget(_listUpdate);
-    }
-  }
-
-  public UIXOutput getListUpdate()
-  {
-    return _listUpdate;
-  }
-
-  public void setListUpdate(UIXOutput listUpdate)
-  {
-    _listUpdate = listUpdate;
-  }
-
-  public PartialDemoStatusBean getStatus()
-  {
-    return _status;
-  }
-
-  public void setStatus(PartialDemoStatusBean status)
-  {
-    _status = status;
-  }
-
-  private void _resetList()
-  {
-    _listUpdate.setValue("nothing yet.");
-    _addTarget(_listUpdate);
-  }
-
-  private void _addTarget(UIComponent target)
-  {
-    AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
-    adfContext.addPartialTarget(target);
-  }
-
-  private PartialDemoStatusBean _status;
-  private UIXOutput _listUpdate;
-}
+package org.apache.myfaces.adfdemo;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+
+import org.apache.myfaces.adf.component.UIXOutput;
+import org.apache.myfaces.adf.context.AdfFacesContext;
+
+public class PartialDemoUtilBean
+{
+  public void action(ActionEvent action)
+  {
+    // Just update the string which says when the last update was.
+    _status.setLinkUpdate();
+  }
+
+  // This is called for the resetButton
+  public void reset(ActionEvent action)
+  {
+    _status.reset();
+    _resetList();
+  }
+
+  public void valueChanged(ValueChangeEvent vce)
+  {
+    Object newValue = vce.getNewValue();
+    UIComponent component = vce.getComponent();
+
+    String rendererType = component.getRendererType();
+
+    // For these first components the listeners have registered themselves
+    // by setting the partialTriggers attribute. So we just update the model.
+    if (rendererType.equals("org.apache.myfaces.adf.Checkbox"))
+    {
+      _status.setChecked((Boolean) newValue);
+      _status.incrementCheckBoxUpdateCount();
+    }
+    else if (rendererType.equals("org.apache.myfaces.adf.Radio"))
+    {
+      if (Boolean.TRUE.equals(newValue))
+      {
+        String text = (String) component.getAttributes().get("text");
+        _status.setSelectBooleanState(text);
+      }
+      else if (newValue instanceof String)
+        _status.setSelectOneState((String) newValue);
+    }
+    else if (rendererType.equals("org.apache.myfaces.adf.Text"))
+    {
+      if (newValue instanceof String)
+        _status.setTextValue((String) newValue);
+    }
+    else if (rendererType.equals("org.apache.myfaces.adf.Choice"))
+    {
+      if (newValue instanceof String)
+        _status.setChoiceInt((String) newValue);
+    }
+
+    // This component illustrates a method of dynamically adding a
+    // partialTarget (i.e. without setting the partialTriggers attribute). It
+    // updates a component binding and adds the updated component directly to
+    // the list of partial targets.
+    else if (rendererType.equals("org.apache.myfaces.adf.Listbox"))
+    {
+      _listUpdate.setValue(component.getAttributes().get("value"));
+      _addTarget(_listUpdate);
+    }
+  }
+
+  public UIXOutput getListUpdate()
+  {
+    return _listUpdate;
+  }
+
+  public void setListUpdate(UIXOutput listUpdate)
+  {
+    _listUpdate = listUpdate;
+  }
+
+  public PartialDemoStatusBean getStatus()
+  {
+    return _status;
+  }
+
+  public void setStatus(PartialDemoStatusBean status)
+  {
+    _status = status;
+  }
+
+  private void _resetList()
+  {
+    _listUpdate.setValue("nothing yet.");
+    _addTarget(_listUpdate);
+  }
+
+  private void _addTarget(UIComponent target)
+  {
+    AdfFacesContext adfContext = AdfFacesContext.getCurrentInstance();
+    adfContext.addPartialTarget(target);
+  }
+
+  private PartialDemoStatusBean _status;
+  private UIXOutput _listUpdate;
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PartialDemoUtilBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PreferencesProxy.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PreferencesProxy.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PreferencesProxy.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PreferencesProxy.java Mon Jul 24 22:27:24 2006
@@ -13,42 +13,42 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import java.util.Collections;
-
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * A proxy class to ask the e-mail demo for preferences information,
- * but only when we're inside the e-mail demo!
- */
-public class PreferencesProxy
-{
-  public Object getProxy()
-  {
-    // If we're in the e-mail demo, use its preferences
-    FacesContext context = FacesContext.getCurrentInstance();
-    if ((context.getViewRoot() != null) &&
-        (context.getViewRoot().getViewId().indexOf("/email/") >= 0))
-    {
-      ValueBinding vb =
-        context.getApplication().createValueBinding("#{email.preferences}");
-      return vb.getValue(context);
-    }
-    // If we are showing the SkinDemo page, get the skinFamily from the 
-    // sessionScope.
-    else if ((context.getViewRoot() != null) &&
-        (context.getViewRoot().getViewId().indexOf("SkinDemo") >= 0))
-    {
-      ValueBinding vb =
-        context.getApplication().createValueBinding("#{sessionScope}");
-      return vb.getValue(context);     
-    }
-    // Otherwise, go to an empty map (blank preferences)
-    else
-      return Collections.EMPTY_MAP;
-
-  }
-}
+package org.apache.myfaces.adfdemo;
+
+import java.util.Collections;
+
+import javax.faces.context.FacesContext;
+import javax.faces.el.ValueBinding;
+
+/**
+ * A proxy class to ask the e-mail demo for preferences information,
+ * but only when we're inside the e-mail demo!
+ */
+public class PreferencesProxy
+{
+  public Object getProxy()
+  {
+    // If we're in the e-mail demo, use its preferences
+    FacesContext context = FacesContext.getCurrentInstance();
+    if ((context.getViewRoot() != null) &&
+        (context.getViewRoot().getViewId().indexOf("/email/") >= 0))
+    {
+      ValueBinding vb =
+        context.getApplication().createValueBinding("#{email.preferences}");
+      return vb.getValue(context);
+    }
+    // If we are showing the SkinDemo page, get the skinFamily from the 
+    // sessionScope.
+    else if ((context.getViewRoot() != null) &&
+        (context.getViewRoot().getViewId().indexOf("SkinDemo") >= 0))
+    {
+      ValueBinding vb =
+        context.getApplication().createValueBinding("#{sessionScope}");
+      return vb.getValue(context);     
+    }
+    // Otherwise, go to an empty map (blank preferences)
+    else
+      return Collections.EMPTY_MAP;
+
+  }
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/PreferencesProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ProgressStepsBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ProgressStepsBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ProgressStepsBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ProgressStepsBean.java Mon Jul 24 22:27:24 2006
@@ -13,78 +13,78 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import java.io.IOException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.adf.event.PollEvent;
-import org.apache.myfaces.adf.model.DefaultBoundedRangeModel;
-
-/**
- * Bean for progress steps demos.
- *
- * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-demo/src/main/java/oracle/adfdemo/view/faces/ProgressStepsBean.java#1 $) $Date: 16-aug-2005.15:12:28 $
- */
-public class ProgressStepsBean extends ProgressBean 
-{
-  public List getProgressSteps()
-  {
-    return _PROGRESS_STEPS;
-  }
-  
-  public void onPoll(PollEvent event)
-  {
-    if ( __model != null && (__model.getMaximum() <= __model.getValue()) )
-    {
-      //pu: This means the background task is complete.
-      //  End the task and navigate off to a different page.
-      endProcess();
-      try
-      {
-        ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext();
-        ec.redirect("../components/progressEnd.jspx?taskStatus=completed");
-      }
-      catch(IOException ioe)
-      {
-        _LOG.log(Level.WARNING, "Could not redirect", ioe);
-      }
-      catch (RuntimeException re)
-      {
-        _LOG.log(Level.SEVERE, "Could not redirect", re);
-        throw re;
-      }
-    }
-  }
-  
-  protected void prepare()
-  {
-    __model = new DefaultBoundedRangeModel(-1, 6);
-    //pu: simulate asynchronous model updates on a different thread
-    __processThread = new ProcessThread(1500, 1);
-    __processThread.start();
-  }
-  
-  static private List _PROGRESS_STEPS;
-  
-  static private final Logger _LOG = Logger.getLogger(
-    ProgressStepsBean.class.getName());
-  
-  static
-  {
-    _PROGRESS_STEPS = new ArrayList();
-    _PROGRESS_STEPS.add("Checking for latest version");
-    _PROGRESS_STEPS.add("Checking available disk space");
-    _PROGRESS_STEPS.add("Copying files");
-    _PROGRESS_STEPS.add("Analyzing dependencies");
-    _PROGRESS_STEPS.add("Install in progress");
-    _PROGRESS_STEPS.add("Building icons and shortcuts");
-  }
-
+package org.apache.myfaces.adfdemo;
+import java.io.IOException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.adf.event.PollEvent;
+import org.apache.myfaces.adf.model.DefaultBoundedRangeModel;
+
+/**
+ * Bean for progress steps demos.
+ *
+ * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-demo/src/main/java/oracle/adfdemo/view/faces/ProgressStepsBean.java#1 $) $Date: 16-aug-2005.15:12:28 $
+ */
+public class ProgressStepsBean extends ProgressBean 
+{
+  public List getProgressSteps()
+  {
+    return _PROGRESS_STEPS;
+  }
+  
+  public void onPoll(PollEvent event)
+  {
+    if ( __model != null && (__model.getMaximum() <= __model.getValue()) )
+    {
+      //pu: This means the background task is complete.
+      //  End the task and navigate off to a different page.
+      endProcess();
+      try
+      {
+        ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext();
+        ec.redirect("../components/progressEnd.jspx?taskStatus=completed");
+      }
+      catch(IOException ioe)
+      {
+        _LOG.log(Level.WARNING, "Could not redirect", ioe);
+      }
+      catch (RuntimeException re)
+      {
+        _LOG.log(Level.SEVERE, "Could not redirect", re);
+        throw re;
+      }
+    }
+  }
+  
+  protected void prepare()
+  {
+    __model = new DefaultBoundedRangeModel(-1, 6);
+    //pu: simulate asynchronous model updates on a different thread
+    __processThread = new ProcessThread(1500, 1);
+    __processThread.start();
+  }
+  
+  static private List _PROGRESS_STEPS;
+  
+  static private final Logger _LOG = Logger.getLogger(
+    ProgressStepsBean.class.getName());
+  
+  static
+  {
+    _PROGRESS_STEPS = new ArrayList();
+    _PROGRESS_STEPS.add("Checking for latest version");
+    _PROGRESS_STEPS.add("Checking available disk space");
+    _PROGRESS_STEPS.add("Copying files");
+    _PROGRESS_STEPS.add("Analyzing dependencies");
+    _PROGRESS_STEPS.add("Install in progress");
+    _PROGRESS_STEPS.add("Building icons and shortcuts");
+  }
+
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ProgressStepsBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ReorderTest.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ReorderTest.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ReorderTest.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ReorderTest.java Mon Jul 24 22:27:24 2006
@@ -13,64 +13,64 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import java.util.List;
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionEvent;
-import org.apache.myfaces.adf.component.core.output.CoreOutputText;
-
-public class ReorderTest
-{
-  public void setPanel(UIComponent panel)
-  {
-    _panel = panel;
-  }
-
-  public UIComponent getPanel()
-  {
-    return _panel;
-  }
-
-  public void add(ActionEvent event)
-  {
-    List children = _panel.getChildren();
-    CoreOutputText output = new CoreOutputText();
-    output.setValue("Item " + (children.size() + 1));
-    children.add(0, output);
-  }
-
-  public void remove(ActionEvent event)
-  {
-    List children = _panel.getChildren();
-    children.remove(children.size() - 1);
-  }
-
-  public void removeFirst(ActionEvent event)
-  {
-    List children = _panel.getChildren();
-    children.remove(0);
-  }
-
-  public void rotate(ActionEvent event)
-  {
-    List children = _panel.getChildren();
-    Object o = children.get(0);
-    children.remove(0);
-    children.add(o);
-  }
-
-  public void removeSeparator(ActionEvent event)
-  {
-    _panel.getFacets().remove("separator");
-  }
-
-  public void setSeparator(ActionEvent event)
-  {
-    CoreOutputText output = new CoreOutputText();
-    output.setValue("New Separator");
-    _panel.getFacets().put("separator", output);
-  }
-  
-  private UIComponent _panel;
+package org.apache.myfaces.adfdemo;
+
+import java.util.List;
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
+import org.apache.myfaces.adf.component.core.output.CoreOutputText;
+
+public class ReorderTest
+{
+  public void setPanel(UIComponent panel)
+  {
+    _panel = panel;
+  }
+
+  public UIComponent getPanel()
+  {
+    return _panel;
+  }
+
+  public void add(ActionEvent event)
+  {
+    List children = _panel.getChildren();
+    CoreOutputText output = new CoreOutputText();
+    output.setValue("Item " + (children.size() + 1));
+    children.add(0, output);
+  }
+
+  public void remove(ActionEvent event)
+  {
+    List children = _panel.getChildren();
+    children.remove(children.size() - 1);
+  }
+
+  public void removeFirst(ActionEvent event)
+  {
+    List children = _panel.getChildren();
+    children.remove(0);
+  }
+
+  public void rotate(ActionEvent event)
+  {
+    List children = _panel.getChildren();
+    Object o = children.get(0);
+    children.remove(0);
+    children.add(o);
+  }
+
+  public void removeSeparator(ActionEvent event)
+  {
+    _panel.getFacets().remove("separator");
+  }
+
+  public void setSeparator(ActionEvent event)
+  {
+    CoreOutputText output = new CoreOutputText();
+    output.setValue("New Separator");
+    _panel.getFacets().put("separator", output);
+  }
+  
+  private UIComponent _panel;
 }

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ReorderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/SelectItemTestBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/SelectItemTestBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/SelectItemTestBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/SelectItemTestBean.java Mon Jul 24 22:27:24 2006
@@ -13,56 +13,56 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import javax.faces.model.SelectItem;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class SelectItemTestBean
-{
-  public SelectItemTestBean()
-  {
-    _oneItem = new SelectItem("foo", "Foo", "Description of foo", false);
-
-    _itemList = new ArrayList();
-    _itemList.add(new SelectItem("foo", "Foo", "Description of foo", false));
-    _itemList.add(new SelectItem("bar", "Bar", "Description of bar", false));
-    _itemList.add(new SelectItem("baz", "Baz", "Description of baz", false));
-
-    _itemArray = new SelectItem[3];
-    _itemArray[0] = new SelectItem("foo", "Foo", "Description of foo", false);
-    _itemArray[1] = new SelectItem("bar", "Bar", "Description of bar", false);
-    _itemArray[2] = new SelectItem("baz", "Baz", "Description of baz", false);
-
-    _itemMap = new HashMap();
-    _itemMap.put("Foo", "foo");
-    _itemMap.put("Bar", "bar");
-    _itemMap.put("Baz", "baz");
-  }
-
-  public SelectItem getOneItem()
-  {
-    return _oneItem;
-  }
-
-  public ArrayList getItemList()
-  {
-    return _itemList;
-  }
-
-  public HashMap getItemMap()
-  {
-    return _itemMap;
-  }
-
-  public SelectItem[] getItemArray()
-  {
-    return _itemArray;
-  }
-
-  private SelectItem _oneItem;
-  private ArrayList  _itemList;
-  private HashMap    _itemMap;
-  private SelectItem[] _itemArray;
-}
+package org.apache.myfaces.adfdemo;
+
+import javax.faces.model.SelectItem;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class SelectItemTestBean
+{
+  public SelectItemTestBean()
+  {
+    _oneItem = new SelectItem("foo", "Foo", "Description of foo", false);
+
+    _itemList = new ArrayList();
+    _itemList.add(new SelectItem("foo", "Foo", "Description of foo", false));
+    _itemList.add(new SelectItem("bar", "Bar", "Description of bar", false));
+    _itemList.add(new SelectItem("baz", "Baz", "Description of baz", false));
+
+    _itemArray = new SelectItem[3];
+    _itemArray[0] = new SelectItem("foo", "Foo", "Description of foo", false);
+    _itemArray[1] = new SelectItem("bar", "Bar", "Description of bar", false);
+    _itemArray[2] = new SelectItem("baz", "Baz", "Description of baz", false);
+
+    _itemMap = new HashMap();
+    _itemMap.put("Foo", "foo");
+    _itemMap.put("Bar", "bar");
+    _itemMap.put("Baz", "baz");
+  }
+
+  public SelectItem getOneItem()
+  {
+    return _oneItem;
+  }
+
+  public ArrayList getItemList()
+  {
+    return _itemList;
+  }
+
+  public HashMap getItemMap()
+  {
+    return _itemMap;
+  }
+
+  public SelectItem[] getItemArray()
+  {
+    return _itemArray;
+  }
+
+  private SelectItem _oneItem;
+  private ArrayList  _itemList;
+  private HashMap    _itemMap;
+  private SelectItem[] _itemArray;
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/SelectItemTestBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TableBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TableBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TableBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TableBean.java Mon Jul 24 22:27:24 2006
@@ -13,63 +13,63 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-
-import org.apache.myfaces.adf.component.UIXCollection;
-import org.apache.myfaces.adf.component.UIXTree;
-import org.apache.myfaces.adf.component.UIXTable;
-import org.apache.myfaces.adf.model.RowKeySet;
-
-public class TableBean
-{
-  public UIComponent getTable()
-  {
-    return _table;
-  }
-
-  public void setTable(UIComponent hgrid)
-  {
-    _table = hgrid;
-  }
-
-  public void performReport(ActionEvent action)
-  {
-    UIXCollection table = (UIXCollection) _table;
-    final RowKeySet state;
-    if (table instanceof UIXTable)
-      state = ((UIXTable) table).getSelectedRowKeys();
-    else
-      state = ((UIXTree) table).getSelectedRowKeys();
-    Iterator selection = state.iterator();
-    Object oldKey = table.getRowKey();
-    _selection = new ArrayList();
-    while (selection.hasNext())
-    {
-      table.setRowKey(selection.next());
-      _selection.add(table.getRowData());
-    }
-    table.setRowKey(oldKey);
-    FacesContext context = FacesContext.getCurrentInstance();
-    FacesMessage message =
-      new FacesMessage("Report Performed","Report was performed on "+
-                       _selection.size()+" records");
-    context.addMessage(null, message);
-  }
-
-  public List getReportItems()
-  {
-    return _selection;
-  }
-
-  private UIComponent _table = null;
-  private List _selection = Collections.EMPTY_LIST;
-}
+package org.apache.myfaces.adfdemo;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+
+import org.apache.myfaces.adf.component.UIXCollection;
+import org.apache.myfaces.adf.component.UIXTree;
+import org.apache.myfaces.adf.component.UIXTable;
+import org.apache.myfaces.adf.model.RowKeySet;
+
+public class TableBean
+{
+  public UIComponent getTable()
+  {
+    return _table;
+  }
+
+  public void setTable(UIComponent hgrid)
+  {
+    _table = hgrid;
+  }
+
+  public void performReport(ActionEvent action)
+  {
+    UIXCollection table = (UIXCollection) _table;
+    final RowKeySet state;
+    if (table instanceof UIXTable)
+      state = ((UIXTable) table).getSelectedRowKeys();
+    else
+      state = ((UIXTree) table).getSelectedRowKeys();
+    Iterator selection = state.iterator();
+    Object oldKey = table.getRowKey();
+    _selection = new ArrayList();
+    while (selection.hasNext())
+    {
+      table.setRowKey(selection.next());
+      _selection.add(table.getRowData());
+    }
+    table.setRowKey(oldKey);
+    FacesContext context = FacesContext.getCurrentInstance();
+    FacesMessage message =
+      new FacesMessage("Report Performed","Report was performed on "+
+                       _selection.size()+" records");
+    context.addMessage(null, message);
+  }
+
+  public List getReportItems()
+  {
+    return _selection;
+  }
+
+  private UIComponent _table = null;
+  private List _selection = Collections.EMPTY_LIST;
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TableBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ToggleBean.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ToggleBean.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ToggleBean.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ToggleBean.java Mon Jul 24 22:27:24 2006
@@ -13,21 +13,21 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-
-import org.apache.myfaces.adf.event.DisclosureEvent;
-
-public class ToggleBean implements java.io.Serializable
-{
-  public void onDisclosure(DisclosureEvent event)
-  {
-    _totalCount++;
-  }
-
-  public int getTotalCount()
-  {
-    return _totalCount;
-  }
-
-  private int _totalCount;
-}
+package org.apache.myfaces.adfdemo;
+
+import org.apache.myfaces.adf.event.DisclosureEvent;
+
+public class ToggleBean implements java.io.Serializable
+{
+  public void onDisclosure(DisclosureEvent event)
+  {
+    _totalCount++;
+  }
+
+  public int getTotalCount()
+  {
+    return _totalCount;
+  }
+
+  private int _totalCount;
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/ToggleBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TreeModelAdapter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TreeModelAdapter.java?rev=425291&r1=425290&r2=425291&view=diff
==============================================================================
--- incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TreeModelAdapter.java (original)
+++ incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TreeModelAdapter.java Mon Jul 24 22:27:24 2006
@@ -13,91 +13,91 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.myfaces.adfdemo;
-import java.beans.IntrospectionException;
-import java.util.List;
-import org.apache.myfaces.adf.model.ChildPropertyTreeModel;
-import org.apache.myfaces.adf.model.TreeModel;
-
-/**
- * This class facilitates the construction of a ChildPropertyTreeModel instance
- * via managed-beans. ChildPropertyTreeModel does not have a no-arg constructor.
- * This class does, and so can be instantiated as a managed-bean.
- * Two properties need to be set: "childProperty" and "instance"
- */
-public class TreeModelAdapter implements java.io.Serializable
-{
-  public TreeModelAdapter()
-  {
-  }
-
-  private String _propertyName = null;
-  private Object _instance = null;
-  private transient TreeModel _model = null;
-
-  public TreeModel getModel() throws IntrospectionException
-  {
-    if (_model == null)
-    {
-      _model = new ChildPropertyTreeModel(getInstance(), getChildProperty());
-    }
-    return _model;
-  }
-
-  public String getChildProperty()
-  {
-    return _propertyName;
-  }
-
-  /**
-   * Sets the property to use to get at child lists
-   * @param propertyName
-   */
-  public void setChildProperty(String propertyName)
-  {
-    _propertyName = propertyName;
-    _model = null;
-  }
-
-  public Object getInstance()
-  {
-    return _instance;
-  }
-
-  /**
-   * Sets the root list for this tree.
-   * @param instance must be something that can be converted into a List
-   */
-  public void setInstance(Object instance)
-  {
-    _instance = instance;
-    _model = null;
-  }
-  
-  /**
-   * Sets the root list for this tree.
-   * This is needed for passing a List when using the managed bean list  
-   * creation facility, which requires the parameter type is List.
-   * @param instance the list of root nodes
-   */
-  public void setListInstance(List instance)
-  {
-    setInstance(instance);
-  }  
-  
-  /**
-   * This should only be called if setListInstance was called.
-   * 
-   * This method shouldn't be needed according to 
-   * faces spec 1.1 rev 1, see 5.3.1.3
-   * However without this we get the following error in websphere:
-   *                java.beans.IntrospectionException: No method 
-   *                            "getListInstance" with 0 arg(s) of 
-   *                            matching types in websphere
-   */
-  public List getListInstance()
-  {
-    return (List)getInstance();
-  }
-  
-}
+package org.apache.myfaces.adfdemo;
+import java.beans.IntrospectionException;
+import java.util.List;
+import org.apache.myfaces.adf.model.ChildPropertyTreeModel;
+import org.apache.myfaces.adf.model.TreeModel;
+
+/**
+ * This class facilitates the construction of a ChildPropertyTreeModel instance
+ * via managed-beans. ChildPropertyTreeModel does not have a no-arg constructor.
+ * This class does, and so can be instantiated as a managed-bean.
+ * Two properties need to be set: "childProperty" and "instance"
+ */
+public class TreeModelAdapter implements java.io.Serializable
+{
+  public TreeModelAdapter()
+  {
+  }
+
+  private String _propertyName = null;
+  private Object _instance = null;
+  private transient TreeModel _model = null;
+
+  public TreeModel getModel() throws IntrospectionException
+  {
+    if (_model == null)
+    {
+      _model = new ChildPropertyTreeModel(getInstance(), getChildProperty());
+    }
+    return _model;
+  }
+
+  public String getChildProperty()
+  {
+    return _propertyName;
+  }
+
+  /**
+   * Sets the property to use to get at child lists
+   * @param propertyName
+   */
+  public void setChildProperty(String propertyName)
+  {
+    _propertyName = propertyName;
+    _model = null;
+  }
+
+  public Object getInstance()
+  {
+    return _instance;
+  }
+
+  /**
+   * Sets the root list for this tree.
+   * @param instance must be something that can be converted into a List
+   */
+  public void setInstance(Object instance)
+  {
+    _instance = instance;
+    _model = null;
+  }
+  
+  /**
+   * Sets the root list for this tree.
+   * This is needed for passing a List when using the managed bean list  
+   * creation facility, which requires the parameter type is List.
+   * @param instance the list of root nodes
+   */
+  public void setListInstance(List instance)
+  {
+    setInstance(instance);
+  }  
+  
+  /**
+   * This should only be called if setListInstance was called.
+   * 
+   * This method shouldn't be needed according to 
+   * faces spec 1.1 rev 1, see 5.3.1.3
+   * However without this we get the following error in websphere:
+   *                java.beans.IntrospectionException: No method 
+   *                            "getListInstance" with 0 arg(s) of 
+   *                            matching types in websphere
+   */
+  public List getListInstance()
+  {
+    return (List)getInstance();
+  }
+  
+}

Propchange: incubator/adffaces/branches/matzew-repackaging-trinidad/trinidad/trinidad-demo/src/main/java/org/apache/myfaces/adfdemo/TreeModelAdapter.java
------------------------------------------------------------------------------
    svn:eol-style = native