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 2008/10/16 09:17:51 UTC
svn commit: r705151 - in /myfaces/tobago/trunk/example/demo: ./
src/main/java/org/apache/myfaces/tobago/example/demo/
src/main/webapp/WEB-INF/ src/main/webapp/reference/
src/main/webapp/reference/tree/
src/main/webapp/tobago-resource/html/standard/stan...
Author: lofwyr
Date: Thu Oct 16 00:17:50 2008
New Revision: 705151
URL: http://svn.apache.org/viewvc?rev=705151&view=rev
Log:
TOBAGO-377: Tree
* working on demo reference
* testing action/actionListener
Added:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-ajax.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-ajax.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-editor.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-editor.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-menu.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-menu.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-normal.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-select.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-select.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeCommand.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeCommand.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeListBox.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeOld.jsp (contents, props changed)
- copied, changed from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeOld.jsp
Removed:
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-ajax.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-editor.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-menu.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-normal.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-select.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeCommand.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeListBox.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeOld.jsp
Modified:
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?rev=705151&r1=705150&r2=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Thu Oct 16 00:17:50 2008
@@ -55,6 +55,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
+<!--
+ <configuration>
+ <server>asari</server>
+ <update>true</update>
+ <url>http://10.0.0.4:8080/manager</url>
+ </configuration>
+-->
<configuration>
<server>tomcat</server>
<update>true</update>
@@ -76,6 +83,16 @@
<version>${project.version}</version>
</dependency-->
<dependency>
+ <groupId>com.btc.tobago</groupId>
+ <artifactId>tobago-theme-btc</artifactId>
+ <version>1.0.12-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>com.btc.tobago</groupId>
+ <artifactId>tobago-theme-sap</artifactId>
+ <version>1.0.12-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-charlotteville</artifactId>
<version>${project.version}</version>
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java?rev=705151&r1=705150&r2=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/Navigation.java Thu Oct 16 00:17:50 2008
@@ -85,6 +85,7 @@
reference.add(new DefaultMutableTreeNode(new Node("reference_sheet", "reference/sheet")));
reference.add(new DefaultMutableTreeNode(new Node("reference_tab", "reference/tab")));
reference.add(new DefaultMutableTreeNode(new Node("reference_time", "reference/time")));
+ reference.add(new DefaultMutableTreeNode(new Node("reference_tree", "reference/tree/tree-normal")));
reference.add(new DefaultMutableTreeNode(new Node("reference_tool", "reference/tool")));
reference.add(new DefaultMutableTreeNode(new Node("reference_partial", "reference/partial")));
reference.add(new DefaultMutableTreeNode(new Node("reference_upload", "reference/upload")));
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java?rev=705151&r1=705150&r2=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TreeController.java Thu Oct 16 00:17:50 2008
@@ -21,6 +21,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.tobago.model.TreeState;
+import javax.faces.event.ActionEvent;
import javax.swing.tree.DefaultMutableTreeNode;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -82,6 +83,10 @@
return null;
}
+ public void actionListener(ActionEvent event) {
+ LOG.info("actionListener");
+ }
+
public String action3() {
LOG.info("action 3");
return null;
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml?rev=705151&r1=705150&r2=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml Thu Oct 16 00:17:50 2008
@@ -352,6 +352,18 @@
<to-view-id>/reference/tool.jsp</to-view-id>
</navigation-case>
<navigation-case>
+ <from-outcome>reference/tree/tree-normal</from-outcome>
+ <to-view-id>/reference/tree/tree-normal.jsp</to-view-id>
+ </navigation-case>
+<!--tree-ajax.jsp
+tree-editor.jsp
+tree-menu.jsp
+tree-normal.jsp
+tree-select.jsp
+treeCommand.jsp
+treeListBox.jsp
+treeOld.jsp-->
+ <navigation-case>
<from-outcome>reference/upload</from-outcome>
<to-view-id>/reference/upload.jsp</to-view-id>
</navigation-case>
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-ajax.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-ajax.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-ajax.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-ajax.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-ajax.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-ajax.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-ajax.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-editor.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-editor.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-editor.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-editor.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-editor.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-editor.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-editor.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-menu.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-menu.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-menu.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-menu.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-menu.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-menu.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-menu.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-normal.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-normal.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-normal.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp Thu Oct 16 00:17:50 2008
@@ -16,54 +16,52 @@
--%>
<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
+<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
-<f:view>
- <tc:loadBundle basename="demo" var="bundle"/>
+<layout:overview>
+ <jsp:body>
- <tc:page label="Sandbox - Tree" id="page"
- width="500px" height="800px">
- <f:facet name="layout">
- <tc:gridLayout margin="10px" rows="600px;*"/>
- </f:facet>
-
- <%--state="#{controller.state}" --%>
- <tc:tree id="tree"
- showIcons="true"
- showJunctions="true"
- showRootJunction="true"
- showRoot="true"
- >
- <tc:treeNode label="Root" id="root" expanded="true">
- <tc:treeData value="#{treeController.tree}" var="node" id="data">
- <tc:treeNode label="#{node.userObject.name}"
- id="template"
- expanded="#{node.userObject.expanded}"
- markup="#{node.userObject.markup}"
- tip="#{node.userObject.tip}"
- action="#{node.userObject.action}"
- disabled="#{node.userObject.disabled}"
- value="#{node}"
- image="image/feather.png"/>
- </tc:treeData>
- <tc:treeNode label="2 Action 1" action="#{treeController.action1}" id="action1">
- <f:facet name="addendum">
- <tc:out value="(Addendum)" />
- </f:facet>
- </tc:treeNode>
- <tc:treeNode label="3 Action 2" action="#{treeController.action2}" id="action2"/>
- <tc:treeNode label="4 Action 3" action="#{treeController.action3}" id="action3">
- <tc:treeNode label="4.1 On Click 1" onclick="alert('On Click 1');" id="click1"/>
- <tc:treeNode label="4.2 On Click 2" onclick="alert('On Click 2');" id="click2">
- <tc:treeNode label="4.2.1 On Click 3" onclick="alert('On Click 3');" id="click3"/>
+ <tc:box label="Tree - General">
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px"/>
+ </f:facet>
+
+ <tc:tree id="tree"
+ showIcons="true"
+ showJunctions="true"
+ showRootJunction="true"
+ showRoot="true">
+ <tc:treeNode label="Root" id="root" expanded="true">
+ <tc:treeData value="#{treeController.tree}" var="node" id="data">
+ <tc:treeNode label="#{node.userObject.name}"
+ id="template"
+ expanded="#{node.userObject.expanded}"
+ markup="#{node.userObject.markup}"
+ tip="#{node.userObject.tip}"
+ action="#{node.userObject.action}"
+ disabled="#{node.userObject.disabled}"
+ value="#{node}"
+ image="image/feather.png"/>
+ </tc:treeData>
+ <tc:treeNode label="2 Action 1" action="#{treeController.action1}" id="action1">
+ <f:facet name="addendum">
+ <tc:out value="(Addendum)"/>
+ </f:facet>
</tc:treeNode>
+ <tc:treeNode label="3 Action 2 (with actionListener)" action="#{treeController.action2}" actionListener="#{treeController.actionListener}" id="action2"/>
+ <tc:treeNode label="4 Action 3" action="#{treeController.action3}" id="action3">
+ <tc:treeNode label="4.1 On Click 1" onclick="alert('On Click 1');" id="click1"/>
+ <tc:treeNode label="4.2 On Click 2" onclick="alert('On Click 2');" id="click2">
+ <tc:treeNode label="4.2.1 On Click 3" onclick="alert('On Click 3');" id="click3"/>
+ </tc:treeNode>
+ </tc:treeNode>
+ <tc:treeNode label="5 Link" link="http://myfaces.apache.org/tobago/" id="link" tip="Subnode Link"/>
+ <tc:treeNode label="6 Target" action="#{treeController.action2}" target="Target Window"/>
</tc:treeNode>
- <tc:treeNode label="5 Link" link="http://myfaces.apache.org/tobago/" id="link" tip="Subnode Link"/>
- <tc:treeNode label="6 Target" action="#{treeController.action2}" target="Target Window"/>
- </tc:treeNode>
- </tc:tree>
-
- <tc:cell/>
+ </tc:tree>
- </tc:page>
-</f:view>
+ </tc:box>
+ </jsp:body>
+</layout:overview>
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-normal.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-select.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-select.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-select.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-select.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree-select.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-select.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/tree-select.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeCommand.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeCommand.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeCommand.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeCommand.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeCommand.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeCommand.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeCommand.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeListBox.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeListBox.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeListBox.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp Thu Oct 16 00:17:50 2008
@@ -15,8 +15,8 @@
* limitations under the License.
--%>
-<%@ page import="javax.swing.tree.DefaultMutableTreeNode" %>
<%@ page import="org.apache.myfaces.tobago.model.TreeState" %>
+<%@ page import="javax.swing.tree.DefaultMutableTreeNode" %>
<%
DefaultMutableTreeNode tree;
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeListBox.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeOld.jsp (from r704800, myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeOld.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeOld.jsp?p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeOld.jsp&p1=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/treeOld.jsp&r1=704800&r2=705151&rev=705151&view=diff
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeOld.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/tree/treeOld.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml?rev=705151&r1=705150&r2=705151&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml Thu Oct 16 00:17:50 2008
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -70,6 +70,7 @@
<entry key="reference_sheet">Sheet</entry>
<entry key="reference_tab">Tab</entry>
<entry key="reference_time">Time</entry>
+ <entry key="reference_tree">Tree</entry>
<entry key="reference_tool">Tool Bar</entry>
<entry key="reference_partial">Partial</entry>
<entry key="reference_upload">Upload</entry>