JBoss Rich Faces SVN: r2347 - in trunk/test-applications/facelets/src/main: webapp/PanelMenu and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-20 10:59:29 -0400 (Mon, 20 Aug 2007)
New Revision: 2347
Modified:
trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java
trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-640
Modified: trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-08-20 14:46:16 UTC (rev 2346)
+++ trunk/test-applications/facelets/src/main/java/panelMenu/PanelMenu.java 2007-08-20 14:59:29 UTC (rev 2347)
@@ -7,7 +7,6 @@
private Icon icon;
private String width;
private String mode;
- private String mode2;
private String align;
private String rendered;
private String iconItemPosition;
@@ -16,13 +15,13 @@
private String iconGroupTopPosition;
private String tabIndex;
private String expandMode;
+ private String inputText;
private boolean disabled;
private boolean expandSingle;
public PanelMenu() {
width = "500px";
mode = "none";
- mode2 = "none";
align = "";
rendered = "true";
disabled = false;
@@ -98,14 +97,6 @@
this.iconItemTopPosition = iconItemTopPosition;
}
- public String getMode2() {
- return mode2;
- }
-
- public void setMode2(String mode2) {
- this.mode2 = mode2;
- }
-
public String getMode() {
return mode;
}
@@ -129,4 +120,12 @@
public void setExpandMode(String expandMode) {
this.expandMode = expandMode;
}
+
+ public String getInputText() {
+ return inputText;
+ }
+
+ public void setInputText(String inputText) {
+ this.inputText = inputText;
+ }
}
Modified: trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-08-20 14:46:16 UTC (rev 2346)
+++ trunk/test-applications/facelets/src/main/webapp/PanelMenu/PanelMenu.xhtml 2007-08-20 14:59:29 UTC (rev 2347)
@@ -44,65 +44,65 @@
iconItemTopPosition="#{panelMenu.iconItemTopPosition}"
styleClass="sPanel">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
<rich:panelMenuItem disabled="true"
iconDisabled="/pics/ajax_stoped.gif">
<h:outputText value="Disabled Item" />
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item Image">
+ <rich:panelMenuItem label="Item Image">
<h:graphicImage value="/pics/item.png"></h:graphicImage>
</rich:panelMenuItem>
<rich:panelMenuItem>
<h:outputText value="Item4" />
</rich:panelMenuItem>
- <rich:panelMenuItem value="CheckBox">
+ <rich:panelMenuItem label="CheckBox">
<h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox>
</rich:panelMenuItem>
<rich:panelMenuItem>
<h:outputText value="CheckBox 2"></h:outputText>
<h:selectBooleanCheckbox value="false"></h:selectBooleanCheckbox>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Action"
+ <rich:panelMenuItem label="Action"
onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1 (align)"
align="#{panelMenu.align}">
- <rich:panelMenuItem value="Item 1" disabled="true"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 1 (action)"
+ <rich:panelMenuItem label="Item 1" disabled="true"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1 (action)"
onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1_1 (align)"
align="#{panelMenu.align}">
- <rich:panelMenuItem value="Imem 1_1">
- <h:inputText value="text"></h:inputText>
+ <rich:panelMenuItem label="Imem 1_1">
+ <h:inputText value="#{panelMenu.inputText}"></h:inputText>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item 1_2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_2"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group 1_1_1 (align)"
align="#{panelMenu.align}">
- <rich:panelMenuItem value="Item 1 (action)"
+ <rich:panelMenuItem label="Item 1 (action)"
onmousedown="alert('OnMouseDown');"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_1_2">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 4"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 4"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_2 (disabled, action)"
disabled="true" onmousedown="alert('Disabled');">
- <rich:panelMenuItem value="Item 1_2_1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_2_1"></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_3">
- <rich:panelMenuItem value="Item 1_3_1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 1_3_1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1_3_1"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group disabled" disabled="true">
</rich:panelMenuGroup>
@@ -110,32 +110,29 @@
</rich:panelMenuGroup>
- <rich:panelMenuGroup label="Group 2 (mode 2)"
- mode="#{panelMenu.mode2}">
- <rich:panelMenuItem value="Item 2_1"></rich:panelMenuItem>
+ <rich:panelMenuGroup label="Group 2 ">
+ <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem>
- <rich:panelMenuGroup label="Group 2_2 (mode 2)"
- mode="#{panelMenu.mode2}">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuGroup label="Group 2_2">
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuGroup label="Group 3 (mode 2)"
- mode="#{panelMenu.mode2}">
- <rich:panelMenuItem value="Item 3_1">
+ <rich:panelMenuGroup label="Group 3">
+ <rich:panelMenuItem label="Item 3_1">
<br />
text <br />
text <br />
text
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3_2">
+ <rich:panelMenuItem label="Item 3_2">
<h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage>
</rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3_3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3_3"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenu>
@@ -160,8 +157,8 @@
tabindex="#{panelMenu.tabIndex}">
<rich:panelMenuGroup label="Group 1_1_1 (tabIndex)"
tabindex="#{panelMenu.tabIndex}">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenuGroup>
@@ -169,49 +166,49 @@
tabindex="#{panelMenu.tabIndex}">
<rich:panelMenuGroup label="Group 1_2_1 (tabIndex)"
tabindex="#{panelMenu.tabIndex}">
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (iconDisabled)"
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (iconDisabled)"
iconDisabled="#{icon.iconHeader}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (icon)" disabled="true"
+ <rich:panelMenuItem label="Item (icon)" disabled="true"
icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (iconDisabled)" disabled="true"
+ <rich:panelMenuItem label="Item (iconDisabled)" disabled="true"
iconDisabled="#{icon.iconItem}"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item "></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item "></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}"
iconCollapsed="#{icon.iconCollapse}"
iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3"></rich:panelMenuItem>
</rich:panelMenuGroup>
<!-- triangleUp triangle triangleDown disc chevron chevronUp chevronDown grid -->
- <rich:panelMenuItem value="Item (disc)" icon="disc"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (grid)" icon="grid"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem>
<rich:panelMenuGroup label="Group" iconCollapsed="triangleDown"
iconExpanded="triangleUp" iconDisabled="triangle">
<rich:panelMenuGroup label="Group" iconCollapsed="chevronDown"
iconExpanded="chevronUp" iconDisabled="chevron">
- <rich:panelMenuItem value="Item (disc)" icon="disc"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (grid)" iconDisabled="grid"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (grid)" icon="grid"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (disc)" iconDisabled="disc"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (disc)" icon="disc"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (grid)" iconDisabled="grid"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (grid)" icon="grid"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (disc)" iconDisabled="disc"></rich:panelMenuItem>
</rich:panelMenuGroup>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item "></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item (icon)" icon="#{icon.iconItem}"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item "></rich:panelMenuItem>
</rich:panelMenuGroup>
<rich:panelMenuGroup label="Group 1_3" iconCollapsed="chevronDown"
iconExpanded="chevronUp" iconDisabled="chevron">
- <rich:panelMenuItem value="Item 1"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 2"></rich:panelMenuItem>
- <rich:panelMenuItem value="Item 3"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 1"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 2"></rich:panelMenuItem>
+ <rich:panelMenuItem label="Item 3"></rich:panelMenuItem>
</rich:panelMenuGroup>
</rich:panelMenuGroup>
</rich:panelMenu>
@@ -248,15 +245,6 @@
<a4j:support event="onclick" reRender="panelMenuID,Mode2ID"></a4j:support>
</h:selectOneRadio>
- <h:outputText value="Mode 2"></h:outputText>
- <h:selectOneRadio value="#{panelMenu.mode2}" id="Mode2ID"
- onchange="submit();">
- <f:selectItem itemLabel="none" itemValue="none" />
- <f:selectItem itemLabel="ajax" itemValue="ajax" />
- <f:selectItem itemLabel="server" itemValue="server" />
- <a4j:support event="onclick" reRender="panelMenuID,Mode1ID"></a4j:support>
- </h:selectOneRadio>
-
<h:outputText value="Expand mode"></h:outputText>
<h:selectBooleanCheckbox value="#{panelMenu.expandMode}"></h:selectBooleanCheckbox>
18 years, 8 months
JBoss Rich Faces SVN: r2346 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-20 10:46:16 -0400 (Mon, 20 Aug 2007)
New Revision: 2346
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml
Log:
http://jira.jboss.com/jira/browse/RF-398
some spelling mistakes were corrected
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml 2007-08-20 14:44:39 UTC (rev 2345)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCsetwebappl.xml 2007-08-20 14:46:16 UTC (rev 2346)
@@ -14,7 +14,7 @@
<title>Settings for different environments</title>
<para>Ajax4jsf comes with support for all tags (components) included in the
- JavaServer Faces specification. To add Ajax4jsf capabilities to an existing
+ JavaServer Faces specification. To add Ajax4jsf capabilities to the existing
JSF project you should just put the Ajax4jsf libraries into the lib folder of
the project and add filter mapping. The behavior of the existing project
doesn't change just because of Ajax4jsf.</para>
18 years, 8 months
JBoss Rich Faces SVN: r2345 - in trunk: samples/tree-demo/src/main/webapp/pages and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-20 10:44:39 -0400 (Mon, 20 Aug 2007)
New Revision: 2345
Modified:
trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
trunk/samples/tree-demo/src/main/webapp/pages/index.jsp
trunk/ui/tree/src/main/config/component/tree.xml
trunk/ui/tree/src/main/config/component/treeNode.xml
trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
trunk/ui/tree/src/main/templates/htmlTree.jspx
Log:
http://jira.jboss.com/jira/browse/RF-630 fixed, test app updated
Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2007-08-20 14:44:39 UTC (rev 2345)
@@ -29,6 +29,7 @@
import java.util.Set;
import javax.faces.FacesException;
+import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.FacesEvent;
@@ -67,7 +68,13 @@
private String icon = null;
private String styleClass = "treeIcon16";
+
+ private static final byte MODE_DEFAULT = 1;
+ private static final byte MODE_LITERAL = 2;
+ private static final byte MODE_EL = 3;
+ private byte dndValueMode = MODE_DEFAULT;
+
private boolean renderFacets = false;
private String pathToExpand;
@@ -299,8 +306,14 @@
System.out.println(dropEvent);
System.out.println("DragValue: " + dropEvent.getDragValue());
System.out.println("DropValue: " + dropEvent.getDropValue());
- System.out.println("Drag row data: " + getTree(dropEvent).getRowData(dropEvent.getDragValue()));
- System.out.println("Drop row data: " + getTree(dropEvent).getRowData(dropEvent.getDropValue()));
+ if (dropEvent.getDragValue() instanceof TreeRowKey) {
+ System.out.println("Drag row data: " + getTree(dropEvent).getRowData(dropEvent.getDragValue()));
+ }
+
+ if (dropEvent.getDropValue() instanceof TreeRowKey) {
+ System.out.println("Drop row data: " + getTree(dropEvent).getRowData(dropEvent.getDropValue()));
+ }
+
System.out.println("+++++");
}
@@ -381,4 +394,39 @@
public void setRenderFacets(boolean renderFacets) {
this.renderFacets = renderFacets;
}
+
+ public byte getDndValueMode() {
+ return dndValueMode;
+ }
+
+ public void setDndValueMode(byte dndValueMode) {
+ this.dndValueMode = dndValueMode;
+ switch (dndValueMode) {
+ case MODE_DEFAULT:
+ this.tree.setValueBinding("dragValue", null);
+ this.tree.setValueBinding("dropValue", null);
+ this.tree.setDragValue(null);
+ this.tree.setDropValue(null);
+ break;
+
+ case MODE_LITERAL:
+ this.tree.setValueBinding("dragValue", null);
+ this.tree.setValueBinding("dropValue", null);
+ this.tree.setDragValue("dragValue");
+ this.tree.setDropValue("dropValue");
+ break;
+
+ case MODE_EL:
+ FacesContext context = FacesContext.getCurrentInstance();
+ Application application = context.getApplication();
+ this.tree.setValueBinding("dragValue", application.createValueBinding("#{data.name}"));
+ this.tree.setValueBinding("dropValue", application.createValueBinding("#{data.name}"));
+ this.tree.setDragValue(null);
+ this.tree.setDropValue(null);
+ break;
+
+ default:
+ break;
+ }
+ }
}
\ No newline at end of file
Modified: trunk/samples/tree-demo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/tree-demo/src/main/webapp/pages/index.jsp 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/samples/tree-demo/src/main/webapp/pages/index.jsp 2007-08-20 14:44:39 UTC (rev 2345)
@@ -87,6 +87,13 @@
<f:selectItem itemLabel="32x32" itemValue="treeIcon32" />
</h:selectOneRadio>
+ <h:outputText value="DnD value:" />
+ <h:selectOneRadio value="#{bean.dndValueMode}" onclick="submit()">
+ <f:selectItem itemLabel="default" itemValue="#{1}" />
+ <f:selectItem itemLabel="literal" itemValue="#{2}" />
+ <f:selectItem itemLabel="el" itemValue="#{3}" />
+ </h:selectOneRadio>
+
<h:outputText value="Drag is: #{bean.dragOn ? 'on' : 'off'}" />
<br />
<h:commandButton value="#{bean.commandButtonCaption}"
Modified: trunk/ui/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/tree.xml 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/config/component/tree.xml 2007-08-20 14:44:39 UTC (rev 2345)
@@ -189,12 +189,16 @@
</property>
- <property hidden="true">
+ <property>
<name>dragValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getRowKey()</defaultvalue>
</property>
- <property hidden="true">
+ <property>
<name>dropValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getRowKey()</defaultvalue>
</property>
<property>
Modified: trunk/ui/tree/src/main/config/component/treeNode.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/treeNode.xml 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/config/component/treeNode.xml 2007-08-20 14:44:39 UTC (rev 2345)
@@ -100,12 +100,16 @@
</property>
&commonTreeClientListeners;
- <property hidden="true">
+ <property>
<name>dragValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getUITree().getDragValue()</defaultvalue>
</property>
- <property hidden="true">
+ <property>
<name>dropValue</name>
+ <classname>java.lang.Object</classname>
+ <defaultvalue>getUITree().getDropValue()</defaultvalue>
</property>
&html_events;
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2007-08-20 14:44:39 UTC (rev 2345)
@@ -675,14 +675,6 @@
return (NodeSelectedListener[]) getFacesListeners(NodeSelectedListener.class);
}
- public Object getDragValue() {
- return getRowKey();
- }
-
- public Object getDropValue() {
- return getRowKey();
- }
-
public void addDropListener(DropListener listener) {
addFacesListener(listener);
}
@@ -707,16 +699,6 @@
removeFacesListener(listener);
}
- public void setDragValue(Object value) {
- // TODO Auto-generated method stub
-
- }
-
- public void setDropValue(Object o) {
- // TODO Auto-generated method stub
-
- }
-
/**
* Return the data object representing the node data for the contextual row key
*
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2007-08-20 14:44:39 UTC (rev 2345)
@@ -207,24 +207,6 @@
return map;
}
- public Object getDragValue() {
- return getUITree().getDragValue();
- }
-
- public void setDragValue(Object value) {
- // TODO Auto-generated method stub
-
- }
-
- public Object getDropValue() {
- return getUITree().getDropValue();
- }
-
- public void setDropValue(Object o) {
- // TODO Auto-generated method stub
-
- }
-
public void setAcceptedTypes(Object types) {
this.acceptedTypes = types;
}
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2007-08-20 14:44:39 UTC (rev 2345)
@@ -322,20 +322,4 @@
mergeScriptOptions(options, context, component, Dropzone.class);
return ScriptUtils.toScript(options);
}
-
- public void contributorDecodeCallback(UIComponent component,
- FacesContext context, RendererContributor contributor,
- Object argument) {
- super.contributorDecodeCallback(component, context, contributor,
- argument);
-
- if (Draggable.class.isAssignableFrom(contributor.getAcceptableClass())) {
- UITreeNode treeNode = (UITreeNode) component;
- treeNode.setDragValue(treeNode.getUITree().getRowKey());
- } else if (Dropzone.class.isAssignableFrom(contributor
- .getAcceptableClass())) {
- UITreeNode treeNode = (UITreeNode) component;
- treeNode.setDropValue(treeNode.getUITree().getRowKey());
- }
- }
}
Modified: trunk/ui/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-20 14:44:09 UTC (rev 2344)
+++ trunk/ui/tree/src/main/templates/htmlTree.jspx 2007-08-20 14:44:39 UTC (rev 2345)
@@ -44,15 +44,6 @@
<f:parameter value="id,style,class"/>
</f:call>
- <!-- table width="100%" cellpadding="0" cellspacing="0" border="0">
- <tbody>
- <vcp:body />
- </tbody>
- </table-->
- <!-- div id="#{clientId}:children">
- <vcp:body />
- </div -->
-
<vcp:body />
<f:call name="encodeSelectionStateInput" />
18 years, 8 months
JBoss Rich Faces SVN: r2344 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-08-20 10:44:09 -0400 (Mon, 20 Aug 2007)
New Revision: 2344
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCintro.xml
Log:
http://jira.jboss.com/jira/browse/RF-537
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCintro.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCintro.xml 2007-08-20 14:41:16 UTC (rev 2343)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCintro.xml 2007-08-20 14:44:09 UTC (rev 2344)
@@ -17,24 +17,35 @@
<title>Introduction</title>
- <para><application>RichFaces</application> is a library for adding rich user
- interface features to JSF applications. It extends the <application><ulink
- url="http://www.jboss.org/projects/jbossajax4jsf">Ajax4jsf</ulink></application>
- framework to include a large (and growing) set of powerful rich AJAX-enabled
- components that come with extensive skins support.</para>
+<para>Rich Faces is an open source framework that adds Ajax capability into existing JSF applications without resorting to JavaScript. </para>
- <para><application>RichFaces</application> components enable the easy integration
- of AJAX-based <quote>richness</quote> into business application development.
- Because the components come ready to use out-of-the-box, you can take
- advantage of them quickly. In addition, <application>RichFaces</application>
- components are designed to be used seamlessly with other 3d-party component
- libraries on the same page, so you have more options in how you develop
- applications.</para>
+<para>Rich Faces leverages JavaServer Faces framework including lifecycle, validation, conversion facilities and management of static and dynamic resources. Rich Faces components with built-in Ajax support and a highly customizable look-and-feel can be easily incorporated into JSF applications. </para>
- <para><application>RichFaces</application> skins enable greater flexibility in
- developing the visual appearance of business applications.
- <application>RichFaces</application> comes with a number of predefined skins to
- get you started, but you can also easily create your own custom skins. Also,
- during application run-time, skins and skin parameters can be changed
- programmatically.</para>
+<para>Rich Faces allows to:</para>
+
+ <itemizedlist>
+<listitem>
+<para>Intensify the whole set of JSF benefits while working with Ajax. Rich Faces is fully integrated into the JSF lifecycle. While other frameworks only give you access to the managed bean facility, Rich Faces advantages the action and value change listeners, as well as invokes server-side validators and converters during the Ajax request-response cycle. </para></listitem>
+
+<listitem><para>Add Ajax capability to the existing JSF applications. Framework provides two components libraries (Core Ajax and UI). The Core library sets Ajax functionality into existing pages, so there is no need to write any JavaScript code or to replace existing components with new Ajax ones. Rich Faces enables page-wide Ajax support instead of the traditional component-wide support and it gives the opportunity to define the event on the page. An event invokes an Ajax request and areas of the page which become synchronized with the JSF Component Tree after changing the data on the server by Ajax request in accordance with events fired on the client. </para></listitem>
+
+<listitem><para>Create quickly complex View basing on out of the box components. Rich Faces UI library contains components for adding rich user interface features to JSF applications. It extends the Rich Faces framework to include a large (and growing) set of powerful rich Ajax-enabled components that come with extensive skins support. In addition, RichFaces components are designed to be used seamlessly with other 3d-party component libraries on the same page, so you have more options for developing your applications.</para></listitem>
+
+<listitem><para>Write your own custom rich components with built-in Ajax support. We're always working on improvement of Component Development Kit (CDK) that was used for Rich Faces UI library creation. The CDK includes a code-generation facility and a templating facility using a JSP-like syntax. These capabilities help to avoid a routine process of a component creation. The component factory works like a well-oiled machine allowing the creation of first-class rich components with built-in Ajax functionality even more easily than the creation of simpler components by means of the traditional coding approach. </para></listitem>
+
+<listitem><para>Package resources with application Java classes. In addition to its core, Ajax functionality of Rich Faces provides an advanced support for the different resources management: pictures, JavaScript code, and CSS stylesheets. The resource framework makes possible to pack easily these resources into Jar files along with the code of your custom components.</para></listitem>
+
+<listitem><para>Easily generate binary resources on-the-fly. Resource framework can generate images, sounds, Excel spreadsheets etc.. on-the-fly so that it becomes for example possible to create images using the familiar approach of the "Java Graphics2D" library.</para></listitem>
+
+<listitem><para>Create a modern rich user interface look-and-feel with skins-based technology. Rich Faces provides a skinnability feature that allows easily define and manage different color schemes and other parameters of the UI with the help of named skin parameters. Hence, it is possible to access the skin parameters from JSP code and the Java code (e.g. to adjust generated on-the-fly images based on the text parts of the UI). RichFaces comes with a number of predefined skins to get you started, but you can also easily create your own custom skins. </para></listitem>
+
+<note>
+<title>Note:</title>
+<para>skinnability is not an equivalent of traditional CSS, but a complement.</para>
+</note>
+
+<listitem><para>Test and create the components, actions, listeners, and pages at the same time. An automated testing facility is in our roadmap for the near future. This facility will generate test cases for your component as soon as you develop it. The testing framework will not just test the components, but also any other server-side or client-side functionality including JavaScript code. What is more, it will do all of this without deploying the test application into the Servlet container. </para></listitem>
+</itemizedlist>
+
+<para>Rich Faces UI components come ready to use out-of-the-box, so developers save their time and immediately gain the advantage of the mentioned above features in Web applications creation. As a result, usage experience can be faster and easily obtained.</para>
</chapter>
\ No newline at end of file
18 years, 8 months
JBoss Rich Faces SVN: r2343 - trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-20 10:41:16 -0400 (Mon, 20 Aug 2007)
New Revision: 2343
Modified:
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
Log:
Imports optimized
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-08-20 14:40:40 UTC (rev 2342)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DraggableRendererContributor.java 2007-08-20 14:41:16 UTC (rev 2343)
@@ -24,17 +24,16 @@
import java.util.HashMap;
import java.util.Map;
-import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.event.FacesEvent;
import org.ajax4jsf.javascript.DnDScript;
+import org.ajax4jsf.javascript.PrototypeScript;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.component.Draggable;
import org.richfaces.component.Dropzone;
import org.richfaces.event.DragEvent;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.javascript.PrototypeScript;
import org.richfaces.renderkit.DnDEventsExchangeMailer.EventCallback;
/**
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-08-20 14:40:40 UTC (rev 2342)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DropzoneRendererContributor.java 2007-08-20 14:41:16 UTC (rev 2343)
@@ -29,15 +29,15 @@
import javax.faces.event.FacesEvent;
import org.ajax4jsf.javascript.DnDScript;
-import org.richfaces.component.Draggable;
-import org.richfaces.component.Dropzone;
-import org.richfaces.event.DropEvent;
-import org.ajax4jsf.renderkit.AjaxRendererUtils;
-import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.javascript.ScriptUtils;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.richfaces.component.Draggable;
+import org.richfaces.component.Dropzone;
+import org.richfaces.event.DropEvent;
import org.richfaces.json.JSONCollection;
import org.richfaces.json.JSONException;
import org.richfaces.json.JSONMap;
18 years, 8 months
JBoss Rich Faces SVN: r2342 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-08-20 10:40:40 -0400 (Mon, 20 Aug 2007)
New Revision: 2342
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java
Log:
ListRowKey copy constructor made public
Modified: trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java 2007-08-20 14:35:36 UTC (rev 2341)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ListRowKey.java 2007-08-20 14:40:40 UTC (rev 2342)
@@ -55,7 +55,7 @@
* Copy constructor
* @param parentRowKey row key to clone
*/
- protected ListRowKey(ListRowKey parentRowKey) {
+ public ListRowKey(ListRowKey parentRowKey) {
super();
if (parentRowKey != null) {
this.path = (ArrayList) parentRowKey.path.clone();
18 years, 8 months
JBoss Rich Faces SVN: r2341 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-08-20 10:35:36 -0400 (Mon, 20 Aug 2007)
New Revision: 2341
Modified:
trunk/docs/userguide/en/src/main/docbook/included/insert.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/insert.xml
Log:
http://jira.jboss.com/jira/browse/RF-391
http://jira.jboss.com/jira/browse/RF-389
Modified: trunk/docs/userguide/en/src/main/docbook/included/insert.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/insert.desc.xml 2007-08-20 13:56:59 UTC (rev 2340)
+++ trunk/docs/userguide/en/src/main/docbook/included/insert.desc.xml 2007-08-20 14:35:36 UTC (rev 2341)
@@ -8,13 +8,13 @@
<section>
<para>The <emphasis role="bold">
<property><rich:insert></property>
- </emphasis> component is used for syntax highlighting.</para>
+ </emphasis> component is used for source code inserting and highlighting.</para>
</section>
<section>
<title>Key Features</title>
<itemizedlist>
<listitem>Source code highlighting</listitem>
- <listitem>Variety of formats for source code representation</listitem>
+ <listitem>Variety of formats for source code highlighting</listitem>
</itemizedlist>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/insert.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/insert.xml 2007-08-20 13:56:59 UTC (rev 2340)
+++ trunk/docs/userguide/en/src/main/docbook/included/insert.xml 2007-08-20 14:35:36 UTC (rev 2341)
@@ -85,7 +85,12 @@
<property>"src"</property>
</emphasis> attribute defines the path to the file with source code. The <emphasis>
<property>"highlight"</property>
- </emphasis> attribute defines a language.</para>
+ </emphasis> attribute defines a type of code.</para>
+ <para>If <emphasis>
+ <property>"highlight"</property>
+ </emphasis> attribute is defined and <ulink url="https://jhighlight.dev.java.net/">
+ JHighlight</ulink> open source library is in the classpath, the text from the file will be
+ formated and colorized.</para>
<para>An example is placed below.</para>
<para>
<emphasis role="bold">Example:</emphasis>
18 years, 8 months
JBoss Rich Faces SVN: r2340 - trunk/ui/message/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-20 09:56:59 -0400 (Mon, 20 Aug 2007)
New Revision: 2340
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
Log:
fix RF-632
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-08-20 13:21:59 UTC (rev 2339)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-08-20 13:56:59 UTC (rev 2340)
@@ -125,11 +125,11 @@
String parentStyle = (String)uiMsg.getAttributes().get("style");
String parentClass = (String)uiMsg.getAttributes().get("styleClass");
- String richMessageClass = "rich-message" + (null != outerClass ? (outerClass + " ") : "");
- String richMessageStyle = (null != outerStyle ? outerStyle + " ," : "");
+ String richMessageClass = "rich-message" + (null != outerClass ? " " + outerClass : "");
+ String richMessageStyle = (null != outerStyle ? outerStyle + "," : "");
parentStyle = parentStyle != null ? (richMessageStyle + parentStyle) : richMessageStyle;
- parentClass = parentClass != null ? (richMessageClass + parentClass) : richMessageClass;
+ parentClass = parentClass != null ? (richMessageClass + " " + parentClass) : richMessageClass;
getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, parentClass);
getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, parentStyle);
18 years, 8 months
JBoss Rich Faces SVN: r2339 - trunk/ui/message/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-20 09:21:59 -0400 (Mon, 20 Aug 2007)
New Revision: 2339
Modified:
trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
Log:
fix RF-615
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-08-20 13:12:14 UTC (rev 2338)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-08-20 13:21:59 UTC (rev 2339)
@@ -35,16 +35,22 @@
Iterator msgIter = null;
- if(forClientId != null && forClientId.length() != 0){
+ if(forClientId != null){
- UIComponent result = findForComponent(context, forClientId,component);
- if (result == null) {
- msgIter = CollectionUtils.EMPTY_COLLECTION.iterator();
- } else {
- msgIter = context.getMessages(result.getClientId(context));
+ if(forClientId.length() != 0){
+
+ UIComponent result = findForComponent(context, forClientId,component);
+ if (result == null) {
+ msgIter = CollectionUtils.EMPTY_COLLECTION.iterator();
+ } else {
+ msgIter = context.getMessages(result.getClientId(context));
+ }
+
+ }else{
+ msgIter = context.getMessages(null);
}
+
}else{
- msgIter = context.getMessages(null);
msgIter = context.getMessages();
}
18 years, 8 months
JBoss Rich Faces SVN: r2338 - trunk/samples/scrollableDataTableDemo.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-08-20 09:12:14 -0400 (Mon, 20 Aug 2007)
New Revision: 2338
Modified:
trunk/samples/scrollableDataTableDemo/pom.xml
Log:
http://jira.jboss.com/jira/browse/RF-588
Modified: trunk/samples/scrollableDataTableDemo/pom.xml
===================================================================
--- trunk/samples/scrollableDataTableDemo/pom.xml 2007-08-20 13:10:48 UTC (rev 2337)
+++ trunk/samples/scrollableDataTableDemo/pom.xml 2007-08-20 13:12:14 UTC (rev 2338)
@@ -36,7 +36,7 @@
</dependencies>
<build>
- <finalName>scrollable-grid-demo</finalName>
+ <finalName>scrollableDataTabeDemo</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
18 years, 8 months