From 3d2b08842d775c204559eed3025fa28da94d2c4c Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 22 Oct 2010 22:31:38 +0000 Subject: [PATCH] [DS-707] String comparisons git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5563 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- .../src/main/java/org/dspace/app/sfx/SFXFileReader.java | 5 +++-- .../webui/servlet/admin/MetadataFieldRegistryServlet.java | 2 +- .../src/main/java/org/dspace/app/webui/util/UIUtil.java | 3 ++- .../dspace/app/xmlui/aspect/administrative/ControlPanel.java | 5 +++-- .../collection/DeleteCollectionRoleConfirm.java | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java b/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java index d9aea41bd7..19a1822029 100644 --- a/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java +++ b/dspace-api/src/main/java/org/dspace/app/sfx/SFXFileReader.java @@ -42,6 +42,7 @@ import java.io.File; import java.io.IOException; import java.net.URLEncoder; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.w3c.dom.Document; @@ -141,7 +142,7 @@ public class SFXFileReader { String sfxfield = ""; int i = 0; - while ((i < len) && (sfxfield == "")) + while ((i < len) && StringUtils.isEmpty(sfxfield)) { Node nd = nl.item(i); if ((nd == null) || isEmptyTextNode(nd)) @@ -211,7 +212,7 @@ public class SFXFileReader { { qualifier = getValue(vn); finish ++; - if (qualifier == "") + if (StringUtils.isEmpty(qualifier)) { qualifier = null; } diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/MetadataFieldRegistryServlet.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/MetadataFieldRegistryServlet.java index b930188f22..d3f6e36bc9 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/MetadataFieldRegistryServlet.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/admin/MetadataFieldRegistryServlet.java @@ -349,7 +349,7 @@ public class MetadataFieldRegistryServlet extends DSpaceServlet } String qualifier = request.getParameter("qualifier"); - if (qualifier == "") + if ("".equals(qualifier)) { qualifier = null; } diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/UIUtil.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/UIUtil.java index a7bcbb28e9..0ada8f64d0 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/UIUtil.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/UIUtil.java @@ -56,6 +56,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import javax.servlet.jsp.jstl.core.Config; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.dspace.app.util.Util; import org.dspace.authenticate.AuthenticationManager; @@ -338,7 +339,7 @@ public class UIUtil extends Util Locale sessionLocale = null; Locale supportedLocale = null; - if (paramLocale != null && paramLocale != "") + if (!StringUtils.isEmpty(paramLocale)) { /* get session locale according to user selection */ sessionLocale = new Locale(paramLocale); diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java index 0220e5cdb6..04c2be7a57 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ControlPanel.java @@ -51,6 +51,7 @@ import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.service.Serviceable; import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; +import org.apache.commons.lang.StringUtils; import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer; import org.dspace.app.xmlui.utils.UIException; import org.dspace.app.xmlui.wing.Message; @@ -858,14 +859,14 @@ public class ControlPanel extends AbstractDSpaceTransformer implements Serviceab generatorSettings.addLabel(T_harvest_label_oai_url); String oaiUrl = ConfigurationManager.getProperty("dspace.oai.url"); - if (oaiUrl != null && oaiUrl != "") + if (!StringUtils.isEmpty(oaiUrl)) { generatorSettings.addItem(oaiUrl); } generatorSettings.addLabel(T_harvest_label_oai_source); String oaiAuthoritativeSource = ConfigurationManager.getProperty("ore.authoritative.source"); - if (oaiAuthoritativeSource != null && oaiAuthoritativeSource != "") + if (!StringUtils.isEmpty(oaiAuthoritativeSource)) { generatorSettings.addItem(oaiAuthoritativeSource); } diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/DeleteCollectionRoleConfirm.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/DeleteCollectionRoleConfirm.java index 7e62ff3f4c..3cdba27fa8 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/DeleteCollectionRoleConfirm.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/collection/DeleteCollectionRoleConfirm.java @@ -90,7 +90,7 @@ public class DeleteCollectionRoleConfirm extends AbstractDSpaceTransformer Division main = body.addInteractiveDivision("collection-role-delete",contextPath+"/admin/collection",Division.METHOD_POST,"primary administrative collection"); main.setHead(T_main_head.parameterize(role)); // Different help message for the default read group to enforce its non-retroactive nature - if (role == "DEFAULT_READ") + if ("DEFAULT_READ".equals(role)) { main.addPara(T_main_para_read.parameterize(toBeDeleted.getName())); }