hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Clean up List/Map usage

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5512 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-21 12:02:20 +00:00
parent e0c560ea95
commit be485580a7
25 changed files with 83 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java
View File

@@ -405,7 +405,7 @@ public class DCInputsReader
* 'twobox' are marked repeatable. Complain if dc-element, label,
* or input-type are missing.
*/
private void processPageParts(String formName, String page, Node n, HashMap field)
private void processPageParts(String formName, String page, Node n, Map field)
throws SAXException
{
NodeList nl = n.getChildNodes();

4
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/util/FileUploadRequest.java
View File

@@ -67,9 +67,9 @@ public class FileUploadRequest extends HttpServletRequestWrapper
/** Multipart request */
private List items = null;
private HashMap parameters = new HashMap();
private Map parameters = new HashMap();
private HashMap fileitems = new HashMap();
private Map fileitems = new HashMap();
private List filenames = new ArrayList();

2
dspace-lni/dspace-lni-client/src/main/java/org/dspace/app/dav/client/LNISoapServletServiceLocator.java
View File

@@ -108,7 +108,7 @@ public class LNISoapServletServiceLocator extends org.apache.axis.client.Service
return new javax.xml.namespace.QName("http://dspace.org/xmlns/lni", "LNISoapServletService");
}
private java.util.HashSet ports = null;
private java.util.Set ports = null;
public java.util.Iterator getPorts() {
if (ports == null) {

10
dspace-stats/src/main/java/org/dspace/statistics/util/ApacheLogRobotsProcessor.java
View File

@@ -17,6 +17,7 @@ import org.apache.commons.cli.PosixParser;
import java.io.*;
import java.util.HashSet;
import java.util.Set;
/**
* Commandline utility to create a file of spider addresses from an Apache
@@ -65,10 +66,15 @@ public class ApacheLogRobotsProcessor {
File spiderIpFile = new File(spiderIpPath);
//Get the IPs already added in our file
HashSet<String> logSpiders = new HashSet<String>();
Set<String> logSpiders;
if (spiderIpFile.exists())
{
logSpiders = SpiderDetector.readIpAddresses(spiderIpFile);
}
else
{
logSpiders = new HashSet<String>();
}
//First read in our log file line per line
BufferedReader in = new BufferedReader(new FileReader(logFileLoc));

32
dspace-stats/src/main/java/org/dspace/statistics/util/IPTable.java
View File

@@ -24,8 +24,8 @@ import java.util.Set;
public class IPTable {
/* A lookup tree for IP Addresses and SubnetRanges */
private HashMap<String, HashMap<String, HashMap<String, HashSet<String>>>> map =
new HashMap<String, HashMap<String, HashMap<String, HashSet<String>>>>();
private Map<String, Map<String, Map<String, Set<String>>>> map =
new HashMap<String, Map<String, Map<String, Set<String>>>>();
/**
* Can be full v4 IP, subnet or range string
@@ -70,22 +70,22 @@ public class IPTable {
if (start.length >= 3) {
HashMap<String, HashMap<String, HashSet<String>>> first = map.get(start[0]);
Map<String, Map<String, Set<String>>> first = map.get(start[0]);
if (first == null) {
first = new HashMap<String, HashMap<String, HashSet<String>>>();
first = new HashMap<String, Map<String, Set<String>>>();
map.put(start[0], first);
}
HashMap<String, HashSet<String>> second = first.get(start[1]);
Map<String, Set<String>> second = first.get(start[1]);
if (second == null) {
second = new HashMap<String, HashSet<String>>();
second = new HashMap<String, Set<String>>();
first.put(start[1], second);
}
HashSet<String> third = second.get(start[2]);
Set<String> third = second.get(start[2]);
if (third == null) {
third = new HashSet<String>();
@@ -125,15 +125,15 @@ public class IPTable {
if (subnets.length != 4)
throw new IPFormatException("needs to be single IP Address");
HashMap<String, HashMap<String, HashSet<String>>> first = map.get(subnets[0]);
Map<String, Map<String, Set<String>>> first = map.get(subnets[0]);
if (first == null) return false;
HashMap<String, HashSet<String>> second = first.get(subnets[1]);
Map<String, Set<String>> second = first.get(subnets[1]);
if (second == null) return false;
HashSet<String> third = second.get(subnets[2]);
Set<String> third = second.get(subnets[2]);
if (third == null) return false;
@@ -147,17 +147,17 @@ public class IPTable {
public Set<String> toSet() {
HashSet<String> set = new HashSet<String>();
for (Map.Entry<String, HashMap<String, HashMap<String, HashSet<String>>>> first : map.entrySet()) {
for (Map.Entry<String, Map<String, Map<String, Set<String>>>> first : map.entrySet()) {
String firstString = first.getKey();
HashMap<String, HashMap<String, HashSet<String>>> secondMap = first.getValue();
Map<String, Map<String, Set<String>>> secondMap = first.getValue();
for (Map.Entry<String, HashMap<String, HashSet<String>>> second : secondMap.entrySet()) {
for (Map.Entry<String, Map<String, Set<String>>> second : secondMap.entrySet()) {
String secondString = second.getKey();
HashMap<String, HashSet<String>> thirdMap = second.getValue();
Map<String, Set<String>> thirdMap = second.getValue();
for (Map.Entry<String, HashSet<String>> third : thirdMap.entrySet()) {
for (Map.Entry<String, Set<String>> third : thirdMap.entrySet()) {
String thirdString = third.getKey();
HashSet<String> fourthSet = third.getValue();
Set<String> fourthSet = third.getValue();
if (fourthSet.contains("*")) {
set.add(firstString + "." + secondString + "." + thirdString);

4
dspace-stats/src/main/java/org/dspace/statistics/util/SpiderDetector.java
View File

@@ -47,8 +47,8 @@ public class SpiderDetector {
* @return a vector full of ip's
* @throws IOException could not happen since we check the file be4 we use it
*/
public static HashSet<String> readIpAddresses(File spiderIpFile) throws IOException {
HashSet<String> ips = new HashSet<String>();
public static Set<String> readIpAddresses(File spiderIpFile) throws IOException {
Set<String> ips = new HashSet<String>();
if (!spiderIpFile.exists() || !spiderIpFile.isFile())
return ips;

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/atom/Author.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.atom;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Element;
import nu.xom.Elements;
@@ -253,8 +254,8 @@ public class Author extends XmlElement implements SwordElementInterface
return validate(null, null, validationContext);
}
public SwordValidationInfo validate(ArrayList<SwordValidationInfo> elements,
ArrayList<SwordValidationInfo> attributes,
public SwordValidationInfo validate(List<SwordValidationInfo> elements,
List<SwordValidationInfo> attributes,
Properties validationContext)
{
SwordValidationInfo result = new SwordValidationInfo(xmlName);

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/atom/Content.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.atom;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Attribute;
import nu.xom.Element;
@@ -276,8 +277,8 @@ public class Content extends XmlElement implements SwordElementInterface
* @param attributes
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> elements,
ArrayList<SwordValidationInfo> attributes,
protected SwordValidationInfo validate(List<SwordValidationInfo> elements,
List<SwordValidationInfo> attributes,
Properties validationContext)
{
SwordValidationInfo info = new SwordValidationInfo(xmlName);

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/atom/Generator.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.atom;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Attribute;
import nu.xom.Element;
@@ -255,8 +256,8 @@ public class Generator extends XmlElement implements SwordElementInterface
* @param attributeItems
* @return
*/
public SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
ArrayList<SwordValidationInfo> attributeItems,
public SwordValidationInfo validate(List<SwordValidationInfo> existing,
List<SwordValidationInfo> attributeItems,
Properties validationContext)
{
boolean validateAll = (existing == null);

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/atom/Link.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.atom;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Attribute;
import nu.xom.Element;
@@ -328,8 +329,8 @@ public class Link extends XmlElement implements SwordElementInterface
return validate(null, null, validationContext);
}
public SwordValidationInfo validate(ArrayList<SwordValidationInfo> elements,
ArrayList<SwordValidationInfo> attributes,
public SwordValidationInfo validate(List<SwordValidationInfo> elements,
List<SwordValidationInfo> attributes,
Properties validationContext)
{
boolean validateAll = (elements == null);

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/atom/Source.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.atom;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Element;
import nu.xom.Elements;
@@ -186,8 +187,8 @@ public class Source extends XmlElement implements SwordElementInterface
return validate(null, null, validationContext);
}
public SwordValidationInfo validate(ArrayList<SwordValidationInfo> elements,
ArrayList<SwordValidationInfo> attributes,
public SwordValidationInfo validate(List<SwordValidationInfo> elements,
List<SwordValidationInfo> attributes,
Properties validationContext)
{
SwordValidationInfo result = new SwordValidationInfo(xmlName);

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/atom/TextConstruct.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.atom;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Attribute;
import nu.xom.Element;
@@ -280,8 +281,8 @@ implements SwordElementInterface
* @param attributeItems
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
ArrayList<SwordValidationInfo> attributeItems,
protected SwordValidationInfo validate(List<SwordValidationInfo> existing,
List<SwordValidationInfo> attributeItems,
Properties validationContext)
{
boolean validateAll = (existing == null);

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/BasicContentElement.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.base;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Element;
@@ -172,8 +173,8 @@ implements SwordElementInterface
* @param attributeItems
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
ArrayList<SwordValidationInfo> attributeItems,
protected SwordValidationInfo validate(List<SwordValidationInfo> existing,
List<SwordValidationInfo> attributeItems,
Properties validationContext)
{
SwordValidationInfo result = new SwordValidationInfo(xmlName);

6
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/Collection.java
View File

@@ -95,7 +95,7 @@ public class Collection extends XmlElement implements SwordElementInterface
/**
* The SWORD acceptsPackaging details.
*/
private ArrayList<SwordAcceptPackaging> acceptPackaging;
private List<SwordAcceptPackaging> acceptPackaging;
/**
* The logger.
@@ -712,8 +712,8 @@ public class Collection extends XmlElement implements SwordElementInterface
* @param existing
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
ArrayList<SwordValidationInfo> attributes,
protected SwordValidationInfo validate(List<SwordValidationInfo> existing,
List<SwordValidationInfo> attributes,
Properties validationContext)
{
boolean validateAll = (existing == null);

2
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/Service.java
View File

@@ -557,7 +557,7 @@ public class Service extends XmlElement implements SwordElementInterface
* @param existing
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
protected SwordValidationInfo validate(List<SwordValidationInfo> existing,
Properties validationContext)
{

5
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/SwordAcceptPackaging.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.base;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Attribute;
import nu.xom.Element;
@@ -244,8 +245,8 @@ implements SwordElementInterface
* @param attributeItems
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
ArrayList<SwordValidationInfo> attributeItems,
protected SwordValidationInfo validate(List<SwordValidationInfo> existing,
List<SwordValidationInfo> attributeItems,
Properties validationContext)
{
SwordValidationInfo result = new SwordValidationInfo(xmlName);

13
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/SwordValidationInfo.java
View File

@@ -38,6 +38,7 @@ package org.purl.sword.base;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
/**
* Represents an validation information item about
@@ -70,21 +71,21 @@ public class SwordValidationInfo {
private SwordValidationInfoType type;
/** List of nested validation info items */
private ArrayList<SwordValidationInfo> elementInfo;
private List<SwordValidationInfo> elementInfo;
private ArrayList<SwordValidationInfo> attributeInfo;
private List<SwordValidationInfo> attributeInfo;
/**
* List of validation info notes that were generated during
* an unmarshal stage.
*/
private ArrayList<SwordValidationInfo> unmarshallElementInfo;
private List<SwordValidationInfo> unmarshallElementInfo;
/**
* List of validation info notes that were generated during an
* unmarshal stage.
*/
private ArrayList<SwordValidationInfo> unmarshallAttributeInfo;
private List<SwordValidationInfo> unmarshallAttributeInfo;
public static final String UNKNOWN_ELEMENT = "This element is present, but it is not used as part of the SWORD profile";
@@ -388,8 +389,8 @@ public class SwordValidationInfo {
* @param attributeItems
*/
public void addUnmarshallValidationInfo(
ArrayList<SwordValidationInfo> elementItems,
ArrayList<SwordValidationInfo> attributeItems)
List<SwordValidationInfo> elementItems,
List<SwordValidationInfo> attributeItems)
{
if( elementItems != null )
{

2
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/Workspace.java
View File

@@ -304,7 +304,7 @@ public class Workspace extends XmlElement implements SwordElementInterface
* @param existing
* @return
*/
protected SwordValidationInfo validate(ArrayList<SwordValidationInfo> existing,
protected SwordValidationInfo validate(List<SwordValidationInfo> existing,
Properties validationContext)
{
boolean validateAll = (existing == null );

3
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/base/XmlElement.java
View File

@@ -37,6 +37,7 @@
package org.purl.sword.base;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import nu.xom.Attribute;
import nu.xom.Element;
@@ -322,7 +323,7 @@ public abstract class XmlElement
public abstract SwordValidationInfo validate(Properties validationContext);
protected void processUnexpectedAttributes(Element element, ArrayList<SwordValidationInfo> attributeItems)
protected void processUnexpectedAttributes(Element element, List<SwordValidationInfo> attributeItems)
{
int attributeCount = element.getAttributeCount();
Attribute attribute = null;

5
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/mapper/BrowseItemForm.java
View File

@@ -41,6 +41,7 @@ package org.dspace.app.xmlui.aspect.administrative.mapper;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.dspace.app.xmlui.cocoon.AbstractDSpaceTransformer;
import org.dspace.app.xmlui.wing.Message;
@@ -101,7 +102,7 @@ public class BrowseItemForm extends AbstractDSpaceTransformer {
int collectionID = parameters.getParameterAsInteger("collectionID",-1);
Collection collection = Collection.find(context,collectionID);
ArrayList<Item> items = getMappedItems(collection);
List<Item> items = getMappedItems(collection);
// DIVISION: browse-items
Division div = body.addInteractiveDivision("browse-items",contextPath + "/admin/mapper", Division.METHOD_GET,"primary administrative mapper");
@@ -188,7 +189,7 @@ public class BrowseItemForm extends AbstractDSpaceTransformer {
*
* @param collection The collection to look in.
*/
private ArrayList<Item> getMappedItems(Collection collection) throws SQLException
private List<Item> getMappedItems(Collection collection) throws SQLException
{
ArrayList<Item> items = new ArrayList<Item>();

3
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/AbstractAdapter.java
View File

@@ -46,6 +46,7 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.dspace.app.util.Util;
import org.dspace.app.xmlui.wing.AttributeMap;
@@ -131,7 +132,7 @@ public abstract class AbstractAdapter
/** The variables that dictate what part of the METS document to render */
List<String> sections = new ArrayList<String>();
List<String> dmdTypes = new ArrayList<String>();
HashMap<String,List> amdTypes = new HashMap<String,List>();
Map<String,List> amdTypes = new HashMap<String,List>();
List<String> fileGrpTypes = new ArrayList<String>();
List<String> structTypes = new ArrayList<String>();

5
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/DSpaceObjectManager.java
View File

@@ -43,6 +43,7 @@ package org.dspace.app.xmlui.objectmanager;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.dspace.app.xmlui.wing.ObjectManager;
import org.dspace.app.xmlui.wing.WingException;
@@ -186,11 +187,11 @@ public class DSpaceObjectManager implements ObjectManager
* For the DSpace implementation we just return a hash of one entry which contains
* a reference to this repository's metadata.
*/
public HashMap<String,String> getAllManagedRepositories() throws WingException
public Map<String,String> getAllManagedRepositories() throws WingException
{
String handlePrefix = HandleManager.getPrefix();
HashMap<String,String> allRepositories = new HashMap<String,String>();
Map<String,String> allRepositories = new HashMap<String,String>();
allRepositories.put(handlePrefix, "/metadata/internal/repository/"+handlePrefix +"/mets.xml");
return allRepositories;

8
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/objectmanager/ItemAdapter.java
View File

@@ -64,10 +64,8 @@ import org.xml.sax.helpers.XMLReaderFactory;
import java.io.IOException;
import java.io.InputStream;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.*;
import org.dspace.content.DSpaceObject;
@@ -109,7 +107,7 @@ public class ItemAdapter extends AbstractAdapter
/** A hashmap of all Files and their corresponding space separated list of
administrative metadata sections */
private HashMap<String,StringBuffer> fileAmdSecIDs = new HashMap<String,StringBuffer>();
private Map<String,StringBuffer> fileAmdSecIDs = new HashMap<String,StringBuffer>();
// DSpace DB context
private Context context;

3
dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/ObjectManager.java
View File

@@ -41,6 +41,7 @@
package org.dspace.app.xmlui.wing;
import java.util.HashMap;
import java.util.Map;
/**
* The object manager is a class that must be implemented by each specific repository
@@ -96,5 +97,5 @@ public interface ObjectManager
* hash should be of the form repository identifier as the key,
* and the value for each key is a metadata URL.
*/
public HashMap<String,String> getAllManagedRepositories() throws WingException;
public Map<String,String> getAllManagedRepositories() throws WingException;
}

3
dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/RepositoryMeta.java
View File

@@ -41,6 +41,7 @@
package org.dspace.app.xmlui.wing.element;
import java.util.HashMap;
import java.util.Map;
import org.dspace.app.xmlui.wing.AttributeMap;
import org.dspace.app.xmlui.wing.ObjectManager;
@@ -76,7 +77,7 @@ public class RepositoryMeta extends AbstractWingElement implements WingMergeable
private boolean merged = false;
/** The registered repositories on this page */
private HashMap<String,String> repositories = new HashMap<String,String>();
private Map<String,String> repositories = new HashMap<String,String>();
/**
* Construct a new RepositoryMeta