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

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

Revision: 3110
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3110&view=rev
Author:   bradtofel
Date:     2010-05-18 23:06:38 +0000 (Tue, 18 May 2010)

Log Message:
-----------
REFACTOR: moved mailto: checking into ReplayParseContext

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/ReplayParseContext.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/transformer/URLStringTransformer.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/ReplayParseContext.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/ReplayParseContext.java	2010-05-18 23:05:10 UTC (rev 3109)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/ReplayParseContext.java	2010-05-18 23:06:38 UTC (rev 3110)
@@ -34,6 +34,8 @@
 import org.archive.wayback.util.htmllex.ParseContext;
 
 public class ReplayParseContext extends ParseContext {
+	private static final String MAILTO_PREFIX = "mailto:";
+	private static final String JAVASCRIPT_PREFIX = "javascript:";
 	private ContextResultURIConverterFactory uriConverterFactory = null;
 	private String datespec = null;
 	private JSPExecutor jspExec = null;
@@ -92,7 +94,11 @@
 		return contextualizeUrl(url,"");
 	}
 	public String contextualizeUrl(String url, String flags) {
-	    if(url.startsWith("javascript:")) {
+		// if we get an empty string, just return it:
+		if(url.length() == 0) {
+			return url;
+		}
+	    if(url.startsWith(JAVASCRIPT_PREFIX) || url.startsWith(MAILTO_PREFIX)) {
 	    	return url;
 	    }
 	    url = super.contextualizeUrl(url);

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/transformer/URLStringTransformer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/transformer/URLStringTransformer.java	2010-05-18 23:05:10 UTC (rev 3109)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/html/transformer/URLStringTransformer.java	2010-05-18 23:06:38 UTC (rev 3110)
@@ -32,7 +32,6 @@
  *
  */
 public class URLStringTransformer implements StringTransformer {
-	private static final String MAILTO_PREFIX = "mailto:";
 	private String flags;
 	/** Default constructor */
 	public URLStringTransformer() {}
@@ -45,9 +44,6 @@
 	}
 	
 	public String transform(ReplayParseContext context, String url) {
-		if(url.startsWith(MAILTO_PREFIX)) {
-			return url;
-		}
 		return context.contextualizeUrl(url, flags);
 	}
 


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