You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/07/31 19:40:16 UTC
svn commit: r561406 - in /myfaces/tomahawk/trunk/examples/simple/src/main:
java/org/apache/myfaces/examples/tree1/
java/org/apache/myfaces/examples/tree1/Tree1Backer.java
webapp/WEB-INF/examples-config.xml webapp/tree.jsp
Author: mmarinschek
Date: Tue Jul 31 10:40:15 2007
New Revision: 561406
URL: http://svn.apache.org/viewvc?view=rev&rev=561406
Log:
moved treemodel of tree.jsp out of the jsp - to make source-links in the example work
Added:
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/tree1/
myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/tree1/Tree1Backer.java
Modified:
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/tree.jsp
Added: myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/tree1/Tree1Backer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/tree1/Tree1Backer.java?view=auto&rev=561406
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/tree1/Tree1Backer.java (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/java/org/apache/myfaces/examples/tree1/Tree1Backer.java Tue Jul 31 10:40:15 2007
@@ -0,0 +1,62 @@
+/*
+ * 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.
+*/
+package org.apache.myfaces.examples.tree1;
+
+import org.apache.myfaces.custom.tree.model.TreeModel;
+import org.apache.myfaces.custom.tree.model.DefaultTreeModel;
+import org.apache.myfaces.custom.tree.DefaultMutableTreeNode;
+
+/**
+ * @author Martin Marinschek
+ */
+public class Tree1Backer {
+
+ private TreeModel treeModel;
+
+ public TreeModel getTreeModel() {
+ if (treeModel == null) {
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("XY");
+ DefaultMutableTreeNode a = new DefaultMutableTreeNode("A");
+ root.insert(a);
+ DefaultMutableTreeNode b = new DefaultMutableTreeNode("B");
+ root.insert(b);
+ DefaultMutableTreeNode c = new DefaultMutableTreeNode("C");
+ root.insert(c);
+
+ DefaultMutableTreeNode node = new DefaultMutableTreeNode("a1");
+ a.insert(node);
+ node = new DefaultMutableTreeNode("a2 ");
+ a.insert(node);
+ node = new DefaultMutableTreeNode("b ");
+ b.insert(node);
+
+ a = node;
+ node = new DefaultMutableTreeNode("x1");
+ a.insert(node);
+ node = new DefaultMutableTreeNode("x2");
+ a.insert(node);
+ treeModel = new DefaultTreeModel(root);
+ }
+ return treeModel;
+ }
+
+ public void setTreeModel(TreeModel treeModel) {
+ this.treeModel = treeModel;
+ }
+}
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml?view=diff&rev=561406&r1=561405&r2=561406
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/WEB-INF/examples-config.xml Tue Jul 31 10:40:15 2007
@@ -169,6 +169,12 @@
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>tree1Backer</managed-bean-name>
+ <managed-bean-class>org.apache.myfaces.examples.tree1.Tree1Backer</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+
<!-- Managed Beans for tree2.jsp -->
<managed-bean>
<managed-bean-name>treeBacker</managed-bean-name>
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/tree.jsp?view=diff&rev=561406&r1=561405&r2=561406
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/tree.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/tree.jsp Tue Jul 31 10:40:15 2007
@@ -30,38 +30,10 @@
<%@include file="inc/head.inc" %>
<body>
-
-<%
- if (pageContext.getAttribute("treeModel", PageContext.SESSION_SCOPE) == null) {
- DefaultMutableTreeNode root = new DefaultMutableTreeNode("XY");
- DefaultMutableTreeNode a = new DefaultMutableTreeNode("A");
- root.insert(a);
- DefaultMutableTreeNode b = new DefaultMutableTreeNode("B");
- root.insert(b);
- DefaultMutableTreeNode c = new DefaultMutableTreeNode("C");
- root.insert(c);
-
- DefaultMutableTreeNode node = new DefaultMutableTreeNode("a1");
- a.insert(node);
- node = new DefaultMutableTreeNode("a2 ");
- a.insert(node);
- node = new DefaultMutableTreeNode("b ");
- b.insert(node);
-
- a = node;
- node = new DefaultMutableTreeNode("x1");
- a.insert(node);
- node = new DefaultMutableTreeNode("x2");
- a.insert(node);
-
- pageContext.setAttribute("treeModel", new DefaultTreeModel(root), PageContext.SESSION_SCOPE);
- }
-%>
-
<f:view>
<h:form>
- <t:tree id="tree" value="#{treeModel}"
+ <t:tree id="tree" value="#{tree1Backer.treeModel}"
styleClass="tree"
nodeClass="treenode"
selectedNodeClass="treenodeSelected"