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

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

Revision: 2136
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2136&view=rev
Author:   bradtofel
Date:     2008-01-14 18:58:30 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
REFACTOR: moved resolveUrl() from UrlCanonicalizer to UrlOperations

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java	2008-01-15 02:57:30 UTC (rev 2135)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayRenderer.java	2008-01-15 02:58:30 UTC (rev 2136)
@@ -43,7 +43,7 @@
 import org.archive.wayback.replay.HTMLPage;
 import org.archive.wayback.replay.HttpHeaderProcessor;
 import org.archive.wayback.replay.HttpHeaderOperation;
-import org.archive.wayback.util.UrlCanonicalizer;
+import org.archive.wayback.util.url.UrlOperations;
 
 /**
  * ReplayRenderer responsible for marking up HTML pages so they replay in
@@ -139,7 +139,7 @@
 			String baseUrl = result.getAbsoluteUrl();
 			String cd = result.getCaptureDate();
 			// by the spec, these should be absolute already, but just in case:
-			String u = UrlCanonicalizer.resolveUrl(baseUrl, value);
+			String u = UrlOperations.resolveUrl(baseUrl, value);
 
 			output.put(key, uriConverter.makeReplayURI(cd,u));
 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java	2008-01-15 02:57:30 UTC (rev 2135)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlTransparentReplayRenderer.java	2008-01-15 02:58:30 UTC (rev 2136)
@@ -5,7 +5,7 @@
 import org.archive.wayback.ResultURIConverter;
 import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.replay.TransparentReplayRenderer;
-import org.archive.wayback.util.UrlCanonicalizer;
+import org.archive.wayback.util.url.UrlOperations;
 
 /**
  * Slight extension to TransparentReplayRenderer, which rewrites Location and
@@ -32,7 +32,7 @@
 			String baseUrl = result.getAbsoluteUrl();
 			String cd = result.getCaptureDate();
 			// by the spec, these should be absolute already, but just in case:
-			String u = UrlCanonicalizer.resolveUrl(baseUrl, value);
+			String u = UrlOperations.resolveUrl(baseUrl, value);
 
 			output.put(key, uriConverter.makeReplayURI(cd,u));
 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java	2008-01-15 02:57:30 UTC (rev 2135)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayRenderer.java	2008-01-15 02:58:30 UTC (rev 2136)
@@ -25,8 +25,6 @@
 package org.archive.wayback.domainprefix;
 
 import java.io.IOException;
-//import java.util.Date;
-//import java.util.Iterator;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -37,7 +35,6 @@
 
 import org.archive.wayback.ReplayRenderer;
 import org.archive.wayback.ResultURIConverter;
-//import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.core.Resource;
 import org.archive.wayback.core.SearchResult;
 import org.archive.wayback.core.SearchResults;
@@ -47,8 +44,7 @@
 import org.archive.wayback.replay.HTMLPage;
 import org.archive.wayback.replay.HttpHeaderProcessor;
 import org.archive.wayback.replay.HttpHeaderOperation;
-//import org.archive.wayback.util.StringFormatter;
-import org.archive.wayback.util.UrlCanonicalizer;
+import org.archive.wayback.util.url.UrlOperations;
 
 /**
  *
@@ -126,7 +122,7 @@
 			String baseUrl = result.getAbsoluteUrl();
 			String cd = result.getCaptureDate();
 			// by the spec, these should be absolute already, but just in case:
-			String u = UrlCanonicalizer.resolveUrl(baseUrl, value);
+			String u = UrlOperations.resolveUrl(baseUrl, value);
 
 			output.put(key, uriConverter.makeReplayURI(cd,u));
 


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