June 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r1359 - in trunk: sandbox and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-27 18:48:06 -0400 (Wed, 27 Jun 2007) New Revision: 1359 Modified: trunk/docs/userguide/en/ trunk/sandbox-samples/ trunk/sandbox-samples/tooltip-sample/ trunk/sandbox/ trunk/sandbox/calendar/ trunk/sandbox/tooltip/ Log: service files & folders svn:ignored Property changes on: trunk/docs/userguide/en ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Property changes on: trunk/sandbox ___________________________________________________________________ Name: svn:ignore + target Property changes on: trunk/sandbox/calendar ___________________________________________________________________ Name: svn:ignore - .settings target .classpath .project + .settings target .classpath .project bin Property changes on: trunk/sandbox/tooltip ___________________________________________________________________ Name: svn:ignore - target + target .classpath .project .settings Property changes on: trunk/sandbox-samples ___________________________________________________________________ Name: svn:ignore + target Property changes on: trunk/sandbox-samples/tooltip-sample ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1358 - trunk/richfaces/common.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-27 18:38:17 -0400 (Wed, 27 Jun 2007) New Revision: 1358 Modified: trunk/richfaces/common/pom.xml Log: combine.children="append" added to handle parent configuration Modified: trunk/richfaces/common/pom.xml =================================================================== --- trunk/richfaces/common/pom.xml 2007-06-27 20:09:32 UTC (rev 1357) +++ trunk/richfaces/common/pom.xml 2007-06-27 22:38:17 UTC (rev 1358) @@ -54,11 +54,11 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clover-plugin</artifactId> <configuration> - <excludes> + <excludes combine.children="append"> <exclude> **/RichMacroDefinition*.java </exclude> - </excludes> + </excludes> </configuration> </plugin> </plugins>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1357 - in trunk: sandbox-samples/simpleTogglePanel2-sample and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-27 16:09:32 -0400 (Wed, 27 Jun 2007) New Revision: 1357 Modified: trunk/sandbox-samples/simpleTogglePanel2-sample/ trunk/sandbox/simpleTogglePanel2/ Log: Service files svn:ignored Property changes on: trunk/sandbox/simpleTogglePanel2 ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project Property changes on: trunk/sandbox-samples/simpleTogglePanel2-sample ___________________________________________________________________ Name: svn:ignore - target + target .settings .classpath .project

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1356 - trunk/richfaces/common.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-27 16:06:40 -0400 (Wed, 27 Jun 2007) New Revision: 1356 Modified: trunk/richfaces/common/pom.xml Log: clover ANTLR build fixed Modified: trunk/richfaces/common/pom.xml =================================================================== --- trunk/richfaces/common/pom.xml 2007-06-27 19:35:08 UTC (rev 1355) +++ trunk/richfaces/common/pom.xml 2007-06-27 20:06:40 UTC (rev 1356) @@ -20,11 +20,11 @@ <tasks> <java classname="org.antlr.Tool" classpathref="maven.plugin.classpath" - fork="true" - dir="src/main/antlr"> - <arg value="RichMacroDefinition.g"/> - <arg line="-o ${project.build.directory}/generated-sources/antlr/org/richfaces"/> - </java> + fork="true" + dir="src/main/antlr"> + <arg value="RichMacroDefinition.g"/> + <arg line="-o ${project.build.directory}/generated-sources/antlr/org/richfaces"/> + </java> </tasks> <sourceRoot>${project.build.directory}/generated-sources/antlr</sourceRoot> </configuration> @@ -44,5 +44,25 @@ </plugin> </plugins> </build> - + + <profiles> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <excludes> + <exclude> + **/RichMacroDefinition*.java + </exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1355 - trunk/richfaces-samples/richfaces-demo/src/main/webapp/templates/include.

by richfaces-svn-commits＠lists.jboss.org

Author: SergeySmirnov Date: 2007-06-27 15:35:08 -0400 (Wed, 27 Jun 2007) New Revision: 1355 Modified: trunk/richfaces-samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml Log: plain Modified: trunk/richfaces-samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml =================================================================== --- trunk/richfaces-samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-06-27 18:56:51 UTC (rev 1354) +++ trunk/richfaces-samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-06-27 19:35:08 UTC (rev 1355) @@ -103,6 +103,12 @@ </td> <td> <h:outputLink value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}"> + Plain + <f:param value="plain" name="s"/> + </h:outputLink> + </td> + <td> + <h:outputLink value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}"> Default <f:param value="DEFAULT" name="s"/> </h:outputLink>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1354 - in trunk/richfaces: common/src/main/resources/org/richfaces/renderkit/html/scripts/json and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-06-27 14:56:51 -0400 (Wed, 27 Jun 2007) New Revision: 1354 Modified: trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js Log: Script refactoring broke dragIndicator - fixing... Modified: trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java =================================================================== --- trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2007-06-27 18:42:02 UTC (rev 1353) +++ trunk/richfaces/common/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2007-06-27 18:56:51 UTC (rev 1354) @@ -156,7 +156,7 @@ writer.startElement("script", component); writer.write("var evaluator = "); writeScriptBody(context, component, true, null); - writer.write("new Insertion.Top($('" + component.getClientId(context) + "'), evaluator.invoke('getOuterHTML', window).join(''));"); + writer.write("new Insertion.Top($('" + component.getClientId(context) + "'), evaluator.invoke('getContent', window).join(''));"); writer.endElement("script"); } } Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js =================================================================== --- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-06-27 18:42:02 UTC (rev 1353) +++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/json/json-dom.js 2007-06-27 18:56:51 UTC (rev 1354) @@ -55,6 +55,9 @@ var html = "<"+this.tag; var inner = this.getInnerHTML(context); for(var i in this.attrs) { + if (!this.attrs.hasOwnProperty(i)) { + continue ; + } var attrValue = this.attrs[i]; Modified: trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js =================================================================== --- trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-06-27 18:42:02 UTC (rev 1353) +++ trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/drag-indicator.js 2007-06-27 18:56:51 UTC (rev 1354) @@ -32,7 +32,7 @@ parts = this.indicatorTemplates['multi']; } - new Insertion.Top(this, parts.invoke('getOuterHTML', p).join('')); + new Insertion.Top(this, parts.invoke('getContent', p).join('')); }, show: function() {

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1353 - trunk/richfaces/common/src/main/resources/META-INF/skins.

by richfaces-svn-commits＠lists.jboss.org

Author: ishabalov Date: 2007-06-27 14:42:02 -0400 (Wed, 27 Jun 2007) New Revision: 1353 Removed: trunk/richfaces/common/src/main/resources/META-INF/skins/default.skin.properties Log: default.skin.properties removed from richfaces and migrated to a4j Deleted: trunk/richfaces/common/src/main/resources/META-INF/skins/default.skin.properties =================================================================== --- trunk/richfaces/common/src/main/resources/META-INF/skins/default.skin.properties 2007-06-27 18:33:58 UTC (rev 1352) +++ trunk/richfaces/common/src/main/resources/META-INF/skins/default.skin.properties 2007-06-27 18:42:02 UTC (rev 1353) @@ -1,54 +0,0 @@ -#Colors -headerBackgroundColor=#D4CFC7 -headerGradientColor=#EDEAE6 -headerTextColor=#000000 -headerWeightFont=bold - -generalBackgroundColor=#FFFFFF -generalTextColor=#000000 -generalSizeFont=11px -generalFamilyFont=Arial, Verdana, sans-serif - -controlTextColor=#000000 -controlBackgroundColor=#ffffff -additionalBackgroundColor=#F1EEE9 - -shadowBackgroundColor=#000000 -shadowOpacity=1 - -panelBorderColor=#C4C0B9 -subBorderColor=#ffffff - -tabBackgroundColor=#E3DED5 -tabDisabledTextColor=#B1ADA7 - -trimColor=#DFDCD5 - -tipBackgroundColor=\#FAE6B0 -tipBorderColor=\#E5973E - -selectControlColor=#E79A00 - - -generalLinkColor=#0078D0 -hoverLinkColor=#0090FF -visitedLinkColor=#0090FF - -# Fonts -headerSizeFont=11px -headerFamilyFont=Arial, Verdana, sans-serif - -tabSizeFont=11 -tabFamilyFont=Arial, Verdana, sans-serif - -buttonSizeFont=11 -buttonFamilyFont=Arial, Verdana, sans-serif - -tableBackgroundColor=#FFFFFF -tableFooterBackgroundColor=#cccccc -tableSubfooterBackgroundColor=#f1f1f1 -tableBorderColor=#C4C0C9 - - - -

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1352 - trunk/richfaces-samples.

by richfaces-svn-commits＠lists.jboss.org

Author: ishabalov Date: 2007-06-27 14:33:58 -0400 (Wed, 27 Jun 2007) New Revision: 1352 Modified: trunk/richfaces-samples/pom.xml Log: Switch JSF 1.2 profile to 1.2_04 version Modified: trunk/richfaces-samples/pom.xml =================================================================== --- trunk/richfaces-samples/pom.xml 2007-06-27 18:09:43 UTC (rev 1351) +++ trunk/richfaces-samples/pom.xml 2007-06-27 18:33:58 UTC (rev 1352) @@ -212,12 +212,12 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_03</version> + <version>1.2_04</version> </dependency> <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> + <version>1.2_04</version> <scope>runtime</scope> </dependency> </dependencies>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1351 - tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source.

by richfaces-svn-commits＠lists.jboss.org

Author: ishabalov Date: 2007-06-27 14:09:43 -0400 (Wed, 27 Jun 2007) New Revision: 1351 Modified: tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.html tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.xhtml Log: Merge for doropdown menu samples from trunk Modified: tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.html =================================================================== --- tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.html 2007-06-27 16:34:54 UTC (rev 1350) +++ tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.html 2007-06-27 18:09:43 UTC (rev 1351) @@ -1 +1,107 @@ -source code here \ No newline at end of file +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" + "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" +content="text/html; charset=iso-8859-1"> +<meta name="GENERATOR" content="GNU source-highlight 2.1.2 +by Lorenzo Bettini +http://www.lorenzobettini.it +http://www.gnu.org/software/src-highlite"> +<title>usage.xhtml</title> +<link rel="stylesheet" href="../../../css/xhtml-source.css" type="text/css"> +</head> +<body> +<pre><tt><div class="sample-container"> + <h:form> + + <rich:toolBar> + <rich:dropDownMenu value="File"> + + <rich:menuItem submitMode="ajax" value="New" action="#{ddmenu.doNew}"> + </rich:menuItem> + <rich:menuItem submitMode="ajax" value="Open" action="#{ddmenu.doOpen}"/> + <rich:menuGroup value="Save As..."> + <rich:menuItem submitMode="ajax" value="Text File" action="#{ddmenu.doSaveText}"/> + <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doPDF}"/> + </rich:menuGroup> + <rich:menuItem submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/> + <rich:menuSeparator id="menuSeparator11"/> + <rich:menuItem submitMode="ajax" value="Exit" action="#{ddmenu.doExit}"/> + + </rich:dropDownMenu> + + <rich:dropDownMenu> + + <f:facet name="label"> + <h:panelGrid cellpadding="0" cellspacing="0" columns="2" style="vertical-align:middle"> + <h:graphicImage value="/richfaces/toolBar/images/yellow_lamp.gif"/> + <h:outputText value="Links" /> + </h:panelGrid> + </f:facet> + + <rich:menuItem submitMode="none" onclick="document.location.href='http://labs.jboss.com/jbossrichfaces/'"> + <f:facet name="icon"> + <h:graphicImage value="/richfaces/toolBar/images/webapp_welcome.gif" /> + </f:facet> + <h:outputLink value="http://labs.jboss.com/jbossrichfaces/"> + <h:outputText value="RichFaces Home Page"></h:outputText> + </h:outputLink> + </rich:menuItem> + + <rich:menuItem submitMode="none" onclick="document.location.href='http://jboss.com/index.html?module=bb&amp;op=viewforum&amp;f=261'"> + <f:facet name="icon"> + <h:graphicImage value="/richfaces/toolBar/images/timer_task.gif" /> + </f:facet> + <h:outputLink value="http://jboss.com/index.html?module=bb&amp;op=viewforum&amp;f=261"> + <h:outputText value="RichFaces Forum"></h:outputText> + </h:outputLink> + </rich:menuItem> + + </rich:dropDownMenu> + </rich:toolBar> + </h:form> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText value="Current Selection: "></h:outputText> + <h:outputText style="font-weight:bold" value="#{ddmenu.current}"></h:outputText> + </a4j:outputPanel> +</div> +... +... +<div class="sample-container"> + <h:form> + + <h:panelGrid class="vertical-menu-cell" columns="1" cellspacing="0" cellpadding="0"> + <rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option1" direction="bottom-right" jointPoint="tr"> + <rich:menuItem value="Suboption1-1" /> + <rich:menuItem value="Suboption1-2"> + <f:facet name="icon"> + <h:graphicImage value="/richfaces/toolBar/images/print.gif" /> + </f:facet> + + </rich:menuItem> + <rich:menuItem value="Suboption1-3" /> + </rich:dropDownMenu> + <rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option2" direction="bottom-right" jointPoint="tr"> + <rich:menuItem value="Suboption2-1" /> + <rich:menuItem value="Suboption2-2" /> + <rich:menuGroup value="Group2" direction="#{bean.groupDirection}"> + <rich:menuItem value="SuboptionG2-2-1" /> + <rich:menuItem value="SuboptionG2-2-2" /> + </rich:menuGroup> + + <rich:menuItem value="Suboption2-3" /> + </rich:dropDownMenu> + <rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option3" direction="bottom-right" jointPoint="tr"> + <rich:menuItem value="Suboption3-1" /> + <rich:menuItem value="Suboption3-2" /> + <rich:menuItem value="Suboption3-3" /> + </rich:dropDownMenu> + + </h:panelGrid> + </h:form> + +</div> +</tt></pre> +</body> +</html> Modified: tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.xhtml =================================================================== --- tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.xhtml 2007-06-27 16:34:54 UTC (rev 1350) +++ tags/3_0_1/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/source/usage.xhtml 2007-06-27 18:09:43 UTC (rev 1351) @@ -1 +1,90 @@ -source code here \ No newline at end of file +<div class="sample-container"> + <h:form> + + <rich:toolBar> + <rich:dropDownMenu value="File"> + + <rich:menuItem submitMode="ajax" value="New" action="#{ddmenu.doNew}"> + </rich:menuItem> + <rich:menuItem submitMode="ajax" value="Open" action="#{ddmenu.doOpen}"/> + <rich:menuGroup value="Save As..."> + <rich:menuItem submitMode="ajax" value="Text File" action="#{ddmenu.doSaveText}"/> + <rich:menuItem submitMode="ajax" value="PDF File" action="#{ddmenu.doPDF}"/> + </rich:menuGroup> + <rich:menuItem submitMode="ajax" value="Close" action="#{ddmenu.doClose}"/> + <rich:menuSeparator id="menuSeparator11"/> + <rich:menuItem submitMode="ajax" value="Exit" action="#{ddmenu.doExit}"/> + + </rich:dropDownMenu> + + <rich:dropDownMenu> + + <f:facet name="label"> + <h:panelGrid cellpadding="0" cellspacing="0" columns="2" style="vertical-align:middle"> + <h:graphicImage value="/richfaces/toolBar/images/yellow_lamp.gif"/> + <h:outputText value="Links" /> + </h:panelGrid> + </f:facet> + + <rich:menuItem submitMode="none" onclick="document.location.href='http://labs.jboss.com/jbossrichfaces/'"> + <f:facet name="icon"> + <h:graphicImage value="/richfaces/toolBar/images/webapp_welcome.gif" /> + </f:facet> + <h:outputLink value="http://labs.jboss.com/jbossrichfaces/"> + <h:outputText value="RichFaces Home Page"></h:outputText> + </h:outputLink> + </rich:menuItem> + + <rich:menuItem submitMode="none" onclick="document.location.href='http://jboss.com/index.html?module=bb&op=viewforum&f=261'"> + <f:facet name="icon"> + <h:graphicImage value="/richfaces/toolBar/images/timer_task.gif" /> + </f:facet> + <h:outputLink value="http://jboss.com/index.html?module=bb&op=viewforum&f=261"> + <h:outputText value="RichFaces Forum"></h:outputText> + </h:outputLink> + </rich:menuItem> + + </rich:dropDownMenu> + </rich:toolBar> + </h:form> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText value="Current Selection: "></h:outputText> + <h:outputText style="font-weight:bold" value="#{ddmenu.current}"></h:outputText> + </a4j:outputPanel> +</div> +... +... +<div class="sample-container"> + <h:form> + + <h:panelGrid class="vertical-menu-cell" columns="1" cellspacing="0" cellpadding="0"> + <rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option1" direction="bottom-right" jointPoint="tr"> + <rich:menuItem value="Suboption1-1" /> + <rich:menuItem value="Suboption1-2"> + <f:facet name="icon"> + <h:graphicImage value="/richfaces/toolBar/images/print.gif" /> + </f:facet> + + </rich:menuItem> + <rich:menuItem value="Suboption1-3" /> + </rich:dropDownMenu> + <rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option2" direction="bottom-right" jointPoint="tr"> + <rich:menuItem value="Suboption2-1" /> + <rich:menuItem value="Suboption2-2" /> + <rich:menuGroup value="Group2" direction="#{bean.groupDirection}"> + <rich:menuItem value="SuboptionG2-2-1" /> + <rich:menuItem value="SuboptionG2-2-2" /> + </rich:menuGroup> + + <rich:menuItem value="Suboption2-3" /> + </rich:dropDownMenu> + <rich:dropDownMenu style="border:1px solid #{a4jSkin.panelBorderColor}" value="Option3" direction="bottom-right" jointPoint="tr"> + <rich:menuItem value="Suboption3-1" /> + <rich:menuItem value="Suboption3-2" /> + <rich:menuItem value="Suboption3-3" /> + </rich:dropDownMenu> + + </h:panelGrid> + </h:form> + +</div>

16 years, 11 months

1
0
0 / 0

JBoss Rich Faces SVN: r1350 - in trunk/richfaces-samples/tree-demo/src/main: webapp and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: A.Skokov Date: 2007-06-27 12:34:54 -0400 (Wed, 27 Jun 2007) New Revision: 1350 Added: trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Library.java trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Organism.java trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Pathway.java trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/TreeBean.java trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index2.jsp Modified: trunk/richfaces-samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/richfaces-samples/tree-demo/src/main/webapp/index.jsp Log: http://jira.jboss.com/jira/browse/RF-295 Added: trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Library.java =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Library.java (rev 0) +++ trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Library.java 2007-06-27 16:34:54 UTC (rev 1350) @@ -0,0 +1,117 @@ +package org.richfaces; + +import org.richfaces.component.TreeNode; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +public class Library implements TreeNode { + + private Map pathways = null; + private Object state1; + //private Object state2; + + private List listPathway; + + public Library() { + } + + public Library(List l) { + this.listPathway = l; + } + + private Map getPathways() { + if (this.pathways == null) { + initData(); + } + return this.pathways; + } + + public void addPathway(Pathway pw) { + addChild(Long.toString(pw.getId()), pw); + pw.setParent(this); + } + + public void addChild(Object identifier, TreeNode child) { + getPathways().put(identifier, child); + } + + public TreeNode getChild(Object id) { + return (TreeNode) getPathways().get(id); + } + + public Iterator getChildren() { + return getPathways().entrySet().iterator(); + } + + public Object getData() { + return this; + } + + public TreeNode getParent() { + return null; + } + + public boolean isLeaf() { + return getPathways().isEmpty(); + } + + public void removeChild(Object id) { + getPathways().remove(id); + } + + public void setData(Object data) { + } + + public void setParent(TreeNode parent) { + } + + public String getType() { + return "library"; + } + + + private long nextId = 0; + + private long getNextId() { + return nextId++; + } + + + private Map pathCache = new HashMap(); + + private Pathway getPathwayByName(String name, Library library) { + Pathway pathway = (Pathway) pathCache.get(name); + if (pathway == null) { + pathway = new Pathway(getNextId()); + pathway.setName(name); + pathCache.put(name, pathway); + library.addPathway(pathway); + } + return pathway; + } + + private void initData() { + pathways = new HashMap(); + + for (int i = 0; i < 15; i++) { + Pathway path = getPathwayByName("PATH_" + i, this); + for (int j = 0; j < 20; j++) { + Organism org = new Organism(getNextId()); + org.setName("ORG_" + i + "." + j); + path.addOrganism(org); + } + } + + } + + public Object getState1() { + return state1; + } + + public void setState1(Object state1) { + this.state1 = state1; + } +} \ No newline at end of file Added: trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Organism.java =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Organism.java (rev 0) +++ trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Organism.java 2007-06-27 16:34:54 UTC (rev 1350) @@ -0,0 +1,75 @@ +package org.richfaces; + +import org.richfaces.component.TreeNode; + +import java.util.Iterator; +import java.util.ArrayList; + +public class Organism implements TreeNode { + private long id; + private String name; + private Pathway pathway; + + public Organism(long id) { + this.id = id; + } + + public void addChild(Object identifier, TreeNode child) { + throw new UnsupportedOperationException("Organisms do not have children"); + } + + public TreeNode getChild(Object id) { + throw new UnsupportedOperationException("Organisms do not have children"); + } + + public Iterator getChildren() { + // TODO: Fix me! + return new ArrayList().iterator(); // work around limitation for TreeNode + } + + public Object getData() { + return this; + } + + public TreeNode getParent() { + return pathway; + } + + public boolean isLeaf() { + return true; + } + + public void removeChild(Object id) { + throw new UnsupportedOperationException("Organisms do not have children"); + } + + public void setData(Object data) { + } + + public void setParent(TreeNode parent) { + this.pathway = (Pathway) parent; + } + + public Pathway getPathway() { + return pathway; + } + + public void setPathway(Pathway artist) { + this.pathway = artist; + } + + public String getName() { + return name; + } + + public void setName(String title) { + this.name = title; + } + + public long getId() { + return id; + } + public String getType() { + return "organism"; + } +} Added: trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Pathway.java =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Pathway.java (rev 0) +++ trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/Pathway.java 2007-06-27 16:34:54 UTC (rev 1350) @@ -0,0 +1,83 @@ +package org.richfaces; + +import org.richfaces.component.TreeNode; + +import java.util.HashMap; +import java.util.Map; +import java.util.Iterator; + +public class Pathway implements TreeNode { + + private long id; + private Map organisms = new HashMap(); + private String name; + private Library library; + + + public Pathway(long id) { + this.id = id; + } + + public void addOrganism(Organism org) { + addChild(Long.toString(org.getId()), org); + org.setParent(this); + } + + public void addChild(Object identifier, TreeNode child) { + organisms.put(identifier, child); + } + + public TreeNode getChild(Object id) { + return (TreeNode) organisms.get(id); + } + + public Iterator getChildren() { + return organisms.entrySet().iterator(); + } + + public Object getData() { + return this; + } + + public TreeNode getParent() { + return library; + } + + public boolean isLeaf() { + return organisms.isEmpty(); + } + + public void removeChild(Object id) { + organisms.remove(id); + } + + public void setData(Object data) { + } + + public void setParent(TreeNode parent) { + library = (Library) parent; + } + + public long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Library getLibrary() { + return library; + } + + public void setLibrary(Library library) { + this.library = library; + } + public String getType() { + return "pathway"; + } +} \ No newline at end of file Added: trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/TreeBean.java =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/TreeBean.java (rev 0) +++ trunk/richfaces-samples/tree-demo/src/main/java/org/richfaces/TreeBean.java 2007-06-27 16:34:54 UTC (rev 1350) @@ -0,0 +1,7 @@ +package org.richfaces; + +public class TreeBean { + public Object getPathwayTree() { + return new Library(); + } +} Modified: trunk/richfaces-samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-06-27 16:33:47 UTC (rev 1349) +++ trunk/richfaces-samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-06-27 16:34:54 UTC (rev 1350) @@ -7,6 +7,11 @@ <managed-bean-class>org.richfaces.Bean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> +<managed-bean> + <managed-bean-name>pathwayBean</managed-bean-name> + <managed-bean-class>org.richfaces.TreeBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> +</managed-bean> <managed-bean> <managed-bean-name>skinBean</managed-bean-name> <managed-bean-class>org.richfaces.SkinBean</managed-bean-class> Modified: trunk/richfaces-samples/tree-demo/src/main/webapp/index.jsp =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/webapp/index.jsp 2007-06-27 16:33:47 UTC (rev 1349) +++ trunk/richfaces-samples/tree-demo/src/main/webapp/index.jsp 2007-06-27 16:34:54 UTC (rev 1350) @@ -2,6 +2,6 @@ <html> <head></head> <body> - <jsp:forward page="/pages/index.jsf" /> + <jsp:forward page="/pages/index2.jsf" /> </body> </html> \ No newline at end of file Added: trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index2.jsp =================================================================== --- trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index2.jsp (rev 0) +++ trunk/richfaces-samples/tree-demo/src/main/webapp/pages/index2.jsp 2007-06-27 16:34:54 UTC (rev 1350) @@ -0,0 +1,36 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" %> +<%@ taglib uri="http://richfaces.ajax4jsf.org/tree" prefix="rich" %> +<html> +<head> + <title></title> +</head> + +<body> +<f:view> + +<h:form> + + <rich:tree switchType="client" style="width:300px" + value="#{pathwayBean.pathwayTree}" var="item" + nodeFace="#{item.type}"> + <rich:treeNode type="library"> + <h:outputText value="#{item.type}"/> + </rich:treeNode> + <rich:treeNode type="pathway"> + <h:outputText value="#{item.name}"/> + </rich:treeNode> + <rich:treeNode type="organism"> + <h:outputText value="#{item.name}"/> + </rich:treeNode> + </rich:tree> + +</h:form> + +<a4j:log hotkey="O"/> + +</f:view> +</body> +</html>

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits June 2007