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 16:24:18 UTC
svn commit: r360291 - in /cocoon:
blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/
blocks/forms/trunk/java/org/apache/cocoon/forms/util/
branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/
branches/BRANCH_2_1_X/src/jav...
Author: antonio
Date: Sat Dec 31 07:24:10 2005
New Revision: 360291
URL: http://svn.apache.org/viewcvs?rev=360291&view=rev
Log:
Compares String using equals()
Modified:
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/XMLAdapter.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
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=360291&r1=360290&r2=360291&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 07:24:10 2005
@@ -203,7 +203,7 @@
}
String parentParamName = parent.getRequestParameterName();
- if (parentParamName == this.cachedParentParamName) {
+ if (parentParamName.equals(this.cachedParentParamName)) {
// Parent name hasn't changed, so ours hasn't changed too
return this.cachedParamName;
}
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=360291&r1=360290&r2=360291&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 07:24:10 2005
@@ -262,7 +262,7 @@
" to " + type.getTypeClass());
} else if (this.currentWidget instanceof BooleanField) {
// FIXME: BooleanField should implement DataWidget, which
- // would make this case unnesecary
+ // would make this case unnecessary
if ("true".equals(input))
this.currentWidget.setValue(Boolean.TRUE);
else if ("false".equals(input))
@@ -313,7 +313,7 @@
return;
if (id == null)
- id = widget.getId() == "" ? UNKNOWN : widget.getId();
+ id = widget.getId().equals("") ? 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/components/modules/output/SessionAttributeOutputModule.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java?rev=360291&r1=360290&r2=360291&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/output/SessionAttributeOutputModule.java Sat Dec 31 07:24:10 2005
@@ -123,8 +123,8 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("done rolling back");
}
- String prefix = (String) this.settings.get("key-prefix", PREFIX );
- if (prefix!="") {
+ String prefix = (String) this.settings.get("key-prefix", PREFIX);
+ if (!(prefix.equals(""))) {
ObjectModelHelper.getRequest(objectModel).getSession().setAttribute(prefix+":",e.getMessage());
} else {
ObjectModelHelper.getRequest(objectModel).getSession().setAttribute("errorMessage",e.getMessage());
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java?rev=360291&r1=360290&r2=360291&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java Sat Dec 31 07:24:10 2005
@@ -513,7 +513,7 @@
namespace = "http://www.w3.org/2000/xmlns/";
} else {
// Attribute name for this prefix's declaration
- String declname = (prefix == "") ? "xmlns" : "xmlns:" + prefix;
+ String declname = (prefix.equals("")) ? "xmlns" : "xmlns:" + prefix;
// Scan until we run out of Elements or have resolved the namespace
while ((null != parent) && (null == namespace)