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

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

Revision: 2470
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2470&view=rev
Author:   bradtofel
Date:     2008-07-22 01:27:51 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
INTERFACE: added ResultURIConverter argument to renderException()

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ExceptionRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ExceptionRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ExceptionRenderer.java	2008-07-21 23:54:57 UTC (rev 2469)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ExceptionRenderer.java	2008-07-22 01:27:51 UTC (rev 2470)
@@ -54,6 +54,6 @@
 	 */
 	public void renderException(HttpServletRequest httpRequest,
 			HttpServletResponse httpResponse, WaybackRequest wbRequest,
-			WaybackException exception)
+			WaybackException exception, ResultURIConverter uriConverter)
 		throws ServletException, IOException;
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java	2008-07-21 23:54:57 UTC (rev 2469)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java	2008-07-22 01:27:51 UTC (rev 2470)
@@ -33,6 +33,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.archive.wayback.ExceptionRenderer;
+import org.archive.wayback.ResultURIConverter;
 import org.archive.wayback.core.UIResults;
 import org.archive.wayback.core.WaybackRequest;
 
@@ -134,13 +135,14 @@
 	 */
 	public void renderException(HttpServletRequest httpRequest,
 			HttpServletResponse httpResponse, WaybackRequest wbRequest,
-			WaybackException exception) throws ServletException, IOException {
+			WaybackException exception, ResultURIConverter uriConverter)
+		throws ServletException, IOException {
 
 		String jspPath = getExceptionHandler(httpRequest, httpResponse, 
 				wbRequest, exception);
 
 		httpRequest.setAttribute("exception", exception);
-		UIResults uiResults = new UIResults(wbRequest,null,exception);
+		UIResults uiResults = new UIResults(wbRequest,uriConverter,exception);
 		uiResults.forward(httpRequest, httpResponse, jspPath);
 	}
 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2008-07-21 23:54:57 UTC (rev 2469)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2008-07-22 01:27:51 UTC (rev 2470)
@@ -304,7 +304,8 @@
 
 		} catch(WaybackException e) {
 			logNotInArchive(e,wbRequest);
-			exception.renderException(httpRequest, httpResponse, wbRequest, e);
+			exception.renderException(httpRequest, httpResponse, wbRequest, e, 
+					uriConverter);
 		}
 
 		return handled;


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