You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2005/06/06 07:43:14 UTC
svn commit: r180227 - in
/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms:
formmodel/AbstractWidgetDefinition.java formmodel/Messages.java
formmodel/WidgetDefinitionList.java generation/JXMacrosHelper.java
Author: reinhard
Date: Sun Jun 5 22:43:12 2005
New Revision: 180227
URL: http://svn.apache.org/viewcvs?rev=180227&view=rev
Log:
remove unnecessarily nested statements
Modified:
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Messages.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java?rev=180227&r1=180226&r2=180227&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java Sun Jun 5 22:43:12 2005
@@ -131,9 +131,8 @@
public Object getAttribute(String name) {
if (this.attributes != null) {
return this.attributes.get(name);
- } else {
- return null;
}
+ return null;
}
protected void addCreateListener(CreateListener listener) {
@@ -214,17 +213,16 @@
// No validators
return true;
- } else {
- Iterator iter = this.validators.iterator();
- while(iter.hasNext()) {
- WidgetValidator validator = (WidgetValidator)iter.next();
- if (! validator.validate(widget)) {
- // Stop at the first validator that fails
- return false;
- }
+ }
+ Iterator iter = this.validators.iterator();
+ while(iter.hasNext()) {
+ WidgetValidator validator = (WidgetValidator)iter.next();
+ if (! validator.validate(widget)) {
+ // Stop at the first validator that fails
+ return false;
}
- // All validators were sucessful
- return true;
}
+ // All validators were sucessful
+ return true;
}
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Messages.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Messages.java?rev=180227&r1=180226&r2=180227&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Messages.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Messages.java Sun Jun 5 22:43:12 2005
@@ -59,10 +59,10 @@
}
public boolean validate() {
- if (!getCombinedState().isValidatingValues())
+ if (!getCombinedState().isValidatingValues()) {
return true;
- else
- return messages.size() == 0;
+ }
+ return messages.size() == 0;
}
/**
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java?rev=180227&r1=180226&r2=180227&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/WidgetDefinitionList.java Sun Jun 5 22:43:12 2005
@@ -112,10 +112,9 @@
String location = containerDefinition.getLocation();
if (parent instanceof FormDefinition) {
throw new Exception("Container: Non-terminating recursion detected in form definition (" + location + ")");
- } else {
- throw new Exception("Container: Non-terminating recursion detected in widget definition: "
- + parent.getId() + " (" + location + ")");
- }
+ }
+ throw new Exception("Container: Non-terminating recursion detected in widget definition: "
+ + parent.getId() + " (" + location + ")");
}
}
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java?rev=180227&r1=180226&r2=180227&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java Sun Jun 5 22:43:12 2005
@@ -122,19 +122,17 @@
if (result != null) {
return result;
- } else {
- throw new IllegalArgumentException("Widget '" + currentWidget +
- "' has no child named '" + path + "'");
}
+ throw new IllegalArgumentException("Widget '" + currentWidget +
+ "' has no child named '" + path + "'");
}
public Repeater getRepeater(Widget currentWidget, String id) {
Widget child = getWidget(currentWidget, id);
if (child instanceof Repeater) {
return (Repeater)child;
- } else {
- throw new IllegalArgumentException("Widget '" + child + "' is not a repeater");
}
+ throw new IllegalArgumentException("Widget '" + child + "' is not a repeater");
}
/**
@@ -237,9 +235,8 @@
if (result == null) {
throw new IllegalArgumentException("No class '" + id + "' has been defined.");
- } else {
- return result;
- }
+ }
+ return result;
}
public boolean isSelectedCase(Widget unionWidget, String caseValue) {