[richfaces-svn-commits] JBoss Rich Faces SVN: r18588 - in trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo: common/navigation and 4 other directories.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Thu Aug 12 09:06:32 EDT 2010
Author: ilya_shaikovsky
Date: 2010-08-12 09:06:32 -0400 (Thu, 12 Aug 2010)
New Revision: 18588
Modified:
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java
trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java
Log:
checkstyle and compiler warnings corrections
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/SkinBean.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -53,7 +53,7 @@
public String getSkin() {
String currentSkin = getViewParameter(SKIN_VIEW_PARAMETER);
- if (currentSkin != null){
+ if (currentSkin != null) {
skin = currentSkin;
}
return skin;
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -25,21 +25,20 @@
private static final String SEPARATOR = "/";
private static final String SAMPLE_PREFIX = "-sample";
private static final String SAMPLES_FOLDER = "samples/";
-
-
+
@ManagedProperty(value = "#{navigationParser.groupsList}")
private List<GroupDescriptor> groups;
private DemoDescriptor currentDemo;
private SampleDescriptor currentSample;
private String sample;
private String demo;
-
+
@PostConstruct
public void init() {
- currentDemo =null;
+ currentDemo = null;
currentSample = null;
}
-
+
public DemoDescriptor getCurrentDemo() {
String id = getViewParameter(DEMO_VIEW_PARAMETER);
if (currentDemo == null || !currentDemo.getId().equals(id)) {
@@ -84,9 +83,9 @@
GroupDescriptor group = it.next();
Iterator<DemoDescriptor> dit = group.getDemos().iterator();
while (dit.hasNext()) {
- DemoDescriptor demo = (DemoDescriptor) dit.next();
- if (demo.getId().equals(id)) {
- return demo;
+ DemoDescriptor locDemo = (DemoDescriptor) dit.next();
+ if (locDemo.getId().equals(id)) {
+ return locDemo;
}
}
}
@@ -94,7 +93,6 @@
}
public String getSampleURI() {
- DemoDescriptor currentDemo = getCurrentDemo();
FacesContext context = FacesContext.getCurrentInstance();
NavigationHandler handler = context.getApplication().getNavigationHandler();
@@ -110,21 +108,23 @@
return null;
}
-
+
/**
- * @return actual sample inclusion src
- * Consider that: 1) all the samples should be placed in "samples" subfolder of the actual sample
- * 2) all the samples pages should use the same name as main sample page with "-sample" prefix
+ * @return actual sample inclusion src Consider that: 1) all the samples should be placed in "samples" subfolder of
+ * the actual sample 2) all the samples pages should use the same name as main sample page with "-sample"
+ * prefix
*/
- public String getSampleIncludeURI(){
+ public String getSampleIncludeURI() {
String sampleURI = getSampleURI();
StringBuffer sampleURIBuffer = new StringBuffer(sampleURI);
int folderOffset = sampleURIBuffer.lastIndexOf(currentSample.getId());
- int fileNameOffset = sampleURIBuffer.lastIndexOf(currentSample.getId()) + currentSample.getId().length() + SAMPLE_PREFIX.length() + 1;
- String result = new StringBuffer(sampleURI).insert(folderOffset, SAMPLES_FOLDER).insert(fileNameOffset, SAMPLE_PREFIX).toString();
- return result;
+ int fileNameOffset = sampleURIBuffer.lastIndexOf(currentSample.getId()) + currentSample.getId().length()
+ + SAMPLE_PREFIX.length() + 1;
+ String result = new StringBuffer(sampleURI).insert(folderOffset, SAMPLES_FOLDER).insert(fileNameOffset,
+ SAMPLE_PREFIX).toString();
+ return result;
}
-
+
public List<GroupDescriptor> getGroups() {
return groups;
}
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/common/navigation/GroupDescriptor.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -11,8 +11,8 @@
private List<DemoDescriptor> demos;
- @XmlElementWrapper(name="demos")
- @XmlElement(name="demo")
+ @XmlElementWrapper(name = "demos")
+ @XmlElement(name = "demo")
public List<DemoDescriptor> getDemos() {
return demos;
}
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/components/sh/SyntaxHighlighter.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -17,19 +17,22 @@
import org.ajax4jsf.resource.ResourceNotFoundException;
@FacesComponent(value = "syntaxHighlighter")
- at ResourceDependencies( { @ResourceDependency(library = "js", name = "shCore.js"),
+ at ResourceDependencies({ @ResourceDependency(library = "js", name = "shCore.js"),
@ResourceDependency(library = "css", name = "shCore.css"),
- @ResourceDependency(library = "css", name = "shThemeDefault.css"),
+ @ResourceDependency(library = "css", name = "shThemeDefault.css"),
@ResourceDependency(library = "js", name = "shBrushJScript.js"),
@ResourceDependency(library = "js", name = "shBrushJava.js"),
@ResourceDependency(library = "js", name = "shBrushXml.js"),
@ResourceDependency(library = "js", name = "shBrushCss.js"),
- @ResourceDependency(library = "js", name = "shBrushPlain.js")})
-
-public class SyntaxHighlighter extends UIComponentBase{
+ @ResourceDependency(library = "js", name = "shBrushPlain.js") })
+public class SyntaxHighlighter extends UIComponentBase {
private static final String COMPONENT_FAMILY = "org.richfaces.SyntaxHighlighter";
private static final String DEFAULT_SOURCE_TYPE = "xhtml";
- enum propertyKeys {sourceType, src, style, styleClass};
+
+ enum propertyKeys {
+ sourceType, src, style, styleClass
+ };
+
@Override
public String getFamily() {
return COMPONENT_FAMILY;
@@ -85,7 +88,7 @@
}
public String getSourceType() {
- return (String)getStateHelper().eval(propertyKeys.sourceType, DEFAULT_SOURCE_TYPE);
+ return (String) getStateHelper().eval(propertyKeys.sourceType, DEFAULT_SOURCE_TYPE);
}
public void setSourceType(String sourceType) {
@@ -93,24 +96,26 @@
}
public String getSrc() {
- return (String)getStateHelper().eval(propertyKeys.src);
+ return (String) getStateHelper().eval(propertyKeys.src);
}
public void setSrc(String src) {
getStateHelper().put(propertyKeys.src, src);
}
+
public String getStyle() {
- return (String)getStateHelper().eval(propertyKeys.style);
+ return (String) getStateHelper().eval(propertyKeys.style);
}
public void setStyle(String style) {
getStateHelper().put(propertyKeys.style, style);
}
+
public String getStyleClass() {
- return (String)getStateHelper().eval(propertyKeys.styleClass);
+ return (String) getStateHelper().eval(propertyKeys.styleClass);
}
public void setStyleClass(String styleClass) {
getStateHelper().put(propertyKeys.styleClass, styleClass);
- }
+ }
}
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaBean.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -5,18 +5,16 @@
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-
+import javax.faces.bean.RequestScoped;
import javax.imageio.ImageIO;
@ManagedBean(name = "mediaBean")
- at SessionScoped
+ at RequestScoped
public class MediaBean {
public void paint(OutputStream out, Object data) throws IOException {
if (data instanceof MediaData) {
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-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/mediaOutput/MediaData.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -1,12 +1,12 @@
package org.richfaces.demo.mediaOutput;
+import java.io.Serializable;
+
import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.faces.bean.RequestScoped;
-import java.io.Serializable;
-
@ManagedBean(name = "mediaData")
- at SessionScoped
+ at RequestScoped
public class MediaData implements Serializable {
/**
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/outputPanel/OutputPanelBean.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -1,5 +1,9 @@
package org.richfaces.demo.outputPanel;
+/**
+ * @author Ilya Shaikovsky This bean used for outputPanel demo. It's not annotation defined because we need two
+ * instances under different names. So used faces-config.
+ */
public class OutputPanelBean {
private String text;
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsBean.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -23,7 +23,7 @@
@ManagedBean(name = "carsBean")
@SessionScoped
-public class CarsBean implements Serializable{
+public class CarsBean implements Serializable {
/**
*
*/
@@ -35,13 +35,13 @@
public List<SelectItem> getVendorOptions() {
List<SelectItem> result = new ArrayList<SelectItem>();
- result.add(new SelectItem("",""));
+ result.add(new SelectItem("", ""));
for (InventoryVendorList vendorList : getInventoryVendorLists()) {
result.add(new SelectItem(vendorList.getVendor()));
}
return result;
}
-
+
public List<String> getAllVendors() {
List<String> result = new ArrayList<String>();
for (InventoryVendorList vendorList : getInventoryVendorLists()) {
@@ -58,7 +58,7 @@
Collections.sort(inventoryItems, new Comparator<InventoryItem>() {
public int compare(InventoryItem o1, InventoryItem o2) {
- return o1.getVendor().compareTo(o2.getVendor());
+ return o1.getVendor().compareTo(o2.getVendor());
}
});
Iterator<InventoryItem> iterator = inventoryItems.iterator();
Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java
===================================================================
--- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java 2010-08-12 12:44:43 UTC (rev 18587)
+++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java 2010-08-12 13:06:32 UTC (rev 18588)
@@ -23,14 +23,15 @@
return new Filter<InventoryItem>() {
public boolean accept(InventoryItem item) {
Long mileage = getMileageFilter();
- if (mileage == null || mileage==0 || mileage.compareTo(item.getMileage().longValue()) >= 0) {
+ if (mileage == null || mileage == 0 || mileage.compareTo(item.getMileage().longValue()) >= 0) {
return true;
}
return false;
}
};
}
- public Filter<?> getFilterVendor(){
+
+ public Filter<?> getFilterVendor() {
return new Filter<InventoryItem>() {
public boolean accept(InventoryItem t) {
String vendor = getVendorFilter();
More information about the richfaces-svn-commits
mailing list