You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2005/12/31 23:04:02 UTC
svn commit: r360453 - in /cocoon:
blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/
blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/
blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/
blocks/forms/trunk/java/...
Author: antonio
Date: Sat Dec 31 14:03:43 2005
New Revision: 360453
URL: http://svn.apache.org/viewcvs?rev=360453&view=rev
Log:
Clean up: Fix typos, remove unused imports and Use String.length() == 0 instead of String.equals("")
Modified:
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertorBuilder.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/Icu4jDateConvertorBuilder.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeModelDefinitionBuilder.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/DomHelper.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/RepeaterAsList.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/XMLAdapter.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/xml/NamespacesTableTestCase.java
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertorBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertorBuilder.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertorBuilder.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDateConvertorBuilder.java Sat Dec 31 14:03:43 2005
@@ -77,9 +77,9 @@
for (int i = 0; i < patternEl.length; i++) {
String locale = patternEl[i].getAttribute("locale");
String pattern = DomHelper.getElementText(patternEl[i]);
- if (pattern.equals(""))
+ if (pattern.length() == 0)
throw new Exception("pattern element does not contain any content at " + DomHelper.getLocation(patternEl[i]));
- if (locale.equals(""))
+ if (locale.length() == 0)
convertor.setNonLocalizedPattern(pattern);
else {
Locale loc = I18nUtils.parseLocale(locale);
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/FormattingDecimalConvertorBuilder.java Sat Dec 31 14:03:43 2005
@@ -54,9 +54,9 @@
for (int i = 0; i < patternEl.length; i++) {
String locale = patternEl[i].getAttribute("locale");
String pattern = DomHelper.getElementText(patternEl[i]);
- if (pattern.equals(""))
+ if (pattern.length() == 0)
throw new Exception("pattern element does not contain any content at " + DomHelper.getLocation(patternEl[i]));
- if (locale.equals(""))
+ if (locale.length() == 0)
convertor.setNonLocalizedPattern(pattern);
else {
Locale loc = I18nUtils.parseLocale(locale);
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/Icu4jDateConvertorBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/Icu4jDateConvertorBuilder.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/Icu4jDateConvertorBuilder.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/convertor/Icu4jDateConvertorBuilder.java Sat Dec 31 14:03:43 2005
@@ -78,9 +78,9 @@
for (int i = 0; i < patternEl.length; i++) {
String locale = patternEl[i].getAttribute("locale");
String pattern = DomHelper.getElementText(patternEl[i]);
- if (pattern.equals(""))
+ if (pattern.length() == 0)
throw new Exception("pattern element does not contain any content at " + DomHelper.getLocation(patternEl[i]));
- if (locale.equals(""))
+ if (locale.length() == 0)
convertor.setNonLocalizedPattern(pattern);
else {
Locale loc = I18nUtils.parseLocale(locale);
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/AbstractDatatypeBuilder.java Sat Dec 31 14:03:43 2005
@@ -94,7 +94,7 @@
// convertor configuration is allowed to be null, so check that it is not null
if (convertorEl != null)
type = convertorEl.getAttribute("type");
- if (type == null || type.equals(""))
+ if (type == null || type.length() == 0)
type = defaultConvertorHint;
ConvertorBuilder convertorBuilder = (ConvertorBuilder)convertorBuilders.select(type);
return convertorBuilder.build(convertorEl);
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java Sat Dec 31 14:03:43 2005
@@ -222,7 +222,7 @@
public Widget lookupWidget(String path) {
- if (path == null || path.equals("")) {
+ if (path == null || path.length() == 0) {
return this;
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterAction.java Sat Dec 31 14:03:43 2005
@@ -87,5 +87,5 @@
public int getTo() {
return to;
}
- };
+ }
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/RepeaterActionDefinition.java Sat Dec 31 14:03:43 2005
@@ -208,7 +208,7 @@
RepeaterAction.Move move = (RepeaterAction.Move)event.getSource();
Repeater repeater = move.getRepeater();
repeater.moveRow(move.getFrom(), move.getTo());
- };
+ }
});
}
public Widget createInstance() {
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeModelDefinitionBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeModelDefinitionBuilder.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeModelDefinitionBuilder.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeModelDefinitionBuilder.java Sat Dec 31 14:03:43 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.forms.formmodel.tree.builder;
-import org.apache.cocoon.forms.formmodel.tree.TreeModel;
import org.apache.cocoon.forms.formmodel.tree.TreeModelDefinition;
import org.w3c.dom.Element;
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/samples/dreamteam/TeamMember.java Sat Dec 31 14:03:43 2005
@@ -45,7 +45,7 @@
return "Name not set!";
}
String lastName = name.substring(name.indexOf(" ") + 1);
- if (lastName.equals("")) {
+ if (lastName.length() == 0) {
lastName = name;
}
return lastName;
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java Sat Dec 31 14:03:43 2005
@@ -198,7 +198,7 @@
*/
protected String getRequiredAttributeValue(String loc, Attributes attrs, String name) throws SAXException {
String value = attrs.getValue(name);
- if (value == null || value.equals("")) {
+ if (value == null || value.length() == 0) {
throw new SAXException("Element '" + loc + "' missing required '" + name + "' attribute, " +
"at " + getLocation());
}
@@ -218,7 +218,7 @@
protected void setWidget(String loc, String path) throws SAXException {
widget = contextWidget.lookupWidget(path);
if (widget == null) {
- if (contextWidget.getRequestParameterName().equals("")) {
+ if (contextWidget.getRequestParameterName().length() == 0) {
throw new SAXException("Element '" + loc + "' refers to unexistent widget path '" + path + "', " +
"relative to the form container, at " + getLocation());
} else {
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/DomHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/DomHelper.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/DomHelper.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/DomHelper.java Sat Dec 31 14:03:43 2005
@@ -170,7 +170,7 @@
public static String getAttribute(Element element, String attributeName)
throws Exception {
String attrValue = element.getAttribute(attributeName);
- if (attrValue.equals("")) {
+ if (attrValue.length() == 0) {
throw new Exception("Missing attribute \"" + attributeName +
"\" on element \"" + element.getTagName() +
"\" at " + getLocation(element));
@@ -185,7 +185,7 @@
public static String getAttribute(Element element, String attributeName,
String defaultValue) {
String attrValue = element.getAttribute(attributeName);
- if (attrValue.equals("")) {
+ if (attrValue.length() == 0) {
return defaultValue;
}
return attrValue;
@@ -207,7 +207,7 @@
public static int getAttributeAsInteger(Element element,
String attributeName, int defaultValue) throws Exception {
String attrValue = element.getAttribute(attributeName);
- if (attrValue.equals("")) {
+ if (attrValue.length() == 0) {
return defaultValue;
} else {
try {
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/RepeaterAsList.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/RepeaterAsList.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/RepeaterAsList.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/RepeaterAsList.java Sat Dec 31 14:03:43 2005
@@ -18,7 +18,6 @@
import java.util.AbstractList;
import java.util.Map;
-import org.apache.cocoon.forms.formmodel.AbstractContainerWidget;
import org.apache.cocoon.forms.formmodel.Repeater;
import org.apache.cocoon.forms.formmodel.Widget;
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/XMLAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/XMLAdapter.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/XMLAdapter.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/XMLAdapter.java Sat Dec 31 14:03:43 2005
@@ -313,7 +313,7 @@
return;
if (id == null)
- id = widget.getId().equals("") ? UNKNOWN : widget.getId();
+ id = widget.getId().length() == 0 ? UNKNOWN : widget.getId();
final AttributesImpl attr = new AttributesImpl();
if (widget instanceof Repeater.RepeaterRow)
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/CalendarGenerator.java Sat Dec 31 14:03:43 2005
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.TimeZone;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/servlet/CocoonServlet.java Sat Dec 31 14:03:43 2005
@@ -78,7 +78,6 @@
import java.io.OutputStream;
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
-import java.net.SocketException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
Modified: cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/xml/NamespacesTableTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/xml/NamespacesTableTestCase.java?rev=360453&r1=360452&r2=360453&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/xml/NamespacesTableTestCase.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/test/org/apache/cocoon/xml/NamespacesTableTestCase.java Sat Dec 31 14:03:43 2005
@@ -132,7 +132,7 @@
public void startPrefixMapping(String prefix, String uri) throws org.xml.sax.SAXException {
assertEquals("ns2", prefix);
assertEquals("http://ns2", uri);
- };
+ }
});
// Enter and leave a nested scope
@@ -143,7 +143,7 @@
ns.leaveScope(new DefaultHandler() {
public void endPrefixMapping(String prefix) throws org.xml.sax.SAXException {
assertEquals("ns2", prefix);
- };
+ }
});
}