[Archive-access-cvs] SF.net SVN: archive-access: [1854] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback

[<bra...@us...>]

Revision: 1854
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1854&view=rev
Author:   bradtofel
Date:     2007-07-24 17:15:12 -0700 (Tue, 24 Jul 2007)

Log Message:
-----------
INTERFACE: HTTP headers are now stored in a Map instead of a Properties.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Resource.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/UIReplayResult.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Resource.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Resource.java	2007-07-20 01:27:27 UTC (rev 1853)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Resource.java	2007-07-25 00:15:12 UTC (rev 1854)
@@ -27,9 +27,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.logging.Logger;
 
@@ -81,7 +82,7 @@
 	 * Expandable property bag for holding metadata associated with this 
 	 * resource
 	 */
-	Properties metaData = new Properties();
+	Hashtable<String,String> metaData = new Hashtable<String,String>();
 	
 	private BufferedInputStream bis;
 	
@@ -117,16 +118,17 @@
 
 			// copy all ARC record header fields to metaData, prefixing with 
 			// ARC_META_PREFIX
-			Map headerMetaMap = arcRecord.getMetaData().getHeaderFields();
-			Set keys = headerMetaMap.keySet();
-			Iterator itr = keys.iterator();
+			@SuppressWarnings("unchecked")
+			Map<String,String> headerMetaMap = arcRecord.getMetaData().getHeaderFields();
+			Set<String> keys = headerMetaMap.keySet();
+			Iterator<String> itr = keys.iterator();
 			while(itr.hasNext()) {
-				Object metaKey = itr.next();
-				Object metaValue = headerMetaMap.get(metaKey);
-				String metaStringValue = (metaValue == null) ? "" :
-					metaValue.toString();
-				metaData.put(ARC_META_PREFIX + metaKey.toString(), 
-						metaStringValue);
+				String metaKey = itr.next();
+				String metaValue = headerMetaMap.get(metaKey);
+				if(metaValue == null) {
+					metaValue = "";
+				}
+				metaData.put(ARC_META_PREFIX + metaKey,metaValue);
 			}
 		
 			parsedHeader = true;			
@@ -138,13 +140,13 @@
 	 * @return a Properties of all elements in metaData starting with 'prefix'.
 	 *         keys in the returned Properties have 'prefix' removed.
 	 */
-	public Properties filterMeta(String prefix) {
-		Properties matching = new Properties();
-		for (Enumeration e = metaData.keys(); e.hasMoreElements();) {
-			String key = (String) e.nextElement();
+	public Map<String,String> filterMeta(String prefix) {
+		HashMap<String,String> matching = new HashMap<String,String>();
+		for (Enumeration<String> e = metaData.keys(); e.hasMoreElements();) {
+			String key = e.nextElement();
 			if (key.startsWith(prefix)) {
 				String finalKey = key.substring(prefix.length());
-				String value = (String) metaData.get(key);
+				String value = metaData.get(key);
 				matching.put(finalKey, value);
 			}
 		}
@@ -154,14 +156,14 @@
 	/**
 	 * @return a Properties containing all HTTP header fields for this record
 	 */
-	public Properties getHttpHeaders() {
+	public Map<String,String> getHttpHeaders() {
 		return filterMeta(HTTP_HEADER_PREFIX);
 	}
 
 	/**
 	 * @return a Properties containing all ARC Meta fields for this record
 	 */
-	public Properties getARCMetadata() {
+	public Map<String,String> getARCMetadata() {
 		return filterMeta(ARC_META_PREFIX);
 	}
 	

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/UIReplayResult.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/UIReplayResult.java	2007-07-20 01:27:27 UTC (rev 1853)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/UIReplayResult.java	2007-07-25 00:15:12 UTC (rev 1854)
@@ -25,7 +25,7 @@
 package org.archive.wayback.replay;
 
 import java.io.IOException;
-import java.util.Properties;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -152,7 +152,7 @@
 	/**
 	 * @return the HTTP Headers as Properties
 	 */
-	public Properties getHttpHeaders() {
+	public Map<String,String> getHttpHeaders() {
 		return resource.getHttpHeaders();
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.