JBoss Rich Faces SVN: r10388 - branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-09-09 15:26:42 -0400 (Tue, 09 Sep 2008)
New Revision: 10388
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-4438
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2008-09-09 18:30:56 UTC (rev 10387)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2008-09-09 19:26:42 UTC (rev 10388)
@@ -10,6 +10,12 @@
.cols{
vertical-align:top;
width:50%;
+ }
+ .rich-pmenu-top-group {
+ background-color:#E4EAEF;
+ background-image:none;
+ border-color:#FFFFFF;
+ padding:0;
}
</style>
<h:form id="form">
16 years, 3 months
JBoss Rich Faces SVN: r10387 - branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-09-09 14:30:56 -0400 (Tue, 09 Sep 2008)
New Revision: 10387
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-4435
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-09-09 18:12:29 UTC (rev 10386)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/examples/topmenu.xhtml 2008-09-09 18:30:56 UTC (rev 10387)
@@ -48,10 +48,10 @@
<rich:dropDownMenu>
<f:facet name="label">
- <h:panelGrid cellpadding="0" cellspacing="0" columns="2"
- style="vertical-align:middle">
+ <h:panelGroup>
+ <rich:spacer style="width:1px;height:16px;" styleClass="pic"/>
<h:outputText value="Links" />
- </h:panelGrid>
+ </h:panelGroup>
</f:facet>
<rich:menuItem submitMode="none"
16 years, 3 months
JBoss Rich Faces SVN: r10386 - in trunk/samples/richfaces-demo/src/main: java/org/richfaces/demo/slides and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-09 14:12:29 -0400 (Tue, 09 Sep 2008)
New Revision: 10386
Added:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic9.jpg
Modified:
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java
trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java
trunk/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
trunk/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties
Log:
Demo changes merged
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2008-09-09 18:03:58 UTC (rev 10385)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2008-09-09 18:12:29 UTC (rev 10386)
@@ -10,7 +10,7 @@
private String address;
private String city;
private String zip;
- private int age;
+ private Integer age;
public UserBean() {
super();
}
@@ -80,11 +80,11 @@
this.zip = zip;
}
- public int getAge() {
+ public Integer getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(Integer age) {
this.age = age;
}
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java 2008-09-09 18:03:58 UTC (rev 10385)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java 2008-09-09 18:12:29 UTC (rev 10386)
@@ -13,7 +13,7 @@
public class SlidesBean {
private final static String FILE_EXT = ".jpg";
- private final static int FILES_COUNT = 8;
+ private final static int FILES_COUNT = 9;
private final static String PATH_PREFIX = "/richfaces/jQuery/images/";
private final static String PIC_NAME = "pic";
Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java 2008-09-09 18:03:58 UTC (rev 10385)
+++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java 2008-09-09 18:12:29 UTC (rev 10386)
@@ -26,10 +26,11 @@
@Email
@NotEmpty
private String email;
+
@NotNull
@Min(18)
@Max(100)
- private int age;
+ private Integer age;
public ValidationBean() {
}
@@ -50,11 +51,11 @@
this.email = email;
}
- public int getAge() {
+ public Integer getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(Integer age) {
this.age = age;
}
public void success() {
Modified: trunk/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
===================================================================
(Binary files differ)
Modified: trunk/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
===================================================================
(Binary files differ)
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2008-09-09 18:03:58 UTC (rev 10385)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2008-09-09 18:12:29 UTC (rev 10386)
@@ -30,6 +30,7 @@
<h:graphicImage value="/richfaces/jQuery/images/pic6.jpg" />
<h:graphicImage value="/richfaces/jQuery/images/pic7.jpg" />
<h:graphicImage value="/richfaces/jQuery/images/pic8.jpg" />
+ <h:graphicImage value="/richfaces/jQuery/images/pic9.jpg" />
</a4j:outputPanel>
<br style="clear:both" />
Copied: trunk/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic9.jpg (from rev 10385, branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic9.jpg)
===================================================================
(Binary files differ)
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-09-09 18:03:58 UTC (rev 10385)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-09-09 18:12:29 UTC (rev 10386)
@@ -8,5 +8,9 @@
1.6=pic6.jpg - leaf
1.7=pic7.jpg - leaf
1.8=pic8.jpg - leaf
+<<<<<<< .mine
+1.9=pic9.jpg - leaf
+2 = Favorites - node
+3 = Trash - node=======
2=Favorites - node - favorites.gif
-3=Trash - node - trash_full.gif - trash.gif
\ No newline at end of file
+3=Trash - node - trash_full.gif - trash.gif >>>>>>> .r10385
16 years, 3 months
JBoss Rich Faces SVN: r10385 - branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-09 14:03:58 -0400 (Tue, 09 Sep 2008)
New Revision: 10385
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
Log:
Trash images updated
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
===================================================================
(Binary files differ)
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
===================================================================
(Binary files differ)
16 years, 3 months
JBoss Rich Faces SVN: r10384 - in branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo: validation and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-09-09 13:57:23 -0400 (Tue, 09 Sep 2008)
New Revision: 10384
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java
branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java
Log:
https://jira.jboss.org/jira/browse/RF-4434
Modified: branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2008-09-09 17:36:36 UTC (rev 10383)
+++ branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/ajaxsupport/UserBean.java 2008-09-09 17:57:23 UTC (rev 10384)
@@ -10,7 +10,7 @@
private String address;
private String city;
private String zip;
- private int age;
+ private Integer age;
public UserBean() {
super();
}
@@ -80,11 +80,11 @@
this.zip = zip;
}
- public int getAge() {
+ public Integer getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(Integer age) {
this.age = age;
}
Modified: branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java 2008-09-09 17:36:36 UTC (rev 10383)
+++ branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/validation/ValidationBean.java 2008-09-09 17:57:23 UTC (rev 10384)
@@ -26,10 +26,11 @@
@Email
@NotEmpty
private String email;
+
@NotNull
@Min(18)
@Max(100)
- private int age;
+ private Integer age;
public ValidationBean() {
}
@@ -50,11 +51,11 @@
this.email = email;
}
- public int getAge() {
+ public Integer getAge() {
return age;
}
- public void setAge(int age) {
+ public void setAge(Integer age) {
this.age = age;
}
public void success() {
16 years, 3 months
JBoss Rich Faces SVN: r10383 - branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-09 13:36:36 -0400 (Tue, 09 Sep 2008)
New Revision: 10383
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java
Log:
Nineth image added
Modified: branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java 2008-09-09 17:22:44 UTC (rev 10382)
+++ branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/slides/SlidesBean.java 2008-09-09 17:36:36 UTC (rev 10383)
@@ -13,7 +13,7 @@
public class SlidesBean {
private final static String FILE_EXT = ".jpg";
- private final static int FILES_COUNT = 8;
+ private final static int FILES_COUNT = 9;
private final static String PATH_PREFIX = "/richfaces/jQuery/images/";
private final static String PIC_NAME = "pic";
16 years, 3 months
JBoss Rich Faces SVN: r10382 - in branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces: jQuery/images and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-09-09 13:22:44 -0400 (Tue, 09 Sep 2008)
New Revision: 10382
Added:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic9.jpg
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties
Log:
Nineth image added
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2008-09-09 15:14:20 UTC (rev 10381)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/examples/fishEye.xhtml 2008-09-09 17:22:44 UTC (rev 10382)
@@ -30,6 +30,7 @@
<h:graphicImage value="/richfaces/jQuery/images/pic6.jpg" />
<h:graphicImage value="/richfaces/jQuery/images/pic7.jpg" />
<h:graphicImage value="/richfaces/jQuery/images/pic8.jpg" />
+ <h:graphicImage value="/richfaces/jQuery/images/pic9.jpg" />
</a4j:outputPanel>
<br style="clear:both" />
Added: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic9.jpg
===================================================================
(Binary files differ)
Property changes on: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/jQuery/images/pic9.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-09-09 15:14:20 UTC (rev 10381)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-09-09 17:22:44 UTC (rev 10382)
@@ -8,5 +8,6 @@
1.6=pic6.jpg - leaf
1.7=pic7.jpg - leaf
1.8=pic8.jpg - leaf
+1.9=pic9.jpg - leaf
2=Favorites - node - favorites.gif
3=Trash - node - trash_full.gif - trash.gif
\ No newline at end of file
16 years, 3 months
JBoss Rich Faces SVN: r10381 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-09-09 11:14:20 -0400 (Tue, 09 Sep 2008)
New Revision: 10381
Modified:
trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
Log:
https://jira.jboss.org/jira/browse/RF-2613
APIs are corrected
Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-09-09 14:22:22 UTC (rev 10380)
+++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-09-09 15:14:20 UTC (rev 10381)
@@ -405,7 +405,7 @@
</row>
-->
<!--Controls common API -->
- <row>
+ <!--row>
<entry role="tbi">hide()</entry>
<entry role="tbi">Hides ordering control (to be implemented)</entry>
</row>
@@ -416,7 +416,7 @@
<row>
<entry role="tbi">isShown()</entry>
<entry role="tbi">Checks if current control is shown (to be implemented)</entry>
- </row>
+ </row-->
<row>
<entry role="tbi">enable()</entry>
<entry role="tbi">Enables ordering control (to be implemented)</entry>
@@ -431,19 +431,19 @@
</row>
<!--List managing API -->
<row>
- <entry role="tbi">Up()</entry>
+ <entry role="tbi">up()</entry>
<entry role="tbi">Moves up selected item in the list (to be implemented)</entry>
</row>
<row>
- <entry role="tbi">Down()</entry>
+ <entry role="tbi">down()</entry>
<entry role="tbi">Moves down selected item in the list (to be implemented)</entry>
</row>
<row>
- <entry role="tbi">Top()</entry>
+ <entry role="tbi">top()</entry>
<entry role="tbi">Moves top selected item in the list (to be implemented)</entry>
</row>
<row>
- <entry role="tbi">Bottom()</entry>
+ <entry role="tbi">bottom()</entry>
<entry role="tbi">Moves bottom selected item in the list (to be implemented)</entry>
</row>
<row>
16 years, 3 months
JBoss Rich Faces SVN: r10380 - branches/3.2.x/samples/richfaces-demo/src/main/webapp/templates/include.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-09-09 10:22:22 -0400 (Tue, 09 Sep 2008)
New Revision: 10380
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-4336
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml 2008-09-09 14:17:03 UTC (rev 10379)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml 2008-09-09 14:22:22 UTC (rev 10380)
@@ -50,13 +50,13 @@
<a4j:outputPanel id="hide2" styleClass="viewsourcelooklink" style="display:none">
<rich:effect for="hide2" event="onclick" type="BlindUp" targetId="source1" params="id:'source1', duration:1.0" />
<rich:effect for="hide2" event="onclick" type="Appear" targetId="look" params="delay:1.5, duration:0.5" />
- <rich:effect for="hide2" event="onclick" type="Fade" targetId="hide2" params="delay:0.9, duration:0.1" />
+ <rich:effect for="hide2" event="onclick" type="Fade" targetId="hide2" params="delay:0.0, duration:0.1" />
<h:outputText style="padding-right:5px" value="Hide"/>
</a4j:outputPanel>
<a4j:outputPanel styleClass="viewsourcelooklink" id="look">
<rich:effect for="look" event="onclick" type="Fade" targetId="source1" params="duration:0.0" />
- <rich:effect for="look" event="onclick" type="Fade" params="duration:0.1" />
+ <rich:effect for="look" event="onclick" type="Fade" params="duration:0.0" />
<rich:effect for="look" event="onclick" type="BlindDown" targetId="source1" params="delay:0.1,duration:1.0,from:0.0,to:1.0" />
<rich:effect for="look" event="onclick" type="Appear" targetId="source1" params="delay:0.1,duration:0.5,from:0.0,to:1.0" />
<rich:effect for="look" event="onclick" type="Appear" targetId="hide2" params="delay:1.5,duration:1.0,from:0.0,to:1.0" />
@@ -75,7 +75,7 @@
<a4j:outputPanel id="hide" styleClass="viewsourcehidelink">
<rich:effect for="hide" event="onclick" type="BlindUp" targetId="source1" params="id:'source1', duration:1.0" />
<rich:effect for="hide" event="onclick" type="Appear" targetId="look" params="delay:1.5, duration:0.5" />
- <rich:effect for="hide" event="onclick" type="Fade" targetId="hide2" params="delay:1.0, duration:0.1" />
+ <rich:effect for="hide" event="onclick" type="Fade" targetId="hide2" params="delay:0.0, duration:0.1" />
<h:outputText style="padding-right:5px" value="<<Hide Source"/>
</a4j:outputPanel>
16 years, 3 months
JBoss Rich Faces SVN: r10379 - in branches/3.2.x/samples/richfaces-demo/src/main: webapp/images/tree and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-09-09 10:17:03 -0400 (Tue, 09 Sep 2008)
New Revision: 10379
Added:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/favorites.gif
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/image.gif
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/DemoTreeNodeImpl.java
branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/SimpleTreeDndBean.java
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simpleDnd.xhtml
Log:
Modified: branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/DemoTreeNodeImpl.java
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/DemoTreeNodeImpl.java 2008-09-09 14:14:51 UTC (rev 10378)
+++ branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/DemoTreeNodeImpl.java 2008-09-09 14:17:03 UTC (rev 10379)
@@ -15,7 +15,10 @@
*/
public class DemoTreeNodeImpl<T> extends TreeNodeImpl<T>{
- private String type;
+ private String icon;
+ private String leafIcon;
+
+ private String type;
/**
* @return the type
@@ -29,6 +32,22 @@
*/
public void setType(String type) {
this.type = type;
- }
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public String getLeafIcon() {
+ return leafIcon;
+ }
+
+ public void setLeafIcon(String leafIcon) {
+ this.leafIcon = leafIcon;
+ }
}
Modified: branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/SimpleTreeDndBean.java
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/SimpleTreeDndBean.java 2008-09-09 14:14:51 UTC (rev 10378)
+++ branches/3.2.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/tree/SimpleTreeDndBean.java 2008-09-09 14:17:03 UTC (rev 10379)
@@ -52,6 +52,8 @@
private String nodeTitle;
+ private static final String ICONS_PATH = "/images/tree/dnd/";
+
private static final String DATA_PATH = "/richfaces/tree/examples/simple-tree-data-dnd.properties";
private void addNodes(String path, TreeNode node, Properties properties) {
@@ -68,6 +70,13 @@
if (splittedValue.length > 1) {
nodeImpl.setData(splittedValue[0]);
nodeImpl.setType(splittedValue[1]);
+ if (splittedValue.length>2){
+ nodeImpl.setIcon(ICONS_PATH+splittedValue[2]);
+ nodeImpl.setLeafIcon(ICONS_PATH+splittedValue[2]);
+ }
+ if (splittedValue.length>3){
+ nodeImpl.setLeafIcon(ICONS_PATH+splittedValue[3]);
+ }
node.addChild(new Integer(counter), nodeImpl);
}
addNodes(key, nodeImpl, properties);
@@ -109,7 +118,7 @@
selectedNodeChildren.clear();
TreeNode<String> currentNode = tree.getModelTreeNode(tree.getRowKey());
DemoTreeNodeImpl<String> demoCurrentNodeImpl = currentNode instanceof DemoTreeNodeImpl ? (DemoTreeNodeImpl) currentNode : null;
- if (currentNode.isLeaf() && (demoCurrentNodeImpl != null && demoCurrentNodeImpl.getType().toLowerCase().equals("leaf") || demoCurrentNodeImpl == null)) {
+ if (currentNode.isLeaf() && (demoCurrentNodeImpl != null && demoCurrentNodeImpl.getType().toLowerCase().equals("leaf") || demoCurrentNodeImpl == null )) {
selectedNodeChildren.add(currentNode);
} else {
Iterator<Map.Entry<Object, TreeNode<String>>> it = currentNode.getChildren();
@@ -148,7 +157,7 @@
UITree srcTree = srcNode != null ? srcNode.getUITree() : null;
TreeRowKey dragNodeKey = (dropEvent.getDragValue() instanceof TreeRowKey) ? (TreeRowKey) dropEvent.getDragValue() : null;
TreeNode draggedNode = dragNodeKey != null ? srcTree.getTreeNode(dragNodeKey) : null;
- if (dropEvent.getDraggableSource() instanceof UIDragSupport && srcTree == null && draggedNode == null && dropEvent.getDragValue() instanceof TreeNode) {
+ if (dropEvent.getDraggableSource() instanceof UIDragSupport && srcTree == null && draggedNode == null && dropEvent.getDragValue() instanceof TreeNode) {
srcTree = destTree;
draggedNode = (TreeNode) dropEvent.getDragValue();
dragNodeKey = srcTree.getTreeNodeRowKey(draggedNode) instanceof TreeRowKey ? (TreeRowKey) srcTree.getTreeNodeRowKey(draggedNode) : null;
@@ -184,7 +193,7 @@
}
}
} else if (dropEvent.getDragValue() != null) { // Drag from some
- // drag source
+ // drag source
draggedNode = new DemoTreeNodeImpl<String>();
draggedNode.setData(dropEvent.getDragValue().toString());
}
Added: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/favorites.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/favorites.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/image.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/image.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.2.x/samples/richfaces-demo/src/main/webapp/images/tree/dnd/trash_full.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-09-09 14:14:51 UTC (rev 10378)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-09-09 14:17:03 UTC (rev 10379)
@@ -1,5 +1,5 @@
-#path=name - type
-1=Unsorted - node
+#path=name - type - icon
+1=Unsorted - node - image.gif
1.1=pic1.jpg - leaf
1.2=pic2.jpg - leaf
1.3=pic3.jpg - leaf
@@ -8,5 +8,5 @@
1.6=pic6.jpg - leaf
1.7=pic7.jpg - leaf
1.8=pic8.jpg - leaf
-2 = Favorites - node
-3 = Trash - node
\ No newline at end of file
+2=Favorites - node - favorites.gif
+3=Trash - node - trash_full.gif - trash.gif
\ No newline at end of file
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simpleDnd.xhtml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simpleDnd.xhtml 2008-09-09 14:14:51 UTC (rev 10378)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simpleDnd.xhtml 2008-09-09 14:17:03 UTC (rev 10379)
@@ -31,7 +31,7 @@
reRender="selectedNode" ajaxSubmitSelection="true" switchType="client" dragIndicator="indicator2"
value="#{simpleTreeDndBean.treeNode}" var="item" id="tree" treeNodeVar="treeNode"
dropListener="#{simpleTreeDndBean.dropListener}" nodeFace="#{treeNode.parent.parent == null ? 'node' : 'leaf'}">
- <rich:treeNode type="node" acceptedTypes="pic">
+ <rich:treeNode type="node" acceptedTypes="pic" icon="#{treeNode.icon}" iconLeaf="#{treeNode.leafIcon}">
<h:outputText value="#{item}"/>
</rich:treeNode>
<rich:treeNode type="leaf" dragType="pic">
16 years, 3 months