hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-10 03:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Remove useless methods

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5664 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-26 21:31:29 +00:00
parent 2d065ced4f
commit cb80f0cad4
26 changed files with 202 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-api/src/main/java/org/dspace/app/mediafilter/Brand.java
View File

@@ -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))
{

6
dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
View File

@@ -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

16
dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
View File

@@ -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;

3
dspace-api/src/main/java/org/dspace/content/Bitstream.java
View File

@@ -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();
}

3
dspace-api/src/main/java/org/dspace/content/Bundle.java
View File

@@ -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;
}
/**

3
dspace-api/src/main/java/org/dspace/content/Collection.java
View File

@@ -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();
}

3
dspace-api/src/main/java/org/dspace/content/Community.java
View File

@@ -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");

3
dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOProtocol.java
View File

@@ -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)
{

3
dspace-api/src/main/java/org/dspace/content/packager/AbstractMETSDisseminator.java
View File

@@ -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

13
dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
View File

@@ -687,7 +687,10 @@ public class METSManifest
return xmlData.getChildren();
}
}
else if ((mdRef = mdSec.getChild("mdRef", metsNS)) != null)
else
{
mdRef = mdSec.getChild("mdRef", metsNS);
if (mdRef != null)
{
String mimeType = mdRef.getAttributeValue("MIMETYPE");
if (mimeType != null && mimeType.equalsIgnoreCase("text/xml"))
@@ -702,12 +705,14 @@ public class METSManifest
log.warn("Ignoring mdRef section because MIMETYPE is not XML, but: "+mimeType);
return new ArrayList<Element>(0);
}
}
else
{
throw new MetadataValidationException("Invalid METS Manifest: ?mdSec element with neither mdRef nor mdWrap child.");
}
}
}
catch (JDOMException je)
{
throw new MetadataValidationException("Error parsing or validating metadata section in mdRef or binData within "+mdSec.toString(), je);
@@ -752,7 +757,10 @@ public class METSManifest
outputPretty.outputString(xmlData.getChildren()).getBytes());
}
}
else if ((mdRef = mdSec.getChild("mdRef", metsNS)) != null)
else
{
mdRef = mdSec.getChild("mdRef", metsNS);
if (mdRef != null)
{
return callback.getInputStream(mdRef);
}
@@ -761,6 +769,7 @@ public class METSManifest
throw new MetadataValidationException("Invalid METS Manifest: ?mdSec element with neither mdRef nor mdWrap child.");
}
}
}
/**

25
dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java
View File

@@ -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,

3
dspace-api/src/main/java/org/dspace/eperson/EPerson.java
View File

@@ -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();
}

3
dspace-api/src/main/java/org/dspace/event/ConsumerProfile.java
View File

@@ -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)
{

3
dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
View File

@@ -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);
}

3
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/filter/ShibbolethFilter.java
View File

@@ -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

35
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/jsptag/ItemTag.java
View File

@@ -233,34 +233,42 @@ public class ItemTag extends TagSupport
private StyleSelection styleSelection = (StyleSelection) PluginManager.getSinglePlugin(StyleSelection.class);
/** Hashmap of linked metadata to browse, from dspace.cfg */
private Map<String,String> linkedMetadata;
private static Map<String,String> linkedMetadata;
/** Hashmap of urn base url resolver, from dspace.cfg */
private Map<String,String> urn2baseurl;
private static Map<String,String> urn2baseurl;
/** regex pattern to capture the style of a field, ie <code>schema.element.qualifier(style)</code> */
private Pattern fieldStylePatter = Pattern.compile(".*\\((.*)\\)");
private static final long serialVersionUID = -3841266490729417240L;
public ItemTag()
{
super();
getThumbSettings();
static {
int i;
linkedMetadata = new HashMap<String, String>();
String linkMetadata;
for (int i = 1; null != (linkMetadata = ConfigurationManager.getProperty("webui.browse.link."+i)); i++)
{
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, String>();
String urn;
for (int i = 1; null != (urn = ConfigurationManager.getProperty("webui.resolver."+i+".urn")); i++){
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);
@@ -269,6 +277,9 @@ public class ItemTag extends TagSupport
}
}
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);
@@ -279,6 +290,12 @@ public class ItemTag extends TagSupport
}
}
public ItemTag()
{
super();
getThumbSettings();
}
public int doStartTag() throws JspException
{
try

3
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
View File

@@ -424,7 +424,8 @@ public class FeedServlet extends DSpaceServlet
else
{
minKey = key;
minFeed = maxFeed = feed;
minFeed = feed;
maxFeed = feed;
}
total += feed.hits;
}

3
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/ShibbolethServlet.java
View File

@@ -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;

3
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/Authenticate.java
View File

@@ -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;

8
dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCollection.java
View File

@@ -225,15 +225,17 @@ 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 le = DAVBitstream.makeXmlBitstream(lbs, this);
if (le != null)
{
Element p = new Element("logo", DAV.NS_DSPACE);
p.addContent(le);
return p;
}
}
}
else if (elementsEqualIsh(property, short_descriptionProperty))
{

8
dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVCommunity.java
View File

@@ -171,15 +171,17 @@ 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 le = DAVBitstream.makeXmlBitstream(lbs, this);
if (le != null)
{
Element p = new Element("logo", DAV.NS_DSPACE);
p.addContent(le);
return p;
}
}
}
else if (elementsEqualIsh(property, handleProperty))
{

6
dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVDSpaceObject.java
View File

@@ -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);
}

62
dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVResource.java
View File

@@ -397,31 +397,49 @@ 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;
}
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 -----------------------*/
/**

6
dspace-lni/dspace-lni-core/src/main/java/org/dspace/app/dav/DAVWorkflowItem.java
View File

@@ -315,7 +315,10 @@ class DAVWorkflowItem extends DAVInProgressSubmission
WorkflowManager.unclaim(this.context, (WorkflowItem) this.inProgressItem,
this.context.getCurrentUser());
}
else if ((newState = WorkflowManager.getWorkflowID(key)) >= 0)
else
{
newState = WorkflowManager.getWorkflowID(key);
if (newState >= 0)
{
((WorkflowItem) this.inProgressItem).setState(newState);
}
@@ -324,6 +327,7 @@ class DAVWorkflowItem extends DAVInProgressSubmission
throw new DAVStatusException(DAV.SC_CONFLICT,
"Unrecognized verb or state-name in value for state property.");
}
}
this.inProgressItem.update();
return HttpServletResponse.SC_OK;

4
dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java
View File

@@ -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"));

3
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepAndPage.java
View File

@@ -32,7 +32,8 @@ public class StepAndPage implements Comparable<StepAndPage>
/** Default constructor returns an unset instance */
public StepAndPage()
{
step = page = UNSET;
step = UNSET;
page = UNSET;
}
/**