You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/06/10 12:05:51 UTC
svn commit: r783277 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/config/
core/src/main/java/org/apache/myfaces/tobago/taglib/decl/
example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/
theme/scarborough/sr...
Author: lofwyr
Date: Wed Jun 10 10:05:42 2009
New Revision: 783277
URL: http://svn.apache.org/viewvc?rev=783277&view=rev
Log:
Code style
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/Salutation.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FacesConfigAnnotationVisitor.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java Wed Jun 10 10:05:42 2009
@@ -19,8 +19,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.context.Theme;
import org.apache.myfaces.tobago.context.RenderersConfig;
+import org.apache.myfaces.tobago.context.Theme;
import javax.faces.context.FacesContext;
import java.util.ArrayList;
@@ -78,7 +78,7 @@
}
} else {
int deep = 0;
- for (Map.Entry<String, Theme> entry: availableTheme.entrySet()) {
+ for (Map.Entry<String, Theme> entry : availableTheme.entrySet()) {
Theme theme = entry.getValue();
if (theme.getFallbackList().size() > deep) {
defaultTheme = theme;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasHeight.java Wed Jun 10 10:05:42 2009
@@ -20,13 +20,11 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-/**
- * $Id$
- */
public interface HasHeight {
/**
- * The height for this component.
+ * The height for this component.
*/
- @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer")
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Integer")
void setHeight(String height);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasWidth.java Wed Jun 10 10:05:42 2009
@@ -20,13 +20,11 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-/**
- * $Id$
- */
public interface HasWidth {
/**
- * The width for this component.
+ * The width for this component.
*/
- @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer")
+ @TagAttribute
+ @UIComponentTagAttribute(type = "java.lang.Integer")
void setWidth(String width);
}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/Salutation.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/Salutation.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/Salutation.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/model/Salutation.java Wed Jun 10 10:05:42 2009
@@ -40,7 +40,7 @@
}
public static Salutation getSalutation(String key) {
- for(Salutation salutation:values()) {
+ for (Salutation salutation : values()) {
if (salutation.getKey().equals(key)) {
return salutation;
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Wed Jun 10 10:05:42 2009
@@ -137,7 +137,7 @@
int currentWidth = 0;
int navigationBarWidth = getConfiguredValue(facesContext, component, "navigationBarWidth");
- for (UIComponent tab: (List<UIComponent>) component.getChildren()) {
+ for (UIComponent tab : (List<UIComponent>) component.getChildren()) {
if (tab instanceof UIPanelBase) {
if (tab.isRendered()) {
currentWidth += tabList.getWidthList().get(virtualTab);
@@ -225,7 +225,7 @@
// ensure to select a rendered tab
int index = -1;
int closestRenderedTabIndex = -1;
- for (UIComponent tab: (List<UIComponent>) tabGroup.getChildren()) {
+ for (UIComponent tab : (List<UIComponent>) tabGroup.getChildren()) {
index++;
if (tab instanceof UIPanelBase) {
if (index == activeIndex) {
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericTestBase.java Wed Jun 10 10:05:42 2009
@@ -105,11 +105,11 @@
facesContext.setViewRoot(root);
}
- public void testRelease() throws IllegalAccessException,
+ public void testRelease() throws IllegalAccessException,
NoSuchMethodException, InvocationTargetException, IOException,
- SAXException, ClassNotFoundException, InstantiationException {
- for (Tld tld:tlds){
- for (net.sf.maventaglib.checker.Tag tag:tld.getTags()) {
+ SAXException, ClassNotFoundException, InstantiationException {
+ for (Tld tld : tlds) {
+ for (net.sf.maventaglib.checker.Tag tag : tld.getTags()) {
Tag tagInstance = getTagInstance(tag);
checkRelease(tagInstance);
}
@@ -120,8 +120,8 @@
IllegalAccessException, InvocationTargetException, IOException,
SAXException, ClassNotFoundException, InstantiationException {
- for (Tld tld:tlds){
- for (net.sf.maventaglib.checker.Tag tag:tld.getTags()) {
+ for (Tld tld : tlds) {
+ for (net.sf.maventaglib.checker.Tag tag : tld.getTags()) {
Tag tagInstance = getTagInstance(tag);
TagAttribute[] attributes = tag.getAttributes();
for (TagAttribute attribute : attributes) {
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FacesConfigAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FacesConfigAnnotationVisitor.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FacesConfigAnnotationVisitor.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/FacesConfigAnnotationVisitor.java Wed Jun 10 10:05:42 2009
@@ -32,13 +32,13 @@
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.apt.annotation.Validator;
import org.codehaus.plexus.util.FileUtils;
+import org.jdom.Attribute;
import org.jdom.Comment;
import org.jdom.DocType;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
import org.jdom.Namespace;
-import org.jdom.Attribute;
import org.jdom.filter.ContentFilter;
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
@@ -272,7 +272,7 @@
}
private void applyNamespace(Element parent, Namespace namespace) {
- for (Element element:(List<Element>) parent.getChildren()) {
+ for (Element element : (List<Element>) parent.getChildren()) {
element.setNamespace(namespace);
applyNamespace(element, namespace);
}
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/TaglibAnnotationVisitor.java Wed Jun 10 10:05:42 2009
@@ -358,7 +358,7 @@
if (facets.length > 0) {
description.append("<p><b>Supported facets:</b></p>");
description.append("<dl>");
- for (Facet facet: facets) {
+ for (Facet facet : facets) {
description.append("<dt><b>");
description.append(facet.name());
description.append("</b></dt>");
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java?rev=783277&r1=783276&r2=783277&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/TagInfo.java Wed Jun 10 10:05:42 2009
@@ -17,8 +17,8 @@
* limitations under the License.
*/
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
public class TagInfo extends RendererInfo {
@@ -40,7 +40,7 @@
public PropertyInfo getBodyContent() {
if (!checkBodyContent) {
checkBodyContent = true;
- for (PropertyInfo info:properties) {
+ for (PropertyInfo info : properties) {
if (info.isBodyContent()) {
bodyContent = info;
break;