JBoss Rich Faces SVN: r2825 - in trunk/ui/treeModel/src: main/java/org/richfaces/component and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-09 16:18:05 -0400 (Sun, 09 Sep 2007)
New Revision: 2825
Added:
trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml
trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml
trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodesAdaptor.java
trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodesAdaptor.java
Removed:
trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml
trunk/ui/treeModel/src/main/config/component/treeNodes.xml
trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java
trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java
Modified:
trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-866
Deleted: trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml
===================================================================
--- trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml 2007-09-09 20:17:54 UTC (rev 2824)
+++ trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml 2007-09-09 20:18:05 UTC (rev 2825)
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
-<components>
- <component>
- <name>org.richfaces.RecursiveTreeNodes</name>
- <family>org.richfaces.RecursiveTreeNodes</family>
- <classname>org.richfaces.component.html.HtmlRecursiveTreeNodes</classname>
- <superclass>org.richfaces.component.UIRecursiveTreeNodes</superclass>
- <description>
- <![CDATA[
- ]]>
- </description>
- <!-- renderer generate="true" override="true">
- <name>org.richfaces.RecursiveTreeNodesRenderer</name>
- <template>org/richfaces/htmlRecursiveTreeNodes.jspx</template>
- </renderer -->
- <tag>
- <name>recursiveTreeNodes</name>
- <classname>org.richfaces.taglib.RecursiveTreeNodesTag</classname>
- <superclass>
- org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
- </superclass>
- </tag>
- <!--
- <taghandler>
- <classname>org.ajax4jsf.tag.TestHandler</classname>
- </taghandler>
- -->
- &ui_component_attributes;
- <!--
- <property>
- <name>param</name>
- <classname>java.lang.String</classname>
- <description>
- </description>
- <defaultvalue>"default"</defaultvalue>
- </property>
- -->
- <property>
- <name>var</name>
- <classname>java.lang.String</classname>
- <description>
- A request-scope attribute via which the data object for the current collection element will be used when iterating
- </description>
- </property>
- <property elonly="true">
- <name>nodes</name>
- <classname>java.lang.Object</classname>
- <description>
- Defines collection to use at the other (non-top) levels of iteration
- </description>
- </property>
- <property elonly="true">
- <name>roots</name>
- <classname>java.lang.Object</classname>
- <description>
- Defines collection to use at the top of iteration
- </description>
- </property>
- <property>
- <name>included</name>
- <classname>boolean</classname>
- <description>
- This boolean expression is used to define which elements of both collections are processed
- </description>
- <defaultvalue>true</defaultvalue>
- </property>
- <property>
- <name>includedRoot</name>
- <classname>boolean</classname>
- <description>
- This boolean expression is used to define which elements are processed appling to "roots" collection
- </description>
- <defaultvalue>true</defaultvalue>
- </property>
- <property>
- <name>includedNode</name>
- <classname>boolean</classname>
- <description>
- This boolean expression is used to define which elements are processed
- </description>
- <defaultvalue>true</defaultvalue>
- </property>
- </component>
-</components>
Copied: trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml (from rev 2811, trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml)
===================================================================
--- trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml (rev 0)
+++ trunk/ui/treeModel/src/main/config/component/recursiveTreeNodesAdaptor.xml 2007-09-09 20:18:05 UTC (rev 2825)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<components>
+ <component>
+ <name>org.richfaces.RecursiveTreeNodesAdaptor</name>
+ <family>org.richfaces.RecursiveTreeNodesAdaptor</family>
+ <classname>org.richfaces.component.html.HtmlRecursiveTreeNodesAdaptor</classname>
+ <superclass>org.richfaces.component.UIRecursiveTreeNodesAdaptor</superclass>
+ <description>
+ <![CDATA[
+ ]]>
+ </description>
+ <tag>
+ <name>recursiveTreeNodesAdaptor</name>
+ <classname>org.richfaces.taglib.RecursiveTreeNodesAdaptorTag</classname>
+ <superclass>
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
+ </superclass>
+ </tag>
+ <!--
+ <taghandler>
+ <classname>org.ajax4jsf.tag.TestHandler</classname>
+ </taghandler>
+ -->
+ &ui_component_attributes;
+ <!--
+ <property>
+ <name>param</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ <defaultvalue>"default"</defaultvalue>
+ </property>
+ -->
+ <property>
+ <name>var</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A request-scope attribute via which the data object for the current collection element will be used when iterating
+ </description>
+ </property>
+ <property elonly="true">
+ <name>nodes</name>
+ <classname>java.lang.Object</classname>
+ <description>
+ Defines collection to use at the other (non-top) levels of iteration
+ </description>
+ </property>
+ <property elonly="true">
+ <name>roots</name>
+ <classname>java.lang.Object</classname>
+ <description>
+ Defines collection to use at the top of iteration
+ </description>
+ </property>
+ <property>
+ <name>included</name>
+ <classname>boolean</classname>
+ <description>
+ This boolean expression is used to define which elements of both collections are processed
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>includedRoot</name>
+ <classname>boolean</classname>
+ <description>
+ This boolean expression is used to define which elements are processed appling to "roots" collection
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>includedNode</name>
+ <classname>boolean</classname>
+ <description>
+ This boolean expression is used to define which elements are processed
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ </component>
+</components>
Deleted: trunk/ui/treeModel/src/main/config/component/treeNodes.xml
===================================================================
--- trunk/ui/treeModel/src/main/config/component/treeNodes.xml 2007-09-09 20:17:54 UTC (rev 2824)
+++ trunk/ui/treeModel/src/main/config/component/treeNodes.xml 2007-09-09 20:18:05 UTC (rev 2825)
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
-<components>
- <component>
- <name>org.richfaces.TreeNodes</name>
- <family>org.richfaces.TreeNodes</family>
- <classname>org.richfaces.component.html.HtmlTreeNodes</classname>
- <superclass>org.richfaces.component.UITreeNodes</superclass>
- <description>
- <![CDATA[
- ]]>
- </description>
- <!-- renderer generate="false" override="true">
- <name>org.richfaces.TreeNodesRenderer</name>
- <template>org/richfaces/htmlTreeNodes.jspx</template>
- </renderer -->
- <tag>
- <name>treeNodes</name>
- <classname>org.richfaces.taglib.TreeNodesTag</classname>
- <superclass>
- org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
- </superclass>
- </tag>
- <!--
- <taghandler>
- <classname>org.ajax4jsf.tag.TestHandler</classname>
- </taghandler>
- -->
- &ui_component_attributes;
- <!--
- <property>
- <name>param</name>
- <classname>java.lang.String</classname>
- <description>
- </description>
- <defaultvalue>"default"</defaultvalue>
- </property>
- -->
- <property>
- <name>var</name>
- <classname>java.lang.String</classname>
- <description>
- A request-scope attribute via which the data object for the current collection element will be used when iterating
- </description>
- </property>
- <property elonly="true">
- <name>nodes</name>
- <classname>java.lang.Object</classname>
- <description>
- Defines collection to use at the other (non-top) levels of iteration
- </description>
- </property>
- <property>
- <name>includedNode</name>
- <classname>boolean</classname>
- <description>
- This boolean expression is used to define which elements are processed
- </description>
- <defaultvalue>true</defaultvalue>
- </property>
- </component>
-</components>
Copied: trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml (from rev 2811, trunk/ui/treeModel/src/main/config/component/treeNodes.xml)
===================================================================
--- trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml (rev 0)
+++ trunk/ui/treeModel/src/main/config/component/treeNodesAdaptor.xml 2007-09-09 20:18:05 UTC (rev 2825)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
+<components>
+ <component>
+ <name>org.richfaces.TreeNodesAdaptor</name>
+ <family>org.richfaces.TreeNodesAdaptor</family>
+ <classname>org.richfaces.component.html.HtmlTreeNodesAdaptor</classname>
+ <superclass>org.richfaces.component.UITreeNodesAdaptor</superclass>
+ <description>
+ <![CDATA[
+ ]]>
+ </description>
+ <tag>
+ <name>treeNodesAdaptor</name>
+ <classname>org.richfaces.taglib.TreeNodesAdaptorTag</classname>
+ <superclass>
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
+ </superclass>
+ </tag>
+ <!--
+ <taghandler>
+ <classname>org.ajax4jsf.tag.TestHandler</classname>
+ </taghandler>
+ -->
+ &ui_component_attributes;
+ <!--
+ <property>
+ <name>param</name>
+ <classname>java.lang.String</classname>
+ <description>
+ </description>
+ <defaultvalue>"default"</defaultvalue>
+ </property>
+ -->
+ <property>
+ <name>var</name>
+ <classname>java.lang.String</classname>
+ <description>
+ A request-scope attribute via which the data object for the current collection element will be used when iterating
+ </description>
+ </property>
+ <property elonly="true">
+ <name>nodes</name>
+ <classname>java.lang.Object</classname>
+ <description>
+ Defines collection to use at the other (non-top) levels of iteration
+ </description>
+ </property>
+ <property>
+ <name>includedNode</name>
+ <classname>boolean</classname>
+ <description>
+ This boolean expression is used to define which elements are processed
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ </component>
+</components>
Deleted: trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java 2007-09-09 20:17:54 UTC (rev 2824)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java 2007-09-09 20:18:05 UTC (rev 2825)
@@ -1,86 +0,0 @@
-/**
- *
- */
-
-package org.richfaces.component;
-
-import java.util.Iterator;
-
-import org.apache.commons.collections.iterators.IteratorChain;
-import org.richfaces.model.StackingTreeModel;
-import org.richfaces.model.StackingTreeModelDataProvider;
-import org.richfaces.model.VisualStackingTreeModel;
-
-
-/**
- * JSF component class
- *
- */
-public abstract class UIRecursiveTreeNodes extends UITreeNodes {
-
- public static final String COMPONENT_TYPE = "org.richfaces.RecursiveTreeNodes";
-
- public static final String COMPONENT_FAMILY = "org.richfaces.RecursiveTreeNodes";
-
- public abstract Object getRoots();
- public abstract void setRoots(Object roots);
-
- public abstract boolean isIncluded();
- public abstract void setIncluded(boolean active);
-
- public abstract boolean isIncludedRoot();
- public abstract void setIncludedRoot(boolean active);
-
- protected boolean includeNode() {
- return isIncluded() && isIncludedRoot();
- }
-
- public Object getData() {
- return getRoots();
- }
-
- public abstract String getVar();
- public abstract void setVar(String var);
-
- public StackingTreeModel getStackingModel() {
- StackingTreeModel stackingModel = super.getStackingModel();
-
- StackingTreeModel recursiveModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
-
- public Object getData() {
- return UIRecursiveTreeNodes.this.getNodes();
- }
-
- }, UIRecursiveTreeNodes.this) {
-
- public StackingTreeModel getModelById(String id) {
- StackingTreeModel model = super.getModelById(id);
- if (model == null) {
- model = this.getParent().getModelById(id);
- }
-
- return model;
- }
-
- public Iterator getModelsIterator() {
- IteratorChain chain = new IteratorChain();
- chain.addIterator(super.getModelsIterator());
- chain.addIterator(this.getParent().getModelsIterator());
-
- return chain;
- }
-
- protected boolean isActive() {
- return UIRecursiveTreeNodes.this.isRendered();
- }
-
- protected boolean isActiveData() {
- return UIRecursiveTreeNodes.this.isIncluded() && UIRecursiveTreeNodes.this.isIncludedNode();
- }
- };
- stackingModel.addStackingModel(recursiveModel);
-
- return stackingModel;
- }
-
-}
Copied: trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodesAdaptor.java (from rev 2811, trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java)
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodesAdaptor.java (rev 0)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodesAdaptor.java 2007-09-09 20:18:05 UTC (rev 2825)
@@ -0,0 +1,86 @@
+/**
+ *
+ */
+
+package org.richfaces.component;
+
+import java.util.Iterator;
+
+import org.apache.commons.collections.iterators.IteratorChain;
+import org.richfaces.model.StackingTreeModel;
+import org.richfaces.model.StackingTreeModelDataProvider;
+import org.richfaces.model.VisualStackingTreeModel;
+
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UIRecursiveTreeNodesAdaptor extends UITreeNodesAdaptor {
+
+ public static final String COMPONENT_TYPE = "org.richfaces.RecursiveTreeNodesAdaptor";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.RecursiveTreeNodesAdaptor";
+
+ public abstract Object getRoots();
+ public abstract void setRoots(Object roots);
+
+ public abstract boolean isIncluded();
+ public abstract void setIncluded(boolean active);
+
+ public abstract boolean isIncludedRoot();
+ public abstract void setIncludedRoot(boolean active);
+
+ protected boolean includeNode() {
+ return isIncluded() && isIncludedRoot();
+ }
+
+ public Object getData() {
+ return getRoots();
+ }
+
+ public abstract String getVar();
+ public abstract void setVar(String var);
+
+ public StackingTreeModel getStackingModel() {
+ StackingTreeModel stackingModel = super.getStackingModel();
+
+ StackingTreeModel recursiveModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
+
+ public Object getData() {
+ return UIRecursiveTreeNodesAdaptor.this.getNodes();
+ }
+
+ }, UIRecursiveTreeNodesAdaptor.this) {
+
+ public StackingTreeModel getModelById(String id) {
+ StackingTreeModel model = super.getModelById(id);
+ if (model == null) {
+ model = this.getParent().getModelById(id);
+ }
+
+ return model;
+ }
+
+ public Iterator getModelsIterator() {
+ IteratorChain chain = new IteratorChain();
+ chain.addIterator(super.getModelsIterator());
+ chain.addIterator(this.getParent().getModelsIterator());
+
+ return chain;
+ }
+
+ protected boolean isActive() {
+ return UIRecursiveTreeNodesAdaptor.this.isRendered();
+ }
+
+ protected boolean isActiveData() {
+ return UIRecursiveTreeNodesAdaptor.this.isIncluded() && UIRecursiveTreeNodesAdaptor.this.isIncludedNode();
+ }
+ };
+ stackingModel.addStackingModel(recursiveModel);
+
+ return stackingModel;
+ }
+
+}
Deleted: trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java 2007-09-09 20:17:54 UTC (rev 2824)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java 2007-09-09 20:18:05 UTC (rev 2825)
@@ -1,52 +0,0 @@
-/**
- *
- */
-
-package org.richfaces.component;
-
-import org.richfaces.model.StackingTreeModel;
-import org.richfaces.model.StackingTreeModelDataProvider;
-import org.richfaces.model.StackingTreeModelProvider;
-import org.richfaces.model.VisualStackingTreeModel;
-
-
-/**
- * JSF component class
- *
- */
-public abstract class UITreeNodes extends StackingTreeModelProvider {
-
- public static final String COMPONENT_TYPE = "org.richfaces.TreeNodes";
-
- public static final String COMPONENT_FAMILY = "org.richfaces.TreeNodes";
-
- public abstract String getVar();
- public abstract void setVar(String var);
-
- public abstract boolean isIncludedNode();
- public abstract void setIncludedNode(boolean includeNode);
-
- protected boolean includeNode() {
- return isIncludedNode();
- }
-
- protected StackingTreeModel createStackingTreeModel() {
- StackingTreeModel treeModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
-
- public Object getData() {
- return UITreeNodes.this.getData();
- }
-
- }, UITreeNodes.this) {
- protected boolean isActive() {
- return UITreeNodes.this.isRendered();
- }
-
- protected boolean isActiveData() {
- return UITreeNodes.this.includeNode();
- }
- };
-
- return treeModel;
- }
-}
Copied: trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodesAdaptor.java (from rev 2811, trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java)
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodesAdaptor.java (rev 0)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodesAdaptor.java 2007-09-09 20:18:05 UTC (rev 2825)
@@ -0,0 +1,52 @@
+/**
+ *
+ */
+
+package org.richfaces.component;
+
+import org.richfaces.model.StackingTreeModel;
+import org.richfaces.model.StackingTreeModelDataProvider;
+import org.richfaces.model.StackingTreeModelProvider;
+import org.richfaces.model.VisualStackingTreeModel;
+
+
+/**
+ * JSF component class
+ *
+ */
+public abstract class UITreeNodesAdaptor extends StackingTreeModelProvider {
+
+ public static final String COMPONENT_TYPE = "org.richfaces.TreeNodesAdaptor";
+
+ public static final String COMPONENT_FAMILY = "org.richfaces.TreeNodesAdaptor";
+
+ public abstract String getVar();
+ public abstract void setVar(String var);
+
+ public abstract boolean isIncludedNode();
+ public abstract void setIncludedNode(boolean includeNode);
+
+ protected boolean includeNode() {
+ return isIncludedNode();
+ }
+
+ protected StackingTreeModel createStackingTreeModel() {
+ StackingTreeModel treeModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
+
+ public Object getData() {
+ return UITreeNodesAdaptor.this.getData();
+ }
+
+ }, UITreeNodesAdaptor.this) {
+ protected boolean isActive() {
+ return UITreeNodesAdaptor.this.isRendered();
+ }
+
+ protected boolean isActiveData() {
+ return UITreeNodesAdaptor.this.includeNode();
+ }
+ };
+
+ return treeModel;
+ }
+}
Modified: trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java
===================================================================
--- trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2007-09-09 20:17:54 UTC (rev 2824)
+++ trunk/ui/treeModel/src/test/java/org/richfaces/component/TreeModelComponentTest.java 2007-09-09 20:18:05 UTC (rev 2825)
@@ -128,7 +128,7 @@
tree.setId("tree");
form.getChildren().add(tree);
- UITreeNodes project = (UITreeNodes) application.createComponent(UITreeNodes.COMPONENT_TYPE);
+ UITreeNodesAdaptor project = (UITreeNodesAdaptor) application.createComponent(UITreeNodesAdaptor.COMPONENT_TYPE);
project.setVar("project");
project.setValueBinding("nodes", application.createValueBinding("#{nodes}"));
project.getChildren().add(createOutput("#{XPathStringMap['$project/@id']}"));
@@ -136,7 +136,7 @@
tree.getChildren().add(project);
- UIRecursiveTreeNodes directories = (UIRecursiveTreeNodes) application.createComponent(UIRecursiveTreeNodes.COMPONENT_TYPE);
+ UIRecursiveTreeNodesAdaptor directories = (UIRecursiveTreeNodesAdaptor) application.createComponent(UIRecursiveTreeNodesAdaptor.COMPONENT_TYPE);
directories.setVar("dir");
directories.setValueBinding("roots", application.createValueBinding("#{XPathMap['$project/directory']}"));
directories.setValueBinding("nodes", application.createValueBinding("#{XPathMap['$dir/directory']}"));
@@ -145,7 +145,7 @@
project.getChildren().add(directories);
- UITreeNodes files = (UITreeNodes) application.createComponent(UITreeNodes.COMPONENT_TYPE);
+ UITreeNodesAdaptor files = (UITreeNodesAdaptor) application.createComponent(UITreeNodesAdaptor.COMPONENT_TYPE);
files.setVar("file");
files.setValueBinding("nodes", application.createValueBinding("#{XPathMap['$dir/file']}"));
files.getChildren().add(createOutput("#{XPathStringMap['$file/@id']}"));
@@ -153,7 +153,7 @@
directories.getChildren().add(files);
- UIRecursiveTreeNodes archives = (UIRecursiveTreeNodes) application.createComponent(UIRecursiveTreeNodes.COMPONENT_TYPE);
+ UIRecursiveTreeNodesAdaptor archives = (UIRecursiveTreeNodesAdaptor) application.createComponent(UIRecursiveTreeNodesAdaptor.COMPONENT_TYPE);
archives.setVar("archiveEntry");
archives.setValueBinding("roots", application.createValueBinding("#{XPathMap['$dir/archive']}"));
archives.setValueBinding("nodes", application.createValueBinding("#{XPathMap['$archiveEntry/archiveEntry']}"));
18 years, 8 months
JBoss Rich Faces SVN: r2824 - trunk/samples/treeModelDemo/src/main/webapp/pages.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-09 16:17:54 -0400 (Sun, 09 Sep 2007)
New Revision: 2824
Modified:
trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp
Log:
http://jira.jboss.com/jira/browse/RF-866
Modified: trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2007-09-09 15:42:43 UTC (rev 2823)
+++ trunk/samples/treeModelDemo/src/main/webapp/pages/index.jsp 2007-09-09 20:17:54 UTC (rev 2824)
@@ -12,60 +12,60 @@
<f:view>
<h:form>
<tree:tree adviseNodeOpened="#{treeModelBean.adviseNodeOpened}" switchType="client">
- <model:treeNodes id="project" nodes="#{loaderBean.projects}" var="project">
+ <model:treeNodesAdaptor id="project" nodes="#{loaderBean.projects}" var="project">
<tree:treeNode>
<h:commandLink action="#{project.click}" value="Project: #{project.name}" />
</tree:treeNode>
- <model:treeNodes id="srcDir" var="srcDir" nodes="#{project.srcDirs}">
+ <model:treeNodesAdaptor id="srcDir" var="srcDir" nodes="#{project.srcDirs}">
<tree:treeNode>
<h:commandLink action="#{srcDir.click}" value="Source directory: #{srcDir.name}" />
</tree:treeNode>
- <model:treeNodes id="pkg" var="pkg" nodes="#{srcDir.packages}">
+ <model:treeNodesAdaptor id="pkg" var="pkg" nodes="#{srcDir.packages}">
<tree:treeNode>
<h:commandLink action="#{pkg.click}" value="Package: #{pkg.name}" />
</tree:treeNode>
- <model:treeNodes id="class" var="class" nodes="#{pkg.classes}">
+ <model:treeNodesAdaptor id="class" var="class" nodes="#{pkg.classes}">
<tree:treeNode>
<h:commandLink action="#{class.click}" value="Class: #{class.name}" />
</tree:treeNode>
- </model:treeNodes>
- </model:treeNodes>
+ </model:treeNodesAdaptor>
+ </model:treeNodesAdaptor>
- <model:treeNodes id="pkg1" var="pkg" nodes="#{srcDir.packages}">
+ <model:treeNodesAdaptor id="pkg1" var="pkg" nodes="#{srcDir.packages}">
<tree:treeNode>
<h:commandLink action="#{pkg.click}" value="Package1: #{pkg.name}" />
</tree:treeNode>
- <model:treeNodes id="class1" var="class" nodes="#{pkg.classes}">
+ <model:treeNodesAdaptor id="class1" var="class" nodes="#{pkg.classes}">
<tree:treeNode>
<h:commandLink action="#{class.click}" value="Class1: #{class.name}" />
</tree:treeNode>
- </model:treeNodes>
- </model:treeNodes>
- </model:treeNodes>
+ </model:treeNodesAdaptor>
+ </model:treeNodesAdaptor>
+ </model:treeNodesAdaptor>
- <model:recursiveTreeNodes id="dir" var="dir"
+ <model:recursiveTreeNodesAdaptor id="dir" var="dir"
roots="#{project.dirs}" nodes="#{dir.directories}">
<tree:treeNode>
<h:commandLink action="#{dir.click}" value="Directory: #{dir.name}" />
</tree:treeNode>
- <model:treeNodes id="file" var="file" nodes="#{dir.files}">
+ <model:treeNodesAdaptor id="file" var="file" nodes="#{dir.files}">
<tree:treeNode>
<h:commandLink action="#{file.click}" value="File: #{file.name}" />
</tree:treeNode>
- </model:treeNodes>
+ </model:treeNodesAdaptor>
- <model:treeNodes id="file1" var="file" nodes="#{dir.files}">
+ <model:treeNodesAdaptor id="file1" var="file" nodes="#{dir.files}">
<tree:treeNode>
<h:commandLink action="#{file.click}" value="File1: #{file.name}" />
</tree:treeNode>
- </model:treeNodes>
+ </model:treeNodesAdaptor>
- <model:recursiveTreeNodes id="archiveEntry" var="archiveEntry"
+ <model:recursiveTreeNodesAdaptor id="archiveEntry" var="archiveEntry"
roots="#{dir.files}" nodes="#{archiveEntry.archiveEntries}"
includedRoot="#{archiveEntry.class.simpleName == 'ArchiveFile'}"
includedNode="#{archiveEntry.class.simpleName == 'ArchiveEntry'}">
@@ -74,16 +74,16 @@
<h:commandLink action="#{archiveEntry.click}" value="Archive entry: #{archiveEntry.name}" />
</tree:treeNode>
- </model:recursiveTreeNodes>
+ </model:recursiveTreeNodesAdaptor>
- </model:recursiveTreeNodes>
+ </model:recursiveTreeNodesAdaptor>
<%--model:treeNodes var="file" nodes="#{proj.dir.files}">
<tree:treeNode>
<h:outputText value="File: #{file.name}" />
</tree:treeNode>
</model:treeNodes--%>
- </model:treeNodes>
+ </model:treeNodesAdaptor>
</tree:tree>
</h:form>
</f:view>
18 years, 8 months
JBoss Rich Faces SVN: r2823 - trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-09 11:42:43 -0400 (Sun, 09 Sep 2007)
New Revision: 2823
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
Log:
extensions/portlet made compileable - Java 5 elements removed
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -27,7 +27,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
nextPhase.execute(context, listeners);
@@ -36,7 +35,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
context.getViewRoot().processDecodes(context);
}
@@ -44,7 +42,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
// TODO Auto-generated method stub
return PhaseId.APPLY_REQUEST_VALUES;
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -24,7 +24,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
// do nothing.
@@ -34,7 +33,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
context.getViewRoot().processApplication(context);
}
@@ -42,7 +40,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
return PhaseId.INVOKE_APPLICATION;
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -17,7 +17,8 @@
*/
public class PortletLifecycle extends Lifecycle {
- private final List<PhaseListener> _phaseListeners = new ArrayList<PhaseListener>();
+ //List<PhaseListener>
+ private final List _phaseListeners = new ArrayList();
private final LifecyclePhase executePhase = new RestoreViewPhase(this);
@@ -65,7 +66,7 @@
if (_phaseListenersArray == null) {
// Lazy creation of a working copy listeners Array.
synchronized (_phaseListeners) {
- _phaseListenersArray = _phaseListeners.toArray(new PhaseListener[_phaseListeners.size()]);
+ _phaseListenersArray = (PhaseListener[]) _phaseListeners.toArray(new PhaseListener[_phaseListeners.size()]);
}
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -37,7 +37,8 @@
private LifecycleFactory _defaultFactory;
- private final Map<String, Lifecycle> _lifecycles = new HashMap<String, Lifecycle>(1);
+ //Map<String, Lifecycle>
+ private final Map _lifecycles = new HashMap(1);
// private Map _lifecycles = new HashMap();
@@ -68,7 +69,7 @@
if(null == lifecycleId ){
throw new NullPointerException("argument for a removeLifecycle method can't be null");
}
- return _lifecycles.get(lifecycleId);
+ return (Lifecycle) _lifecycles.get(lifecycleId);
}
/* (non-Javadoc)
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -27,7 +27,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
nextPhase.execute(context, listeners);
@@ -37,7 +36,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
context.getViewRoot().processValidators(context);
@@ -46,7 +44,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
return PhaseId.PROCESS_VALIDATIONS;
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -27,7 +27,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
// do nothing.
@@ -37,7 +36,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
try {
context.getApplication().getViewHandler().
@@ -52,7 +50,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
// TODO Auto-generated method stub
return PhaseId.RENDER_RESPONSE;
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -1,53 +1,50 @@
-/**
- *
- */
-package org.ajax4jsf.portlet.lifecycle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-
-/**
- * @author asmirnov
- *
- */
-public class RestoreViewPhase extends LifecyclePhase {
-
- private final LifecyclePhase nextPhase;
-
- /**
- * @param lifecycle
- */
- public RestoreViewPhase(Lifecycle lifecycle) {
- super(lifecycle);
- nextPhase = new ApplyValuesPhase(lifecycle);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
- */
- @Override
- protected void executeNextPhase(FacesContext context,
- PhaseListener[] listeners) {
- nextPhase.execute(context, listeners);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
- */
- @Override
- protected void executePhase(FacesContext context) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
- */
- @Override
- protected PhaseId getPhaseId() {
- return PhaseId.RESTORE_VIEW;
- }
-
-}
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class RestoreViewPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+
+ /**
+ * @param lifecycle
+ */
+ public RestoreViewPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new ApplyValuesPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ protected void executePhase(FacesContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ protected PhaseId getPhaseId() {
+ return PhaseId.RESTORE_VIEW;
+ }
+
+}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -1,53 +1,50 @@
-/**
- *
- */
-package org.ajax4jsf.portlet.lifecycle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-
-/**
- * @author asmirnov
- *
- */
-public class UpdateModelPhase extends LifecyclePhase {
-
- private final LifecyclePhase nextPhase;
- /**
- * @param lifecycle
- */
- public UpdateModelPhase(Lifecycle lifecycle) {
- super(lifecycle);
- nextPhase = new InvokeApplicationPhase(lifecycle);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
- */
- @Override
- protected void executeNextPhase(FacesContext context,
- PhaseListener[] listeners) {
- nextPhase.execute(context, listeners);
-
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
- */
- @Override
- protected void executePhase(FacesContext context) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
- */
- @Override
- protected PhaseId getPhaseId() {
- return PhaseId.UPDATE_MODEL_VALUES;
- }
-
-}
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class UpdateModelPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+ /**
+ * @param lifecycle
+ */
+ public UpdateModelPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new InvokeApplicationPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ protected void executePhase(FacesContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ protected PhaseId getPhaseId() {
+ return PhaseId.UPDATE_MODEL_VALUES;
+ }
+
+}
18 years, 8 months
JBoss Rich Faces SVN: r2822 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2007-09-08 09:24:14 -0400 (Sat, 08 Sep 2007)
New Revision: 2822
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/AbstractTreeDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/LastElementAware.java
trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java
trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelDataProvider.java
trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelProvider.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeNode.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeNodeImpl.java
trunk/framework/api/src/main/java/org/richfaces/model/TreeRange.java
trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java
Log:
http://jira.jboss.com/jira/browse/RF-856
Modified: trunk/framework/api/src/main/java/org/richfaces/model/AbstractTreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/AbstractTreeDataModel.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/AbstractTreeDataModel.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -31,8 +31,8 @@
import org.ajax4jsf.model.Range;
/**
+ * Base class for all tree data models
* @author Nick Belaevski - nbelaevski(a)exadel.com created 07.12.2006
- * Base class for all tree data models
*/
public abstract class AbstractTreeDataModel extends ExtendedDataModel {
public final static char SEPARATOR = NamingContainer.SEPARATOR_CHAR;
Modified: trunk/framework/api/src/main/java/org/richfaces/model/LastElementAware.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/LastElementAware.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/LastElementAware.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -22,12 +22,12 @@
package org.richfaces.model;
/**
- * @author Konstantin Mishin
- *
* {@link org.ajax4jsf.ajax.repeat.UIDataAdaptor.ComponentVisitor} instances can implement this interface in order to
* be notified of last element occurence at the current tree level. {@link #setLastElement()}
* method is invoked before visiting last element and {@link #resetLastElement()} is called after
* visiting last element.
+ *
+ * @author Konstantin Mishin
*/
public interface LastElementAware {
Modified: trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -26,9 +26,10 @@
import java.util.List;
/**
+ * Default {@link TreeRowKey} implementation based on {@link ArrayList}
+ * created 17.11.2006
+ *
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 17.11.2006
- * Default {@link TreeRowKey} implementation based on {@link ArrayList}
*/
public class ListRowKey extends TreeRowKey {
Modified: trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/MapDataModel.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -20,8 +20,9 @@
import org.w3c.dom.Node;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski mailto:nbelaevski@exadel.com created 30.07.2007
- *
*/
public class MapDataModel extends ExtendedDataModel {
Modified: trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -18,6 +18,8 @@
import org.w3c.dom.NodeList;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski
* mailto:nbelaevski@exadel.com
* created 30.07.2007
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModel.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -20,6 +20,8 @@
import org.w3c.dom.NamedNodeMap;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski mailto:nbelaevski@exadel.com created 25.07.2007
*
*/
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelDataProvider.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelDataProvider.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelDataProvider.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -4,6 +4,8 @@
package org.richfaces.model;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski
* mailto:nbelaevski@exadel.com
* created 30.07.2007
Modified: trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelProvider.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelProvider.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/StackingTreeModelProvider.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -10,6 +10,8 @@
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski mailto:nbelaevski@exadel.com created 25.07.2007
*
*/
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeDataModel.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -31,6 +31,8 @@
import org.ajax4jsf.model.Range;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski - nbelaevski(a)exadel.com created 16.11.2006
*
*/
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeModelVisualComponentProvider.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -6,6 +6,8 @@
import javax.faces.component.UIComponent;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski
* mailto:nbelaevski@exadel.com
* created 29.07.2007
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeNode.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeNode.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeNode.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -27,9 +27,10 @@
/**
+ * Interface representing tree ADT nodes
+ * created 16.11.2006
+ *
* @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 16.11.2006
- * Interface representing tree ADT nodes
*/
public interface TreeNode extends Serializable{
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeNodeImpl.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeNodeImpl.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeNodeImpl.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -26,10 +26,11 @@
import java.util.Map;
/**
- * @author Nick Belaevski - nbelaevski(a)exadel.com
- * created 16.11.2006
* Default {@link TreeNode} implementation based on {@link LinkedHashMap} to preserve
* elements ordering
+ * created 16.11.2006
+ *
+ * @author Nick Belaevski - nbelaevski(a)exadel.com
*/
public class TreeNodeImpl implements TreeNode {
Modified: trunk/framework/api/src/main/java/org/richfaces/model/TreeRange.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/TreeRange.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/TreeRange.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -24,11 +24,27 @@
import org.ajax4jsf.model.Range;
/**
- * @author Nick Belaevski - nbelaevski(a)exadel.com
+ * {@link Range} implmentation variant for {@link AbstractTreeDataModel}
+ *
* created 23.11.2006
*
+ * @author Nick Belaevski - nbelaevski(a)exadel.com
+ *
*/
public interface TreeRange extends Range {
+
+ /**
+ * Returns <code>true</code> if node with that rowKey should be processed.
+ * If <code>false</code> is returned, then skips processing child nodes also.
+ * @param rowKey {@link TreeRowKey} key instance
+ * @return <code>true</code> or <code>false</code>
+ */
public boolean processNode(TreeRowKey rowKey);
+
+ /**
+ * Returns <code>true</code> if children of the node with that rowKey should be processed
+ * @param rowKey {@link TreeRowKey} key instance
+ * @return <code>true</code> or <code>false</code>
+ */
public boolean processChildren(TreeRowKey rowKey);
}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java 2007-09-08 00:40:01 UTC (rev 2821)
+++ trunk/framework/api/src/main/java/org/richfaces/model/VisualStackingTreeModel.java 2007-09-08 13:24:14 UTC (rev 2822)
@@ -6,6 +6,8 @@
import javax.faces.component.UIComponent;
/**
+ * That is intended for internal use
+ *
* @author Nick Belaevski
* mailto:nbelaevski@exadel.com
* created 15.08.2007
18 years, 8 months
JBoss Rich Faces SVN: r2821 - in trunk: framework/impl/src/main/javascript/ajaxjsf and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-09-07 20:40:01 -0400 (Fri, 07 Sep 2007)
New Revision: 2821
Added:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java
trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js
Log:
Prevent recursion in a LOG popup window.
Create AjaxPortlet-related Lifecycle implementation.
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ApplyValuesPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+
+ /**
+ * @param lifecycle
+ */
+ public ApplyValuesPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new UpdateModelPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ @Override
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ @Override
+ protected void executePhase(FacesContext context) {
+ context.getViewRoot().processDecodes(context);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ @Override
+ protected PhaseId getPhaseId() {
+ // TODO Auto-generated method stub
+ return PhaseId.APPLY_REQUEST_VALUES;
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,50 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class InvokeApplicationPhase extends LifecyclePhase {
+
+ /**
+ * @param lifecycle
+ */
+ public InvokeApplicationPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ @Override
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ // do nothing.
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ @Override
+ protected void executePhase(FacesContext context) {
+ context.getViewRoot().processApplication(context);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ @Override
+ protected PhaseId getPhaseId() {
+ return PhaseId.INVOKE_APPLICATION;
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,102 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author asmirnov
+ *
+ */
+public abstract class LifecyclePhase {
+
+
+ private static final Log _log = LogFactory.getLog(LifecyclePhase.class);
+
+
+ private final Lifecycle _lifecycle;
+
+ public LifecyclePhase(Lifecycle lifecycle) {
+ this._lifecycle = lifecycle;
+ }
+
+
+ /**
+ * Execute phase methods with
+ * @param context
+ * @param listeners
+ */
+ public void execute(FacesContext context,PhaseListener[] listeners){
+ int listenerToCall = 0;
+ PhaseEvent event = new PhaseEvent(context,getPhaseId(),_lifecycle);
+ // Execute listeners before phase.
+ try {
+ for(;listenerToCall<listeners.length;listenerToCall++){
+ PhaseListener listener = listeners[listenerToCall];
+ if(isExecutableListener(listener)){
+ listener.beforePhase(event);
+ }
+ }
+ } catch (Exception e) {
+ _log.error("Error to execute beforePhase "+getPhaseId().toString()+ " method for listener", e);
+ }
+ try {
+ executePhase(context);
+ } catch (Exception e) {
+ _log.error("Error execute phase "+getPhaseId().toString());
+ if(PhaseId.RENDER_RESPONSE.compareTo(getPhaseId())==0){
+ throw new FacesException(e);
+ }
+ } finally {
+ // Execute listeners after phase, in the reverse order of the before phase.
+ try {
+ for(listenerToCall--;listenerToCall>=0;listenerToCall--){
+ PhaseListener listener = listeners[listenerToCall];
+ if(isExecutableListener(listener)){
+ listener.afterPhase(event);
+ }
+ }
+ } catch (Exception e) {
+ _log.error("Error to execute afterPhase "+getPhaseId().toString()+ " method for listener", e);
+ }
+
+ }
+ if(!context.getRenderResponse() && !context.getResponseComplete()){
+ executeNextPhase(context,listeners);
+ }
+ }
+
+ /**
+ * @param context
+ * @param listeners
+ */
+ protected abstract void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners);
+
+
+ /**
+ * @param context
+ */
+ protected abstract void executePhase(FacesContext context);
+
+
+ /**
+ * @return
+ */
+ protected abstract PhaseId getPhaseId();
+
+ private boolean isExecutableListener(PhaseListener listener) {
+ PhaseId phaseId = listener.getPhaseId();
+ return 0 == getPhaseId().compareTo(phaseId) || 0 == PhaseId.ANY_PHASE.compareTo(phaseId);
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-07 20:13:39 UTC (rev 2820)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -3,6 +3,9 @@
*/
package org.ajax4jsf.portlet.lifecycle;
+import java.util.ArrayList;
+import java.util.List;
+
import javax.faces.FacesException;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseListener;
@@ -12,12 +15,17 @@
* @author asmirnov
*
*/
-public class PortletLifecycle {
+public class PortletLifecycle extends Lifecycle {
+
+ private final List<PhaseListener> _phaseListeners = new ArrayList<PhaseListener>();
+
+ private final LifecyclePhase executePhase = new RestoreViewPhase(this);
+
+ private final LifecyclePhase renderPhase = new RenderResponsePhase(this);
+
+ private PhaseListener[] _phaseListenersArray = null;
- private Lifecycle _defaultLifecycle;
-
- public PortletLifecycle(Lifecycle lifecycle) {
- _defaultLifecycle = lifecycle;
+ public PortletLifecycle() {
}
/**
@@ -25,66 +33,61 @@
* @see javax.faces.lifecycle.Lifecycle#addPhaseListener(javax.faces.event.PhaseListener)
*/
public void addPhaseListener(PhaseListener listener) {
- _defaultLifecycle.addPhaseListener(listener);
+ if(null == listener){
+ throw new NullPointerException("PhaseListener for add to Lifecycle can't be null");
+ }
+ synchronized (_phaseListeners) {
+ _phaseListeners.add(listener);
+ _phaseListenersArray = null;
+ }
}
+
/**
- * @param obj
- * @return
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return _defaultLifecycle.equals(obj);
- }
+ * @param listener
+ * @see javax.faces.lifecycle.Lifecycle#removePhaseListener(javax.faces.event.PhaseListener)
+ */
+ public void removePhaseListener(PhaseListener listener) {
+ if(null == listener){
+ throw new NullPointerException("PhaseListener for remove from Lifecycle can't be null");
+ }
+ synchronized (_phaseListeners) {
+ _phaseListeners.remove(listener);
+ _phaseListenersArray = null;
+ }
+ }
- /**
+ /**
+ * @return
+ * @see javax.faces.lifecycle.Lifecycle#getPhaseListeners()
+ */
+ public PhaseListener[] getPhaseListeners() {
+ if (_phaseListenersArray == null) {
+ // Lazy creation of a working copy listeners Array.
+ synchronized (_phaseListeners) {
+ _phaseListenersArray = _phaseListeners.toArray(new PhaseListener[_phaseListeners.size()]);
+ }
+ }
+
+ return _phaseListenersArray;
+ }
+
+ /**
* @param context
* @throws FacesException
* @see javax.faces.lifecycle.Lifecycle#execute(javax.faces.context.FacesContext)
*/
public void execute(FacesContext context) throws FacesException {
- _defaultLifecycle.execute(context);
+ executePhase.execute(context, getPhaseListeners());
}
/**
- * @return
- * @see javax.faces.lifecycle.Lifecycle#getPhaseListeners()
- */
- public PhaseListener[] getPhaseListeners() {
- return _defaultLifecycle.getPhaseListeners();
- }
-
- /**
- * @return
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return _defaultLifecycle.hashCode();
- }
-
- /**
- * @param listener
- * @see javax.faces.lifecycle.Lifecycle#removePhaseListener(javax.faces.event.PhaseListener)
- */
- public void removePhaseListener(PhaseListener listener) {
- _defaultLifecycle.removePhaseListener(listener);
- }
-
- /**
* @param context
* @throws FacesException
* @see javax.faces.lifecycle.Lifecycle#render(javax.faces.context.FacesContext)
*/
public void render(FacesContext context) throws FacesException {
- _defaultLifecycle.render(context);
+ renderPhase.execute(context, getPhaseListeners());
}
-
- /**
- * @return
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return _defaultLifecycle.toString();
- }
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-07 20:13:39 UTC (rev 2820)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -21,7 +21,9 @@
package org.ajax4jsf.portlet.lifecycle;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.lifecycle.LifecycleFactory;
@@ -35,19 +37,10 @@
private LifecycleFactory _defaultFactory;
- private PortletLifecycle _defaultLifecycle ;
+ private final Map<String, Lifecycle> _lifecycles = new HashMap<String, Lifecycle>(1);
// private Map _lifecycles = new HashMap();
- /**
- * @return the debugLifecycle
- */
- private PortletLifecycle getDefaultLifecycle() {
- if (_defaultLifecycle == null) {
- _defaultLifecycle = new PortletLifecycle(_defaultFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE));
- }
- return _defaultLifecycle;
- }
/**
* @param defaultFactory
@@ -55,29 +48,34 @@
public PortletLifecycleFactory(LifecycleFactory defaultFactory) {
super();
this._defaultFactory = defaultFactory;
+ this._lifecycles.put(DEFAULT_LIFECYCLE, new PortletLifecycle());
}
/* (non-Javadoc)
* @see javax.faces.lifecycle.LifecycleFactory#addLifecycle(java.lang.String, javax.faces.lifecycle.Lifecycle)
*/
- public void addLifecycle(String arg0, Lifecycle arg1) {
- this._defaultFactory.addLifecycle(arg0, arg1);
+ public void addLifecycle(String lifecycleId, Lifecycle lifecycle) {
+ if(null == lifecycleId || null == lifecycle){
+ throw new NullPointerException("arguments for a addLifecycle method can't be null");
+ }
+ _lifecycles.put(lifecycleId, lifecycle);
}
/* (non-Javadoc)
* @see javax.faces.lifecycle.LifecycleFactory#getLifecycle(java.lang.String)
*/
public Lifecycle getLifecycle(String lifecycleId) {
- Lifecycle life;
- life = this._defaultFactory.getLifecycle(lifecycleId);
- return life;
+ if(null == lifecycleId ){
+ throw new NullPointerException("argument for a removeLifecycle method can't be null");
+ }
+ return _lifecycles.get(lifecycleId);
}
/* (non-Javadoc)
* @see javax.faces.lifecycle.LifecycleFactory#getLifecycleIds()
*/
public Iterator getLifecycleIds() {
- return this._defaultFactory.getLifecycleIds();
+ return _lifecycles.keySet().iterator();
}
}
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,54 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ProcessValidatorsPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+
+ /**
+ * @param lifecycle
+ */
+ public ProcessValidatorsPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new UpdateModelPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ @Override
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ @Override
+ protected void executePhase(FacesContext context) {
+ context.getViewRoot().processValidators(context);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ @Override
+ protected PhaseId getPhaseId() {
+ return PhaseId.PROCESS_VALIDATIONS;
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,61 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import java.io.IOException;
+
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class RenderResponsePhase extends LifecyclePhase {
+
+ /**
+ * @param lifecycle
+ */
+ public RenderResponsePhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ @Override
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ // do nothing.
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ @Override
+ protected void executePhase(FacesContext context) {
+ try {
+ context.getApplication().getViewHandler().
+ renderView(context, context.getViewRoot());
+ } catch (FacesException e) {
+ throw e;
+ } catch (IOException e) {
+ throw new FacesException(e);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ @Override
+ protected PhaseId getPhaseId() {
+ // TODO Auto-generated method stub
+ return PhaseId.RENDER_RESPONSE;
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class RestoreViewPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+
+ /**
+ * @param lifecycle
+ */
+ public RestoreViewPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new ApplyValuesPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ @Override
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ @Override
+ protected void executePhase(FacesContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ @Override
+ protected PhaseId getPhaseId() {
+ return PhaseId.RESTORE_VIEW;
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java (rev 0)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java 2007-09-08 00:40:01 UTC (rev 2821)
@@ -0,0 +1,53 @@
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class UpdateModelPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+ /**
+ * @param lifecycle
+ */
+ public UpdateModelPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new InvokeApplicationPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ @Override
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ @Override
+ protected void executePhase(FacesContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ @Override
+ protected PhaseId getPhaseId() {
+ return PhaseId.UPDATE_MODEL_VALUES;
+ }
+
+}
Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js 2007-09-07 20:13:39 UTC (rev 2820)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js 2007-09-08 00:40:01 UTC (rev 2821)
@@ -5,10 +5,8 @@
* @author <a href="mailto:thespiegs@users.sourceforge.net">Eric Spiegelberg</a>
* @see <a href="http://sourceforge.net/projects/log4ajax">Log4Ajax</a>
*/
-
-function LOG()
-{
- throw "Do not instantiate LOG";
+if (!window.LOG) {
+ window.LOG = {};
}
LOG.Level = function(name, priority, color){
18 years, 8 months
JBoss Rich Faces SVN: r2820 - in trunk: framework/impl/src/main/java/org/ajax4jsf/util and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2007-09-07 16:13:39 -0400 (Fri, 07 Sep 2007)
New Revision: 2820
Added:
trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java
Modified:
trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java
trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java
Log:
Remove JSP Tag class dependency from model.
Modified: trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2007-09-07 19:22:59 UTC (rev 2819)
+++ trunk/framework/api/src/main/java/org/richfaces/skin/SkinFactory.java 2007-09-07 20:13:39 UTC (rev 2820)
@@ -141,29 +141,6 @@
/**
- * Get EL-enabled value. Return same string, if not el-expression.
- * Otherthise, return parsed and evaluated expression.
- *
- * @param context -
- * current Faces Context.
- * @param value -
- * string to parse.
- * @return - interpreted el or unmodified value.
- */
- protected static boolean isValueReference(String value) {
- if (value == null)
- return false;
-
- int start = value.indexOf("#{");
- if (start >= 0) {
- int end = value.lastIndexOf('}');
- if (end >= 0 && start < end) {
- return true;
- }
- }
- return false;
- }
- /**
* Resource Uri for file with name of class for application-wide SkinFactory same as SPI definitions for common Java SAX, Jsf etc. factories
*/
public static final String SERVICE_RESOURCE = "META-INF/services/" + SkinFactory.class.getName();
Added: trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java 2007-09-07 20:13:39 UTC (rev 2820)
@@ -0,0 +1,40 @@
+/**
+ *
+ */
+package org.ajax4jsf.util;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class ELUtils {
+
+ private ELUtils() {
+ // Utility class with static methods only - do not instantiate.
+ }
+
+ /**
+ * Get EL-enabled value. Return same string, if not el-expression.
+ * Otherthise, return parsed and evaluated expression.
+ *
+ * @param context -
+ * current Faces Context.
+ * @param value -
+ * string to parse.
+ * @return - interpreted el or unmodified value.
+ */
+ public static boolean isValueReference(String value) {
+ if (value == null)
+ return false;
+
+ int start = value.indexOf("#{");
+ if (start >= 0) {
+ int end = value.lastIndexOf('}');
+ if (end >= 0 && start < end) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
Property changes on: trunk/framework/impl/src/main/java/org/ajax4jsf/util/ELUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Revision Author
Modified: trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2007-09-07 19:22:59 UTC (rev 2819)
+++ trunk/framework/impl/src/main/java/org/richfaces/skin/SkinFactoryImpl.java 2007-09-07 20:13:39 UTC (rev 2820)
@@ -39,6 +39,7 @@
import javax.faces.el.ValueBinding;
import org.ajax4jsf.Messages;
+import org.ajax4jsf.util.ELUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.richfaces.skin.Skin;
@@ -223,7 +224,7 @@
// not set - usr default.
return DEFAULT_SKIN_NAME;
}
- if (SkinFactory.isValueReference(currentSkinName)) {
+ if (ELUtils.isValueReference(currentSkinName)) {
// For EL expression as skin name
binding = context.getApplication().createValueBinding(
currentSkinName);
@@ -344,7 +345,7 @@
Messages.SKIN_CYCLIC_REFERENCE, propertyName));
}
}
- if (SkinFactory.isValueReference(property)) {
+ if (ELUtils.isValueReference(property)) {
skinParams.put(propertyName, app
.createValueBinding(property));
} else {
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java 2007-09-07 19:22:59 UTC (rev 2819)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/model/internal/ObjectWrapperFactory.java 2007-09-07 20:13:39 UTC (rev 2820)
@@ -29,8 +29,8 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.el.PropertyResolver;
-import javax.faces.webapp.UIComponentTag;
+import org.ajax4jsf.util.ELUtils;
import org.richfaces.model.SortField;
import org.richfaces.model.SortOrder;
/**
@@ -68,7 +68,7 @@
final SortField field = sortFields[i];
final String name = field.getName();
- if (UIComponentTag.isValueReference(name)) {
+ if (ELUtils.isValueReference(name)) {
expressions[i] = new ValueBindingExpression(context, name, var);
18 years, 8 months
JBoss Rich Faces SVN: r2819 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: toolTip/examples and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: SergeySmirnov
Date: 2007-09-07 15:22:59 -0400 (Fri, 07 Sep 2007)
New Revision: 2819
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml 2007-09-07 17:12:50 UTC (rev 2818)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/usage.xhtml 2007-09-07 19:22:59 UTC (rev 2819)
@@ -16,8 +16,7 @@
<li>resizing of columns by the mouse dragging the column bar;</li>
<li>sorting of columns by clicking the header;</li>
<li>fixing of one or more left columns when a table is scrolled horizontally;</li>
- <li>one and multi-selection rows mode;</li>
- <li>built-it drag-n-drop support;</li>
+ <li>one and multi-selection rows mode;</li>
<li>customization of table look-n-fill from skin parameters</li>
<li>customizing the table look-n-fill from skin parameters</li>
</ul>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml 2007-09-07 17:12:50 UTC (rev 2818)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/tooltipUsage.xhtml 2007-09-07 19:22:59 UTC (rev 2819)
@@ -7,13 +7,13 @@
<style>
.tooltip {
- background-color:#{a4jSkin.generalBackgroundColor};
+ background-color:#{richSkin.generalBackgroundColor};
border-width:3px;
padding:10px;
}
.tooltip-text {
width:350px;
- height:75px;
+ height:65px;
cursor:arrow;
border-width:2px;
text-align:center;
@@ -37,13 +37,15 @@
</rich:panel>
<rich:panel id="sample2" styleClass="tooltip-text">
<rich:toolTip followMouse="true" direction="top-right" delay="500" styleClass="tooltip" style="width:250px">
- <span>
- This tool-tip content also <strong>pre-rendered</strong> to the page.
- However, the look of this tool-tip is customized by styleClass attribute.
+ <span style="white-space:nowrap">
+ This tool-tip content also <strong>pre-rendered</strong> to the page.<br/>
+ However, the look of this tool-tip is customized<br/>
+ by styleClass attribute.
</span>
</rich:toolTip>
<p>
- This tool-tip will <b>follow mouse</b>. Also this tool-tip has a <b>delay 0.5 sec</b>, so be patient!
+ This tool-tip will <b>follow mouse</b>. Also this tool-tip has a <b>delay 0.5 sec</b>,
+ so be patient!
</p>
</rich:panel>
<h:form>
@@ -52,9 +54,10 @@
<f:facet name="defaultContent">
<strong>Wait...</strong>
</f:facet>
- <span >This tool-tip content was <strong>rendered on server</strong> </span>
+ <span style="white-space:nowrap">This tool-tip content was <strong>rendered on server</strong>
+ </span>
<h:panelGrid columns="2">
- <h:outputText value="tooltips requested:" />
+ <h:outputText style="white-space:nowrap" value="tooltips requested:" />
<h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" />
</h:panelGrid>
</rich:toolTip>
@@ -69,9 +72,9 @@
<f:facet name="defaultContent">
<strong>Wait...</strong>
</f:facet>
- <span >This tool-tip content was <strong>rendered on server</strong> </span>
+ <span style="white-space:nowrap">This tool-tip content was <strong>rendered on server</strong><br/></span>
<h:panelGrid columns="2">
- <h:outputText value="tooltips requested:" />
+ <h:outputText style="white-space:nowrap" value="tooltips requested:" />
<h:outputText value="#{toolTipData.tooltipCounter}" styleClass="tooltipData" />
</h:panelGrid>
</rich:toolTip>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2007-09-07 17:12:50 UTC (rev 2818)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/toolTip/examples/withTable.xhtml 2007-09-07 19:22:59 UTC (rev 2819)
@@ -8,7 +8,7 @@
<style>
.tooltip {
background-color:#{a4jSkin.generalBackgroundColor};
- border-width:3px;
+ border-width:1px;
padding:10px;
}
.tooltipData {
@@ -45,13 +45,13 @@
<h:outputText value="Make"/>
</f:facet>
<h:outputText id="make" value="#{vehicle.make}" >
- <rich:toolTip direction="top-right" mode="ajax" delay="1000" styleClass="tooltip" immediate="true" layout="block">
+ <rich:toolTip direction="top-right" mode="ajax" delay="30" styleClass="tooltip" immediate="true" layout="block">
<a4j:actionparam name="key" value="#{row}" assignTo="#{toolTipData.currentVehicleIndex}" />
- <f:facet name="defaultContent">
- <strong>Wait please, content is loading...</strong>
- </f:facet>
- <span>Vehicle details:</span>
- <h:panelGrid columns="2">
+
+ <h:panelGrid columns="4">
+ <f:facet name="header">
+ <h:outputText value="Vehicle details:" />
+ </f:facet>
<h:outputText value="make:" />
<h:outputText value="#{vehicle.make}" styleClass="tooltipData" />
<h:outputText value="model:" />
@@ -62,12 +62,17 @@
<h:outputText value="#{vehicle.milage}" styleClass="tooltipData" />
<h:outputText value="zip:" />
<h:outputText value="#{vehicle.zip}" styleClass="tooltipData" />
- <h:outputText value="vin:" />
- <h:outputText value="#{vehicle.vin}" styleClass="tooltipData" />
<h:outputText value="listed:" />
<h:outputText value="#{vehicle.listed}" styleClass="tooltipData" >
<f:convertDateTime dateStyle="short"/>
</h:outputText>
+ <f:facet name="footer">
+ <h:panelGroup>
+ <h:outputText value="vin: " />
+ <h:outputText value="#{vehicle.vin}" styleClass="tooltipData" />
+ </h:panelGroup>
+ </f:facet>
+
</h:panelGrid>
</rich:toolTip>
</h:outputText>
18 years, 8 months
JBoss Rich Faces SVN: r2818 - in trunk/test-applications/facelets/src/main: webapp/Effect and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ayanul
Date: 2007-09-07 13:12:50 -0400 (Fri, 07 Sep 2007)
New Revision: 2818
Modified:
trunk/test-applications/facelets/src/main/java/div/DivBean.java
trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
Log:
update
Modified: trunk/test-applications/facelets/src/main/java/div/DivBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/div/DivBean.java 2007-09-07 17:01:58 UTC (rev 2817)
+++ trunk/test-applications/facelets/src/main/java/div/DivBean.java 2007-09-07 17:12:50 UTC (rev 2818)
@@ -2,8 +2,6 @@
public class DivBean {
private String src;
- private String [] left = {"500px", "-480px"};
- private String [] top = {"300px", "-280px"};
public DivBean() {
src = "/Calendar/Calendar.xhtml";
@@ -16,20 +14,4 @@
public void setSrc(String src) {
this.src = src;
}
-
- public String[] getLeft() {
- return left;
- }
-
- public void setLeft(String[] left) {
- this.left = left;
- }
-
- public String[] getTop() {
- return top;
- }
-
- public void setTop(String[] top) {
- this.top = top;
- }
}
Modified: trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-09-07 17:01:58 UTC (rev 2817)
+++ trunk/test-applications/facelets/src/main/webapp/Effect/Effect.xhtml 2007-09-07 17:12:50 UTC (rev 2818)
@@ -1,10 +1,17 @@
<h:form xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
- xmlns:a4j="http://richfaces.org/a4j" onsubmit="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()">
+ xmlns:a4j="http://richfaces.org/a4j">
+
<rich:panel id="indexID">
+ <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink>
+
+ <f:verbatim>
+ <br />
+ </f:verbatim>
+
<h:outputText value="Menu:" />
- <h:panelGrid columns="2">
+ <h:panelGrid columns="2" >
<h:outputText value="1." />
<f:verbatim>
<span onclick="showFrm1(),hideIndexID()"><font color="blue">JSF
@@ -285,11 +292,7 @@
<rich:effect for="frm5" name="hideFrm5" type="Fade" />
<rich:effect for="frm5" name="showFrm5" type="Appear" />
- <rich:effect for="backFrmID" name="hideBackFrm" type="Fade" />
- <rich:effect for="backFrmID" name="showBackFrm" type="Appear" />
- <rich:panel id="backFrmID">
<h:commandLink value="Back" action="main"></h:commandLink>
- </rich:panel>
</h:form>
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-07 17:01:58 UTC (rev 2817)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Div.xhtml 2007-09-07 17:12:50 UTC (rev 2818)
@@ -13,17 +13,18 @@
type="text/css" />
</head>
<body>
- <div id="div_1_ID" style="position: relative; left:${divBean.left[0]}; top:${divBean.top[0]}; z-index:1;">
- <div id="div_2_ID" style="position: absolute; left:${divBean.left[1]}; top:${divBean.top[1]};">
+ <div id="div_1_ID" style="position: relative; left:600px; top:500px; z-index:1;">
+ <div id="div_2_ID" style="position: absolute; left:-580px; top:-450px;">
<ui:include src="${divBean.src}" />
</div>
</div>
- <h:form id="forvDivOpthID" style="z-index:5">
- <div id="divOpthID" style="position:relative" align="right">
+
+ <div id="divOpthID" align="right">
+ <h:form id="forvDivOpthID">
<h:panelGrid columns="2">
<h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}">
+ <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
<f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
<f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
<f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
@@ -52,34 +53,10 @@
<f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" />
<f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" />
</h:selectOneMenu>
-
- <h:commandLink value="Submit" action="submit();"></h:commandLink>
- <f:verbatim></f:verbatim>
-
- <h:outputText value="div 1 left:" />
- <h:inputText value="#{divBean.left[0]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
- <h:outputText value="div 1 top:" />
- <h:inputText value="#{divBean.top[0]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
- <h:outputText value="div 2 left:" />
- <h:inputText value="#{divBean.left[1]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
-
- <h:outputText value="div 2 top:" />
- <h:inputText value="#{divBean.top[1]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
</h:panelGrid>
<h:commandLink value="Back" action="main"></h:commandLink>
- </div>
- </h:form>
+ </h:form>
+ </div>
</body>
</f:view>
</html>
\ No newline at end of file
Modified: trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-07 17:01:58 UTC (rev 2817)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Test.xhtml 2007-09-07 17:12:50 UTC (rev 2818)
@@ -13,70 +13,43 @@
type="text/css" />
</head>
<body>
-
+ <h:form id="forvDivOpthID">
+ <h:panelGrid columns="2">
+ <h:outputText value="Select component:" />
+ <h:selectOneMenu value="#{divBean.src}" onchange="submit();">
+ <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
+ <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
+ <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
+ <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" />
+ <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" />
+ <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" />
+ <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" />
+ <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" />
+ <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" />
+ <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" />
+ <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" />
+ <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" />
+ <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" />
+ <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" />
+ <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" />
+ <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" />
+ <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" />
+ <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" />
+ <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" />
+ <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" />
+ <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" />
+ <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" />
+ <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" />
+ <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" />
+ <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" />
+ <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" />
+ <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" />
+ </h:selectOneMenu>
+ </h:panelGrid>
+ </h:form>
+
<ui:include src="${divBean.src}" />
- <h:form id="forvDivOpthID" style="z-index:5">
- <div id="divOpthID" style="position:relative" align="right">
- <h:panelGrid columns="2">
- <h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}">
- <f:selectItem itemValue="/Calendar/Calendar.xhtml" itemLabel="Calendar" />
- <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.xhtml" itemLabel="Data Filter Slider" />
- <f:selectItem itemValue="/DataScroller/DS.xhtml" itemLabel="Date Scroller" />
- <f:selectItem itemValue="/DradAndDrop/DragAndDrop.xhtml" itemLabel="Drag And Drop" />
- <f:selectItem itemValue="/DropDownMenu/DDMenu.xhtml" itemLabel="Drop Down Menu" />
- <f:selectItem itemValue="/Effect/Effect.xhtml" itemLabel="Effect" />
- <f:selectItem itemValue="/Gmap/Gmap.xhtml" itemLabel="Gmap" />
- <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.xhtml" itemLabel="Input Number Slider" />
- <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.xhtml" itemLabel="Input Number Spinner" />
- <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="Insert" />
- <f:selectItem itemValue="/Message/Message.xhtml" itemLabel="Message" />
- <f:selectItem itemValue="/ModalPanel/ModalPanel.xhtml" itemLabel="Modal Panel" />
- <f:selectItem itemValue="/Paint2D/Paint2D.xhtml" itemLabel="Paint2D" />
- <f:selectItem itemValue="/Panel/Panel.xhtml" itemLabel="Panel" />
- <f:selectItem itemValue="/Panel/panel2.xhtml" itemLabel="Panel2" />
- <f:selectItem itemValue="/PanelBar/PanelBar.xhtml" itemLabel="Panel Bar" />
- <f:selectItem itemValue="/PanelMenu/PanelMenu.xhtml" itemLabel="Panel Menu" />
- <f:selectItem itemValue="/Separator/Separator.xhtml" itemLabel="Separator" />
- <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.xhtml" itemLabel="Simple Toggle Panel" />
- <f:selectItem itemValue="/Spacer/Spacer.xhtml" itemLabel="Spacer" />
- <f:selectItem itemValue="/SuggestionBox/SuggestionBox.xhtml" itemLabel="Suggestion Box" />
- <f:selectItem itemValue="/TabPanel/TabPanel.xhtml" itemLabel="Tab Panel" />
- <f:selectItem itemValue="/TogglePanel/TogglePanel.xhtml" itemLabel="Toggle Panel" />
- <f:selectItem itemValue="/ToolBar/ToolBar.xhtml" itemLabel="Tool Bar" />
- <f:selectItem itemValue="/Tooltip/Tooltip.xhtml" itemLabel="Tooltip" />
- <f:selectItem itemValue="/Tree/Tree.xhtml" itemLabel="Tree" />
- <f:selectItem itemValue="/VirtualEarth/VirtualEarth.xhtml" itemLabel="Virtual Earth" />
- </h:selectOneMenu>
-
- <h:commandLink value="Submit" action="submit();"></h:commandLink>
- <f:verbatim></f:verbatim>
-
- <h:outputText value="div 1 left:" />
- <h:inputText value="#{divBean.left[0]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
- <h:outputText value="div 1 top:" />
- <h:inputText value="#{divBean.top[0]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
- <h:outputText value="div 2 left:" />
- <h:inputText value="#{divBean.left[1]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
-
- <h:outputText value="div 2 top:" />
- <h:inputText value="#{divBean.top[1]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
- </h:panelGrid>
- <h:commandLink value="Back" action="main"></h:commandLink>
- </div>
- </h:form>
</body>
</f:view>
</html>
\ No newline at end of file
18 years, 8 months
JBoss Rich Faces SVN: r2817 - trunk/ui/scrollableDataTable/src/main/templates/org/richfaces.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2007-09-07 13:01:58 -0400 (Fri, 07 Sep 2007)
New Revision: 2817
Modified:
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
Log:
small fix
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2007-09-07 17:01:48 UTC (rev 2816)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2007-09-07 17:01:58 UTC (rev 2817)
@@ -223,17 +223,16 @@
</jsp:scriptlet>
<f:call name="contributorsEncodeHere"/>
-
- </div>
- <script id="#{clientId}_grid_create_scripts" type="text/javascript">
+ <script id="#{clientId}_grid_create_scripts" type="text/javascript">
//<![CDATA[
#{this:getJavaScriptVarName(context, component)} = #{this:createClientScrollableGrid(context, component)};
#{this:getScriptContributions(context, component)};
-// ]]>
- </script>
- <f:call name="tearDownState"/>
+ // ]]>
+ </script>
+ <f:call name="tearDownState"/>
+ </div>
</f:root>
18 years, 8 months
JBoss Rich Faces SVN: r2816 - in trunk/ui/simpleTogglePanel/src/main: templates and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2007-09-07 13:01:48 -0400 (Fri, 07 Sep 2007)
New Revision: 2816
Modified:
trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
RF 855
Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-09-07 17:00:52 UTC (rev 2815)
+++ trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-09-07 17:01:48 UTC (rev 2816)
@@ -12,6 +12,9 @@
background-repeat : no-repeat;
}
+.dr-stglpnl-m{
+ padding-right: 3px;
+}
.dr-stglpnl-h{
border-width: 1px;
Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-09-07 17:00:52 UTC (rev 2815)
+++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-09-07 17:01:48 UTC (rev 2816)
@@ -34,7 +34,7 @@
onclick="#{this:getOnClick(context,component)}">
<div style="float: right">
- <div id="#{clientId}_switch_on" style="padding-right: 15px; display: #{this:getSwitchOnStatus(context, component)};">
+ <div id="#{clientId}_switch_on" style="display: #{this:getSwitchOnStatus(context, component)};" class="dr-stglpnl-m rich-stglpnl-marker">
<jsp:scriptlet><![CDATA[
if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) {
]]></jsp:scriptlet>
@@ -46,7 +46,7 @@
]]></jsp:scriptlet>
</div>
<div id="#{clientId}_switch_off"
- style="padding-right: 15px; display: #{this:getSwitchOffStatus(context, component)};">
+ style="display: #{this:getSwitchOffStatus(context, component)};" class="dr-stglpnl-m rich-stglpnl-marker">
<jsp:scriptlet><![CDATA[
if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) {
]]></jsp:scriptlet>
18 years, 8 months