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