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 2006/11/16 11:06:22 UTC
svn commit: r475670 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/event/
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
core/src/test/java/org/apache/myf...
Author: lofwyr
Date: Thu Nov 16 02:06:20 2006
New Revision: 475670
URL: http://svn.apache.org/viewvc?view=rev&rev=475670
Log:
moving new Tree stuff to sandbox
create an example sandbox
progress of TOBAGO-18
Added:
myfaces/tobago/trunk/example/sandbox/
- copied from r475631, myfaces/tobago/trunk/example/blank/
myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp (with props)
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITree.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTagDeclaration.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTag.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java (contents, props changed)
- copied, changed from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java
Removed:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITree.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java
myfaces/tobago/trunk/example/sandbox/src/main/webapp/helloWorld.jsp
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/tree.jsp
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeOldTagDeclaration.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/treeControl.jsp
myfaces/tobago/trunk/example/pom.xml
myfaces/tobago/trunk/example/sandbox/pom.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/classes/log4j.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/trunk/example/sandbox/src/main/webapp/index.jsp
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeOld.jsp
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/event/DefaultTreeActionListener.java Thu Nov 16 02:06:20 2006
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.UITree;
+import org.apache.myfaces.tobago.component.UITreeOld;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.model.TreeState;
@@ -58,12 +58,12 @@
// component is toolbar
component = component.getParent();
}
- if (!(component instanceof UITree)) {
+ if (!(component instanceof UITreeOld)) {
LOG.error("No tree found!");
return;
}
- UITree tree = (UITree) component;
+ UITreeOld tree = (UITreeOld) component;
TreeState treeState = tree.getState();
DefaultMutableTreeNode marker = treeState.getMarker();
String command = actionEvent.getComponent().getId();
@@ -77,33 +77,33 @@
}
if (marker != null) {
boolean isRoot = tree.getValue().equals(marker);
- if (UITree.COMMAND_NEW.equals(command)) {
+ if (UITreeOld.COMMAND_NEW.equals(command)) {
treeState.commandNew(create(facesContext));
- } else if (UITree.COMMAND_DELETE.equals(command)) {
+ } else if (UITreeOld.COMMAND_DELETE.equals(command)) {
if (!isRoot) {
marker.removeFromParent();
}
treeState.setLastMarker(null);
treeState.setLastCommand(null);
- } else if (UITree.COMMAND_CUT.equals(command)) {
+ } else if (UITreeOld.COMMAND_CUT.equals(command)) {
if (!isRoot) {
treeState.setLastMarker(marker);
treeState.setLastCommand(command);
}
- } else if (UITree.COMMAND_COPY.equals(command)) {
+ } else if (UITreeOld.COMMAND_COPY.equals(command)) {
treeState.setLastMarker(marker);
treeState.setLastCommand(command);
- } else if (UITree.COMMAND_PASTE.equals(command)) {
+ } else if (UITreeOld.COMMAND_PASTE.equals(command)) {
if (treeState.getLastMarker() != null) {
- if (UITree.COMMAND_CUT.equals(treeState.getLastCommand())) {
+ if (UITreeOld.COMMAND_CUT.equals(treeState.getLastCommand())) {
marker.insert(treeState.getLastMarker(), 0);
- } else if (UITree.COMMAND_COPY.equals(treeState.getLastCommand())) {
+ } else if (UITreeOld.COMMAND_COPY.equals(treeState.getLastCommand())) {
marker.insert(copy(treeState.getLastMarker()), 0);
}
treeState.setLastMarker(null);
treeState.setLastCommand(null);
}
- } else if (UITree.COMMAND_MOVE_UP.equals(command)) {
+ } else if (UITreeOld.COMMAND_MOVE_UP.equals(command)) {
if (!isRoot) {
MutableTreeNode node = marker;
MutableTreeNode parent = (MutableTreeNode) node.getParent();
@@ -113,7 +113,7 @@
}
treeState.setLastMarker(null);
treeState.setLastCommand(null);
- } else if (UITree.COMMAND_MOVE_DOWN.equals(command)) {
+ } else if (UITreeOld.COMMAND_MOVE_DOWN.equals(command)) {
if (!isRoot) {
MutableTreeNode node = marker;
MutableTreeNode parent = (MutableTreeNode) node.getParent();
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeOldTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeOldTagDeclaration.java?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeOldTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeOldTagDeclaration.java Thu Nov 16 02:06:20 2006
@@ -34,7 +34,7 @@
* Renders a tree view.
*/
@Deprecated
-@Tag(name = "treeOld")
+@Tag(name = "tree")
@BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeOld",
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java Thu Nov 16 02:06:20 2006
@@ -22,7 +22,7 @@
import javax.faces.webapp.UIComponentTag;
import javax.servlet.jsp.tagext.Tag;
-abstract public class GenericTestBase extends TestCase {
+public abstract class GenericTestBase extends TestCase {
// ----------------------------------------------------------- class attributes
// ----------------------------------------------------------------- attributes
@@ -68,7 +68,7 @@
new TextAreaTag(),
new OutTag(),
new ToolBarTag(),
- new TreeTag(),
+ new TreeOldTag(),
};
ordinaryTagList = new Tag[]{
new IncludeTag(),
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/treeControl.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/treeControl.jsp?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/treeControl.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/treeControl.jsp Thu Nov 16 02:06:20 2006
@@ -38,7 +38,7 @@
<tc:gridLayout columns="2*;1*" />
</f:facet>
- <tc:treeOld value="#{demo.tree}" state="#{demo.treeState}" id="tree"
+ <tc:tree value="#{demo.tree}" state="#{demo.treeState}" id="tree"
idReference="userObject.id"
nameReference="userObject.name"
showIcons="#{demo.showIcons}"
@@ -49,7 +49,7 @@
mutable="#{demo.mutable}"
>
<f:actionListener type="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor" />
- </tc:treeOld>
+ </tc:tree>
<tc:panel>
<f:facet name="layout">
Modified: myfaces/tobago/trunk/example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/pom.xml?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/example/pom.xml (original)
+++ myfaces/tobago/trunk/example/pom.xml Thu Nov 16 02:06:20 2006
@@ -95,6 +95,7 @@
<module>demo</module>
<module>foreach</module>
<module>nonfacesrequest</module>
+ <module>sandbox</module>
<module>security</module>
<module>test</module>
<module>facelets</module>
Modified: myfaces/tobago/trunk/example/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/pom.xml?view=diff&rev=475670&r1=475631&r2=475670
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/pom.xml Thu Nov 16 02:06:20 2006
@@ -22,11 +22,11 @@
<artifactId>tobago-example</artifactId>
<version>1.0.9-SNAPSHOT</version>
</parent>
- <artifactId>tobago-example-blank</artifactId>
+ <artifactId>tobago-example-sandbox</artifactId>
<packaging>war</packaging>
- <name>Example Blank</name>
+ <name>Example Sandbox</name>
<build>
- <finalName>tobago-example-blank</finalName>
+ <finalName>tobago-example-sandbox</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -79,6 +79,11 @@
<artifactId>tools</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-sandbox</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/classes/log4j.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/classes/log4j.xml?view=diff&rev=475670&r1=475631&r2=475670
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/classes/log4j.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/classes/log4j.xml Thu Nov 16 02:06:20 2006
@@ -22,7 +22,7 @@
<log4j:configuration>
<appender name="logfile" class="org.apache.log4j.FileAppender">
- <param name="File" value="tobago-example-blank.log" />
+ <param name="File" value="tobago-example-sandbox.log" />
<param name="Append" value="true" />
<param name="Encoding" value="UTF-8" />
<layout class="org.apache.log4j.PatternLayout">
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml?view=diff&rev=475670&r1=475631&r2=475670
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml Thu Nov 16 02:06:20 2006
@@ -26,10 +26,6 @@
<application>
<locale-config>
<default-locale>en</default-locale>
- <supported-locale>de</supported-locale>
- <supported-locale>de_DE</supported-locale>
- <supported-locale>de_AT</supported-locale>
- <supported-locale>de_CH</supported-locale>
</locale-config>
</application>
Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/index.jsp?view=diff&rev=475670&r1=475631&r2=475670
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/index.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/index.jsp Thu Nov 16 02:06:20 2006
@@ -14,4 +14,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<jsp:forward page="faces/helloWorld.jsp" />;
+<jsp:forward page="faces/tree.jsp" />;
Added: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp?view=auto&rev=475670
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp (added)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp Thu Nov 16 02:06:20 2006
@@ -0,0 +1,90 @@
+<%--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+--%>
+
+<%@ page import="javax.swing.tree.DefaultMutableTreeNode" %>
+<%@ page import="org.apache.myfaces.tobago.model.TreeState" %>
+
+<%
+ DefaultMutableTreeNode tree;
+ TreeState treeState;
+
+ tree = new DefaultMutableTreeNode("Category");
+ tree.insert(new DefaultMutableTreeNode("Sports"), 0);
+ tree.insert(new DefaultMutableTreeNode("Movies"), 0);
+ DefaultMutableTreeNode music = new DefaultMutableTreeNode("Music");
+ tree.insert(music, 0);
+ tree.insert(new DefaultMutableTreeNode("Games"), 0);
+ DefaultMutableTreeNode temp = new DefaultMutableTreeNode("Science");
+ temp.insert(
+ new DefaultMutableTreeNode("Geography"), 0);
+ temp.insert(
+ new DefaultMutableTreeNode("Mathematics"), 0);
+ DefaultMutableTreeNode temp2 = new DefaultMutableTreeNode("Astronomy");
+ temp2.insert(new DefaultMutableTreeNode("Education"), 0);
+ temp2.insert(new DefaultMutableTreeNode("Pictures"), 0);
+ temp.insert(temp2, 2);
+ tree.insert(temp, 2);
+ treeState = new TreeState();
+ treeState.addExpandState(tree);
+ treeState.addExpandState(temp);
+ treeState.addSelection(temp2);
+ treeState.setMarker(music);
+ session.setAttribute("tree", tree);
+ session.setAttribute("treeState", treeState);
+%>
+
+<%@ taglib uri="http://myfaces.apache.org/tobago/sandbox" prefix="tcs" %>
+<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
+<%@ 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"/>
+
+ <tc:page label="Screenshot" id="page"
+ width="750px" height="800px">
+ <f:facet name="layout">
+ <tc:gridLayout margin="10px" rows="300px;*"/>
+ </f:facet>
+
+ <tcs:tree state="#{treeState}" id="screenshotTree"
+ idReference="userObject"
+ nameReference="userObject"
+ showIcons="true"
+ showJunctions="true"
+ showRootJunction="true"
+ showRoot="true"
+ selectable="single"
+ mutable="false">
+ <tcs:treeNode label="Root">
+ <tcs:treeNodes value="#{tree}" var="node">
+ <tcs:treeNode label="#{node.userObject}"/>
+ </tcs:treeNodes>
+ <tcs:treeNode label="Sub 1"/>
+ <tcs:treeNode label="Sub 2"/>
+ <tcs:treeNode label="Sub 3">
+ <tcs:treeNode label="Sub 3.1"/>
+ <tcs:treeNode label="Sub 3.2"/>
+ </tcs:treeNode>
+ <tcs:treeNode label="Sub 4"/>
+ </tcs:treeNode>
+ </tcs:tree>
+
+ <tc:cell/>
+
+ </tc:page>
+</f:view>
Propchange: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/example/sandbox/src/main/webapp/tree.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITree.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITree.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java&r2=475670
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITree.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java&r2=475670
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNode.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java&r2=475670
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UITreeNodes.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (from r475631, myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java&r2=475670
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java (from r475631, myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java&r2=475670
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodesRenderer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (from r475631, myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java&r2=475670
==============================================================================
(empty)
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTag.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java Thu Nov 16 02:06:20 2006
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,6 +18,7 @@
*/
import org.apache.myfaces.tobago.component.UITreeNode;
+import org.apache.myfaces.tobago.taglib.component.TobagoTag;
public class TreeNodeTag extends TobagoTag implements TreeNodeTagDeclaration {
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java Thu Nov 16 02:06:20 2006
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
+import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
/**
* Creates a tree node.
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodeTagDeclaration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTag.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java Thu Nov 16 02:06:20 2006
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +21,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VAR;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UITreeNodes;
+import org.apache.myfaces.tobago.taglib.component.TobagoTag;
import javax.faces.component.UIComponent;
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTag.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTagDeclaration.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeNodesTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java Thu Nov 16 02:06:20 2006
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,16 +24,13 @@
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.HasVar;
+import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
/**
* Describes a subtree of nodes.
*/
@Tag(name = "treeNodes")
@BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?") // fixme
-@Preliminary(
- "Under Construction! Implement a var attribute for the tree like in the sheet "
- + "(http://issues.apache.org/jira/browse/TOBAGO-18). If you need the \"old\" implementation "
- + "please use the tc:treeOld tag!")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITreeNodes",
rendererType = "TreeNodes")
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeNodesTagDeclaration.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTag.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTag.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java Thu Nov 16 02:06:20 2006
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -32,6 +32,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UITree;
+import org.apache.myfaces.tobago.taglib.component.TobagoTag;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -66,11 +67,6 @@
private String actionListener;
private String mode;
-
- public TreeTag() {
- LOG.warn("tc:tree is under construction. If you want to use the \"old\""
- + " tree, please use the tc:treeOld Tag");
- }
public String getComponentType() {
return UITree.COMPONENT_TYPE;
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTag.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java (from r475631, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java?view=diff&rev=475670&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java&r1=475631&p2=myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java&r2=475670
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java Thu Nov 16 02:06:20 2006
@@ -1,4 +1,4 @@
-package org.apache.myfaces.tobago.taglib.component;
+package org.apache.myfaces.tobago.taglib.sandbox;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -30,6 +30,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasState;
import org.apache.myfaces.tobago.taglib.decl.HasTreeNodeValue;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.component.TobagoTagDeclaration;
/*
* Created by IntelliJ IDEA.
@@ -42,10 +43,6 @@
*/
@Tag(name = "tree")
@BodyContentDescription(anyTagOf = "<f:facet>* <f:actionListener>?") // fixme
-@Preliminary(
- "Under Construction! Implement a var attribute for the tree like in the sheet "
- + "(http://issues.apache.org/jira/browse/TOBAGO-18). If you need the \"old\" "
- + "implementation please use the tc:treeOld tag!")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITree",
rendererType = "Tree")
Propchange: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/taglib/sandbox/TreeTagDeclaration.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/navigation.jsp Thu Nov 16 02:06:20 2006
@@ -101,11 +101,8 @@
<%--<tc:link link="screenshot/toolBarSelectOne.jsp" label="TooBarSelectOne" target="View"/>--%>
- <tc:link link="screenshot/tree.jsp"
- label="Tree" target="View"/>
-
<tc:link link="screenshot/treeOld.jsp"
- label="Tree Old" target="View"/>
+ label="Tree" target="View"/>
<tc:link link="screenshot/treeListBox.jsp"
label="TreeListBox" target="View"/>
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeOld.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeOld.jsp?view=diff&rev=475670&r1=475669&r2=475670
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeOld.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/treeOld.jsp Thu Nov 16 02:06:20 2006
@@ -59,7 +59,7 @@
<%--<tc:gridLayout rows="300px;1*" />--%>
<tc:gridLayout rows="200px;300px;1*" />
</f:facet>
- <tc:treeOld state="#{treeState}" value="#{tree}" id="screenshotTree"
+ <tc:tree state="#{treeState}" value="#{tree}" id="screenshotTree"
idReference="userObject"
nameReference="userObject"
showIcons="true"
@@ -70,7 +70,7 @@
mutable="false"
/>
- <tc:treeOld state="#{treeState}" value="#{tree}"
+ <tc:tree state="#{treeState}" value="#{tree}"
idReference="userObject"
nameReference="userObject"
showIcons="false"