[richfaces-svn-commits] JBoss Rich Faces SVN: r18611 - in trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo: mediaOutput and 3 other directories.

Author: ilya_shaikovsky Date: 2010-08-13 06:24:21 -0400 (Fri, 13 Aug 2010) New Revision: 18611 Removed: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/view/ Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java Log: https://jira.jboss.org/browse/RF-9030 Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -23,7 +23,6 @@ setText("RichFaces 4.0"); setColor(1000); setScale(2); - System.out.println("MediaData instantiated"); } public Integer getColor() { Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/poll/PollBean.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -15,11 +15,9 @@ */ @ManagedBean @ViewScoped -public class PollBean implements Serializable{ +public class PollBean implements Serializable { - /** - * - */ + private static final int POLL_DISABLEMENT_INTERVAL = 60000; private static final long serialVersionUID = 7871292328251171957L; private Date pollStartTime; private boolean pollEnabled; @@ -34,7 +32,7 @@ pollStartTime = new Date(); return date; } - if ((date.getTime() - pollStartTime.getTime()) >= 60000) { + if ((date.getTime() - pollStartTime.getTime()) >= POLL_DISABLEMENT_INTERVAL) { setPollEnabled(false); } return date; Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/region/RegionBean.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -3,12 +3,12 @@ import java.io.Serializable; import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import javax.faces.bean.RequestScoped; import org.richfaces.demo.common.UserBean; @ManagedBean -@ViewScoped +@RequestScoped public class RegionBean implements Serializable { /** Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java 2010-08-13 06:16:59 UTC (rev 18610) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/SlidesBean.java 2010-08-13 10:24:21 UTC (rev 18611) @@ -17,16 +17,12 @@ @ViewScoped public class SlidesBean implements Serializable{ - /** - * - */ private static final long serialVersionUID = -6498592143189891265L; private static final String FILE_EXT = ".jpg"; private static final int FILES_COUNT = 9; private static final String PATH_PREFIX = "/images/nature/"; private static final String PIC_NAME = "pic"; private List<Picture> pictures; - private int currentIndex = 1; public SlidesBean() { pictures = new ArrayList<Picture>(); @@ -35,14 +31,6 @@ } } - public int getCurrentIndex() { - return currentIndex; - } - - public void setCurrentIndex(int currentIndex) { - this.currentIndex = currentIndex; - } - public List<Picture> getPictures() { return pictures; }