diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java index cf7ed425ac..b187dd10d7 100644 --- a/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java +++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java @@ -156,7 +156,8 @@ public class Brand bWidth = fm.stringWidth(brandText.getText()) + xOffset * 2 + 1; bHeight = fm.getHeight(); - bx = by = 0; + bx = 0; + by = 0; if (brandText.getLocation().equals(BrandText.TL)) { diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java index 4428c1c1f5..7a881ea4ba 100755 --- a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java +++ b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java @@ -200,9 +200,9 @@ public class LDAPAuthentication if (ldap.ldapAuthenticate(netid, password, context)) { - context.setCurrentUser(eperson = EPerson.findByNetid(context, netid.toLowerCase())); - log.info(LogManager - .getHeader(context, "authenticate", "type=ldap")); + eperson = EPerson.findByNetid(context, netid.toLowerCase()); + context.setCurrentUser(eperson); + log.info(LogManager.getHeader(context, "authenticate", "type=ldap")); return SUCCESS; } else diff --git a/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java index c7a19d5a8c..61a25fef01 100644 --- a/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java +++ b/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java @@ -81,18 +81,14 @@ public class ShibAuthentication implements AuthenticationMethod String name; while (names.hasMoreElements()) { - log.debug("header:" + (name = names.nextElement().toString()) + "=" - + request.getHeader(name)); + name = names.nextElement().toString(); + log.debug("header:" + name + "=" + request.getHeader(name)); } - boolean isUsingTomcatUser = ConfigurationManager - .getBooleanProperty("authentication.shib.email-use-tomcat-remote-user"); - String emailHeader = ConfigurationManager - .getProperty("authentication.shib.email-header"); - String fnameHeader = ConfigurationManager - .getProperty("authentication.shib.firstname-header"); - String lnameHeader = ConfigurationManager - .getProperty("authentication.shib.lastname-header"); + boolean isUsingTomcatUser = ConfigurationManager.getBooleanProperty("authentication.shib.email-use-tomcat-remote-user"); + String emailHeader = ConfigurationManager.getProperty("authentication.shib.email-header"); + String fnameHeader = ConfigurationManager.getProperty("authentication.shib.firstname-header"); + String lnameHeader = ConfigurationManager.getProperty("authentication.shib.lastname-header"); String email = null; String fname = null; diff --git a/dspace-api/src/main/java/org/dspace/content/Bitstream.java b/dspace-api/src/main/java/org/dspace/content/Bitstream.java index 7ec4b64269..51a1698859 100644 --- a/dspace-api/src/main/java/org/dspace/content/Bitstream.java +++ b/dspace-api/src/main/java/org/dspace/content/Bitstream.java @@ -120,7 +120,8 @@ public class Bitstream extends DSpaceObject // Cache ourselves context.cache(this, row.getIntColumn("bitstream_id")); - modified = modifiedMetadata = false; + modified = false; + modifiedMetadata = false; clearDetails(); } diff --git a/dspace-api/src/main/java/org/dspace/content/Bundle.java b/dspace-api/src/main/java/org/dspace/content/Bundle.java index 7e8a226a5f..52999c7f02 100644 --- a/dspace-api/src/main/java/org/dspace/content/Bundle.java +++ b/dspace-api/src/main/java/org/dspace/content/Bundle.java @@ -153,7 +153,8 @@ public class Bundle extends DSpaceObject // Cache ourselves context.cache(this, row.getIntColumn("bundle_id")); - modified = modifiedMetadata = false; + modified = false; + modifiedMetadata = false; } /** diff --git a/dspace-api/src/main/java/org/dspace/content/Collection.java b/dspace-api/src/main/java/org/dspace/content/Collection.java index 98df95072e..d1a3973a26 100644 --- a/dspace-api/src/main/java/org/dspace/content/Collection.java +++ b/dspace-api/src/main/java/org/dspace/content/Collection.java @@ -174,7 +174,8 @@ public class Collection extends DSpaceObject // Cache ourselves context.cache(this, row.getIntColumn("collection_id")); - modified = modifiedMetadata = false; + modified = false; + modifiedMetadata = false; clearDetails(); } diff --git a/dspace-api/src/main/java/org/dspace/content/Community.java b/dspace-api/src/main/java/org/dspace/content/Community.java index 3a1b7db5e9..addb818d19 100644 --- a/dspace-api/src/main/java/org/dspace/content/Community.java +++ b/dspace-api/src/main/java/org/dspace/content/Community.java @@ -130,7 +130,8 @@ public class Community extends DSpaceObject // Cache ourselves context.cache(this, row.getIntColumn("community_id")); - modified = modifiedMetadata = false; + modified = false; + modifiedMetadata = false; admins = groupFromColumn("admin"); diff --git a/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOProtocol.java b/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOProtocol.java index 0aa9a46dcd..e9425ba6d4 100644 --- a/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOProtocol.java +++ b/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOProtocol.java @@ -262,7 +262,8 @@ public abstract class SHERPARoMEOProtocol implements ChoiceAuthority else if (localName.equals(labelElement) && textValue != null) { // plug in label value - result[rindex].value = result[rindex].label = textValue.trim(); + result[rindex].value = textValue.trim(); + result[rindex].label = result[rindex].value; } else if (authorityElement != null && localName.equals(authorityElement) && textValue != null) { diff --git a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java index 7568cc5520..b54db0f6d0 100644 --- a/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java +++ b/dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java @@ -574,7 +574,8 @@ public abstract class AbstractMETSDisseminator } else { - xwalkName = metsName = typeSpec; + metsName = typeSpec; + xwalkName = typeSpec; } // First, check to see if the crosswalk we are using is a normal DisseminationCrosswalk diff --git a/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java b/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java index a9b513f0f5..1b81ce64b1 100644 --- a/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java +++ b/dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java @@ -687,26 +687,31 @@ public class METSManifest return xmlData.getChildren(); } } - else if ((mdRef = mdSec.getChild("mdRef", metsNS)) != null) + else { - String mimeType = mdRef.getAttributeValue("MIMETYPE"); - if (mimeType != null && mimeType.equalsIgnoreCase("text/xml")) + mdRef = mdSec.getChild("mdRef", metsNS); + if (mdRef != null) { - Document mdd = parser.build(callback.getInputStream(mdRef)); - List result = new ArrayList(1); - result.add(mdd.getRootElement()); - return result; + String mimeType = mdRef.getAttributeValue("MIMETYPE"); + if (mimeType != null && mimeType.equalsIgnoreCase("text/xml")) + { + Document mdd = parser.build(callback.getInputStream(mdRef)); + List result = new ArrayList(1); + result.add(mdd.getRootElement()); + return result; + } + else + { + log.warn("Ignoring mdRef section because MIMETYPE is not XML, but: "+mimeType); + return new ArrayList(0); + } + } else { - log.warn("Ignoring mdRef section because MIMETYPE is not XML, but: "+mimeType); - return new ArrayList(0); + throw new MetadataValidationException("Invalid METS Manifest: ?mdSec element with neither mdRef nor mdWrap child."); } } - else - { - throw new MetadataValidationException("Invalid METS Manifest: ?mdSec element with neither mdRef nor mdWrap child."); - } } catch (JDOMException je) { @@ -752,13 +757,17 @@ public class METSManifest outputPretty.outputString(xmlData.getChildren()).getBytes()); } } - else if ((mdRef = mdSec.getChild("mdRef", metsNS)) != null) - { - return callback.getInputStream(mdRef); - } else { - throw new MetadataValidationException("Invalid METS Manifest: ?mdSec element with neither mdRef nor mdWrap child."); + mdRef = mdSec.getChild("mdRef", metsNS); + if (mdRef != null) + { + return callback.getInputStream(mdRef); + } + else + { + throw new MetadataValidationException("Invalid METS Manifest: ?mdSec element with neither mdRef nor mdWrap child."); + } } } diff --git a/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java b/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java index 83353a01ba..7833ce4af3 100644 --- a/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java +++ b/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java @@ -366,8 +366,8 @@ public class PDFPackager log.debug("PDF Info dict title=\"" + title + "\""); } item.addDC("title", null, "en", title); - String value; - if ((value = docinfo.getAuthor()) != null) + String value = docinfo.getAuthor(); + if (value != null) { item.addDC("contributor", "author", null, value); if (log.isDebugEnabled()) @@ -375,32 +375,41 @@ public class PDFPackager log.debug("PDF Info dict author=\"" + value + "\""); } } - if ((value = docinfo.getCreator()) != null) + + value = docinfo.getCreator(); + if (value != null) { item.addDC("description", "provenance", "en", "Application that created the original document: " + value); } - if ((value = docinfo.getProducer()) != null) + + value = docinfo.getProducer(); + if (value != null) { item.addDC("description", "provenance", "en", "Original document converted to PDF by: " + value); } - if ((value = docinfo.getSubject()) != null) + + value = docinfo.getSubject(); + if (value != null) { item.addDC("description", "abstract", null, value); } - if ((value = docinfo.getKeywords()) != null) + + value = docinfo.getKeywords(); + if (value != null) { item.addDC("subject", "other", null, value); } // Take either CreationDate or ModDate as "date.created", // Too bad there's no place to put "last modified" in the DC. - Calendar calValue; - if ((calValue = docinfo.getCreationDate()) == null) + Calendar calValue = docinfo.getCreationDate(); + if (calValue == null) { calValue = docinfo.getModificationDate(); } + if (calValue != null) { item.addDC("date", "created", null, diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPerson.java b/dspace-api/src/main/java/org/dspace/eperson/EPerson.java index d008045baa..942d4c38e0 100644 --- a/dspace-api/src/main/java/org/dspace/eperson/EPerson.java +++ b/dspace-api/src/main/java/org/dspace/eperson/EPerson.java @@ -108,7 +108,8 @@ public class EPerson extends DSpaceObject // Cache ourselves context.cache(this, row.getIntColumn("eperson_id")); - modified = modifiedMetadata = false; + modified = false; + modifiedMetadata = false; clearDetails(); } diff --git a/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java b/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java index fa6b8b0fc8..bdfcbb0984 100644 --- a/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java +++ b/dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java @@ -134,7 +134,8 @@ public class ConsumerProfile else { int filter[] = new int[2]; - filter[0] = filter[1] = 0; + filter[0] = 0; + filter[1] = 0; String objectNames[] = fpart[0].split("\\|"); for (int k = 0; k < objectNames.length; ++k) { diff --git a/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java b/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java index 0653879b19..119e14c87a 100644 --- a/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java +++ b/dspace-api/src/main/java/org/dspace/sort/OrderFormat.java @@ -101,7 +101,8 @@ public class OrderFormat if (type != null && type.length() > 0) { // Use a delegate if one is configured - if ((delegate = OrderFormat.getDelegate(type)) != null) + delegate = OrderFormat.getDelegate(type); + if (delegate != null) { return delegate.makeSortString(value, language); } diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/filter/ShibbolethFilter.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/filter/ShibbolethFilter.java index a35d1aa5e1..ef75ecb9c7 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/filter/ShibbolethFilter.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/filter/ShibbolethFilter.java @@ -98,7 +98,8 @@ public class ShibbolethFilter implements Filter String name; while(names.hasMoreElements()) { - log.debug("header:" + (name = names.nextElement().toString()) + "=" + ((HttpServletRequest) request).getHeader(name)); + name = names.nextElement().toString(); + log.debug("header:" + name + "=" + ((HttpServletRequest) request).getHeader(name)); } // No current user, prompt authentication diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java index 020d4f355d..f87f941c4a 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java @@ -233,50 +233,67 @@ public class ItemTag extends TagSupport private StyleSelection styleSelection = (StyleSelection) PluginManager.getSinglePlugin(StyleSelection.class); /** Hashmap of linked metadata to browse, from dspace.cfg */ - private Map linkedMetadata; + private static Map linkedMetadata; /** Hashmap of urn base url resolver, from dspace.cfg */ - private Map urn2baseurl; + private static Map urn2baseurl; /** regex pattern to capture the style of a field, ie schema.element.qualifier(style) */ private Pattern fieldStylePatter = Pattern.compile(".*\\((.*)\\)"); private static final long serialVersionUID = -3841266490729417240L; + + static { + int i; + + linkedMetadata = new HashMap(); + String linkMetadata; + + i = 1; + do { + linkMetadata = ConfigurationManager.getProperty("webui.browse.link."+i); + if (linkMetadata != null) { + String[] linkedMetadataSplit = linkMetadata.split(":"); + String indexName = linkedMetadataSplit[0].trim(); + String metadataName = linkedMetadataSplit[1].trim(); + linkedMetadata.put(indexName, metadataName); + } + + i++; + } while (linkMetadata != null); + + urn2baseurl = new HashMap(); + + String urn; + i = 1; + do { + urn = ConfigurationManager.getProperty("webui.resolver."+i+".urn"); + if (urn != null) { + String baseurl = ConfigurationManager.getProperty("webui.resolver."+i+".baseurl"); + if (baseurl != null){ + urn2baseurl.put(urn, baseurl); + } else { + log.warn("Wrong webui.resolver configuration, you need to specify both webui.resolver..urn and webui.resolver..baseurl: missing baseurl for n = "+i); + } + } + + i++; + } while (urn != null); + + // Set sensible default if no config is found for doi & handle + if (!urn2baseurl.containsKey("doi")){ + urn2baseurl.put("doi",DOI_DEFAULT_BASEURL); + } + + if (!urn2baseurl.containsKey("hdl")){ + urn2baseurl.put("hdl",HANDLE_DEFAULT_BASEURL); + } + } public ItemTag() { super(); getThumbSettings(); - linkedMetadata = new HashMap(); - String linkMetadata; - for (int i = 1; null != (linkMetadata = ConfigurationManager.getProperty("webui.browse.link."+i)); i++) - { - String[] linkedMetadataSplit = linkMetadata.split(":"); - String indexName = linkedMetadataSplit[0].trim(); - String metadataName = linkedMetadataSplit[1].trim(); - linkedMetadata.put(indexName, metadataName); - } - - urn2baseurl = new HashMap(); - - String urn; - for (int i = 1; null != (urn = ConfigurationManager.getProperty("webui.resolver."+i+".urn")); i++){ - String baseurl = ConfigurationManager.getProperty("webui.resolver."+i+".baseurl"); - if (baseurl != null){ - urn2baseurl.put(urn, baseurl); - } else { - log.warn("Wrong webui.resolver configuration, you need to specify both webui.resolver..urn and webui.resolver..baseurl: missing baseurl for n = "+i); - } - } - - // Set sensible default if no config is found for doi & handle - if (!urn2baseurl.containsKey("doi")){ - urn2baseurl.put("doi",DOI_DEFAULT_BASEURL); - } - - if (!urn2baseurl.containsKey("hdl")){ - urn2baseurl.put("hdl",HANDLE_DEFAULT_BASEURL); - } } public int doStartTag() throws JspException diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java index debd3790e7..6302eef05f 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java @@ -424,7 +424,8 @@ public class FeedServlet extends DSpaceServlet else { minKey = key; - minFeed = maxFeed = feed; + minFeed = feed; + maxFeed = feed; } total += feed.hits; } diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ShibbolethServlet.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ShibbolethServlet.java index da7e841700..677a13e7de 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ShibbolethServlet.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ShibbolethServlet.java @@ -84,7 +84,8 @@ public class ShibbolethServlet extends DSpaceServlet { String name; while(names.hasMoreElements()) { - log.info("header:" + (name = names.nextElement().toString()) + "=" + request.getHeader(name)); + name = names.nextElement().toString(); + log.info("header:" + name + "=" + request.getHeader(name)); } String jsp = null; diff --git a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/Authenticate.java b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/Authenticate.java index 7eb02bcc76..337b11e675 100644 --- a/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/Authenticate.java +++ b/dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/Authenticate.java @@ -226,7 +226,8 @@ public class Authenticate { String s; am = (AuthenticationMethod)ai.next(); - if ((s = am.loginPageURL(context, request, response)) != null) + s = am.loginPageURL(context, request, response); + if (s != null) { url = s; ++count; diff --git a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java index 62f0975d23..aefa1f5a8e 100644 --- a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java +++ b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java @@ -225,13 +225,15 @@ class DAVCollection extends DAVDSpaceObject else if (elementsEqualIsh(property, logoProperty)) { Bitstream lbs = this.collection.getLogo(); - Element le; - if (lbs != null - && (le = DAVBitstream.makeXmlBitstream(lbs, this)) != null) + if (lbs != null) { - Element p = new Element("logo", DAV.NS_DSPACE); - p.addContent(le); - return p; + Element le = DAVBitstream.makeXmlBitstream(lbs, this); + if (le != null) + { + Element p = new Element("logo", DAV.NS_DSPACE); + p.addContent(le); + return p; + } } } diff --git a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCommunity.java b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCommunity.java index bb2b73e305..bd76f0f997 100644 --- a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCommunity.java +++ b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCommunity.java @@ -171,13 +171,15 @@ class DAVCommunity extends DAVDSpaceObject else if (elementsEqualIsh(property, logoProperty)) { Bitstream lbs = this.community.getLogo(); - Element le; - if (lbs != null - && (le = DAVBitstream.makeXmlBitstream(lbs, this)) != null) + if (lbs != null) { - Element p = new Element("logo", DAV.NS_DSPACE); - p.addContent(le); - return p; + Element le = DAVBitstream.makeXmlBitstream(lbs, this); + if (le != null) + { + Element p = new Element("logo", DAV.NS_DSPACE); + p.addContent(le); + return p; + } } } diff --git a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVDSpaceObject.java b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVDSpaceObject.java index 417381223b..333057baaa 100644 --- a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVDSpaceObject.java +++ b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVDSpaceObject.java @@ -119,11 +119,9 @@ abstract class DAVDSpaceObject extends DAVResource protected static String getPathElt(String handle) { int hs; - if (handleSeparator != '/' && (hs = handle.indexOf('/')) >= 0) + if (handleSeparator != '/') { - char hc[] = handle.toCharArray(); - hc[hs] = handleSeparator; - handle = String.copyValueOf(hc); + handle = handle.replaceFirst("/", String.valueOf(handleSeparator)); } return "dso_" + encodeHandle(handle); } diff --git a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVResource.java b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVResource.java index 3e9b0bf975..2b025ae037 100644 --- a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVResource.java +++ b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVResource.java @@ -397,29 +397,47 @@ abstract class DAVResource String pathElt[]) throws IOException, SQLException, DAVStatusException, AuthorizeException { - DAVResource result = null; - - if ((result = DAVSite.matchResourceURI(context, request, response, - pathElt)) == null - && (result = DAVLookup.matchResourceURI(context, request, - response, pathElt)) == null - && (result = DAVWorkspace.matchResourceURI(context, request, - response, pathElt)) == null - && (result = DAVWorkflow.matchResourceURI(context, request, - response, pathElt)) == null - && (result = DAVEPerson.matchResourceURI(context, request, - response, pathElt)) == null - && (result = DAVItem.matchResourceURI(context, request, - response, pathElt)) == null - && (result = DAVBitstream.matchResourceURI(context, request, - response, pathElt)) == null - && (result = DAVDSpaceObject.matchResourceURI(context, request, - response, pathElt)) == null) - { - throw new DAVStatusException(HttpServletResponse.SC_BAD_REQUEST, - "Unrecognized DSpace resource URI"); + DAVResource result = DAVSite.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; } - return result; + + result = DAVLookup.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + result = DAVWorkspace.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + result = DAVWorkflow.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + result = DAVEPerson.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + result = DAVItem.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + result = DAVBitstream.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + result = DAVDSpaceObject.matchResourceURI(context, request, response, pathElt); + if (result != null) { + return result; + } + + throw new DAVStatusException(HttpServletResponse.SC_BAD_REQUEST, "Unrecognized DSpace resource URI"); } /*----------------- Generating Resource URIs -----------------------*/ diff --git a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVWorkflowItem.java b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVWorkflowItem.java index 44e370bbae..c55c50081a 100644 --- a/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVWorkflowItem.java +++ b/dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVWorkflowItem.java @@ -315,14 +315,18 @@ class DAVWorkflowItem extends DAVInProgressSubmission WorkflowManager.unclaim(this.context, (WorkflowItem) this.inProgressItem, this.context.getCurrentUser()); } - else if ((newState = WorkflowManager.getWorkflowID(key)) >= 0) - { - ((WorkflowItem) this.inProgressItem).setState(newState); - } else { - throw new DAVStatusException(DAV.SC_CONFLICT, - "Unrecognized verb or state-name in value for state property."); + newState = WorkflowManager.getWorkflowID(key); + if (newState >= 0) + { + ((WorkflowItem) this.inProgressItem).setState(newState); + } + else + { + throw new DAVStatusException(DAV.SC_CONFLICT, + "Unrecognized verb or state-name in value for state property."); + } } this.inProgressItem.update(); diff --git a/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java b/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java index 0533e35446..1d6bffca7e 100644 --- a/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java +++ b/dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java @@ -397,9 +397,9 @@ public class DSpaceOAICatalog extends AbstractCatalog } } - String schemaURL; + String schemaURL = getCrosswalks().getSchemaURL(metadataPrefix); - if ((schemaURL = getCrosswalks().getSchemaURL(metadataPrefix)) == null) + if (schemaURL == null) { log.info(LogManager.getHeader(null, "oai_error", "cannot_disseminate_format")); diff --git a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepAndPage.java b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepAndPage.java index 716ffd7e37..5cb20a4992 100644 --- a/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepAndPage.java +++ b/dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepAndPage.java @@ -32,7 +32,8 @@ public class StepAndPage implements Comparable /** Default constructor returns an unset instance */ public StepAndPage() { - step = page = UNSET; + step = UNSET; + page = UNSET; } /**