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

[DS-707] Generify Map usage

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5615 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-24 20:41:34 +00:00
parent 4e808b6dac
commit 9fd9b94e26
7 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
View File

@@ -40,7 +40,8 @@ import java.io.FileWriter;
import java.io.IOException;
import java.sql.SQLException;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.HashMap;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -96,10 +97,10 @@ public class StructBuilder
private static org.jdom.Document xmlOutput = new org.jdom.Document(new Element("imported_structure"));
/** a hashtable to hold metadata for the collection being worked on */
private static Hashtable collectionMap = new Hashtable();
private static Map<String, String> collectionMap = new HashMap<String, String>();
/** a hashtable to hold metadata for the community being worked on */
private static Hashtable communityMap = new Hashtable();
private static Map<String, String> communityMap = new HashMap<String, String>();
/**
* Main method to be run from the command line to import a structure into
@@ -429,16 +430,12 @@ public class StructBuilder
// now update the metadata
Node tn = communities.item(i);
Enumeration keys = communityMap.keys();
while (keys.hasMoreElements())
for (Map.Entry<String, String> entry : communityMap.entrySet())
{
Node node = null;
String key = (String) keys.nextElement();
NodeList nl = XPathAPI.selectNodeList(tn, key);
NodeList nl = XPathAPI.selectNodeList(tn, entry.getKey());
if (nl.getLength() == 1)
{
node = nl.item(0);
community.setMetadata((String) communityMap.get(key), getStringValue(node));
community.setMetadata(entry.getValue(), getStringValue(nl.item(0)));
}
}
@@ -544,16 +541,12 @@ public class StructBuilder
// import the rest of the metadata
Node tn = collections.item(i);
Enumeration keys = collectionMap.keys();
while (keys.hasMoreElements())
for (Map.Entry<String, String> entry : collectionMap.entrySet())
{
Node node = null;
String key = (String) keys.nextElement();
NodeList nl = XPathAPI.selectNodeList(tn, key);
NodeList nl = XPathAPI.selectNodeList(tn, entry.getKey());
if (nl.getLength() == 1)
{
node = nl.item(0);
collection.setMetadata((String) collectionMap.get(key), getStringValue(node));
collection.setMetadata(entry.getValue(), getStringValue(nl.item(0)));
}
}