[freenet-cvs] r16307 - in trunk/apps/Echo/src/plugins/echo: . editor

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-12-05 12:34:12 +0000 (Wed, 05 Dec 2007)
New Revision: 16307

Modified:
   trunk/apps/Echo/src/plugins/echo/Project.java
   trunk/apps/Echo/src/plugins/echo/ProjectManager.java
   trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java
Log:
Echo: don't store the request-uri but an InsertableClientSSK

Modified: trunk/apps/Echo/src/plugins/echo/Project.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/Project.java	2007-12-05 12:21:40 UTC (rev 16306)
+++ trunk/apps/Echo/src/plugins/echo/Project.java	2007-12-05 12:34:12 UTC (rev 16307)
@@ -4,6 +4,7 @@
 
 import freenet.keys.FreenetURI;
 
+import freenet.keys.InsertableClientSSK;
 import java.util.Properties;
 import java.io.File;
 import java.io.FileInputStream;
@@ -63,7 +64,7 @@
 	*	Returns the insert URI of this project
 	*	@return the insert URI of this project
 	*/
-	public FreenetURI getInsertURI() {
+	public InsertableClientSSK getInsertURI() {
 		
 		return getURI("insertURI");
 		
@@ -75,18 +76,18 @@
 	*/
 	public FreenetURI getRequestURI() {
 		
-		return getURI("requestURI");
+		return getURI("insertURI").getURI();
 	
 	}
 
-	private FreenetURI getURI(String key) {
+	private InsertableClientSSK getURI(String key) {
 		
 		String str = projectConfig.getProperty(key);
 		if(str == null)
 			return null;
 		
 		try {
-			return new FreenetURI(str);
+			return InsertableClientSSK.create(new FreenetURI(str));
 			
 		} catch (MalformedURLException mue) {
 			return null;
@@ -97,23 +98,13 @@
 	*	Registers the URI to insert this project
 	*	@param uri the new insert URI
 	*/
-	public void setInsertURI(FreenetURI uri) {
+	public void setInsertURI(InsertableClientSSK uri) {
 	
 		projectConfig.setProperty("insertURI", uri.toString());
 	
 	}
 	
 	/**
-	*	Registers the URI to request the generated files of this project
-	*	@param uri the new request URI
-	*/
-	public void setRequestURI(FreenetURI uri) {
-	
-		projectConfig.setProperty("requestURI", uri.toString());
-	
-	}
-	
-	/**
 	*	Returns a NodesManager instance for this project
 	*	@return a NodesManager instance for this project
 	*/

Modified: trunk/apps/Echo/src/plugins/echo/ProjectManager.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/ProjectManager.java	2007-12-05 12:21:40 UTC (rev 16306)
+++ trunk/apps/Echo/src/plugins/echo/ProjectManager.java	2007-12-05 12:34:12 UTC (rev 16307)
@@ -90,8 +90,7 @@
 			conf.setProperty("title", projectTitle);
 			
 			InsertableClientSSK key = InsertableClientSSK.createRandom(_e.respirator.getNode().random, projectTitle);
-			conf.setProperty("insertURI", key.getInsertURI().toString());
-			conf.setProperty("requestURI", key.getURI().toString());
+			conf.setProperty("insertURI", key.toString());
 			
 			conf.storeToXML(configFile, null);
 			configFile.close();

Modified: trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java	2007-12-05 12:21:40 UTC (rev 16306)
+++ trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java	2007-12-05 12:34:12 UTC (rev 16307)
@@ -5,6 +5,7 @@
 import plugins.echo.SiteGenerator;
 import plugins.echo.SimpleDirectoryInserter;
 import freenet.keys.FreenetURI;
+import freenet.keys.InsertableClientSSK;
 import freenet.support.api.HTTPRequest;
 import freenet.node.fcp.FCPServer;
 
@@ -23,8 +24,7 @@
 	private Project project;
 	private FCPServer fcpServer;
 	private String formPassword;
-	private	FreenetURI insertURI;
-	private FreenetURI requestURI;
+	private	InsertableClientSSK insertURI;
  
 	public InsertPage(ProjectManager projectManager, FCPServer server, String formPassword){
 	
@@ -43,40 +43,25 @@
 				
 // 				if(clientPutDir == null || clientPutDir.hasFinished()) {
 					insertURI = null;
-					requestURI = null;
 					
 					try {
-						insertURI = new FreenetURI(request.getPartAsString("insert-key", MAX_KEY_LENGTH));
+						insertURI = InsertableClientSSK.create(new FreenetURI(request.getPartAsString("insert-key", MAX_KEY_LENGTH)));
 					} catch(MalformedURLException mue) {
 						appendError("Invalid insertion key : " + mue.getMessage());
 					}
 					
-					try {
-						requestURI = new FreenetURI(request.getPartAsString("request-key", MAX_KEY_LENGTH));
-					} catch(MalformedURLException mue) {
-						appendError("Invalid request key : " + mue.getMessage());
-					}
-					
-					if(insertURI != null && requestURI != null) {
-					
-						
-						if (! project.getInsertURI().equals(insertURI)){
+					if(insertURI != null) {
+						if (!project.getInsertURI().equals(insertURI)){
 							project.setInsertURI(insertURI);
-							
 						}
 						
-						if (! project.getRequestURI().equals(requestURI)) {
-							project.setRequestURI(requestURI);
-							
-						}
-
 						try {
 
 							SiteGenerator generator = new SiteGenerator(project);
 							generator.generate();
 
 							SimpleDirectoryInserter inserter = new SimpleDirectoryInserter(fcpServer);
-							inserter.insert(new File(project.getProjectDir(), "out"), "index.html", insertURI);
+							inserter.insert(new File(project.getProjectDir(), "out"), "index.html", insertURI.getInsertURI());
 							
 							appendContent(HTMLHelper.link("/queue/", "Go to the queue page."));
 							
@@ -90,7 +75,6 @@
 // 				}
 		} else {
 			insertURI = project.getInsertURI();
-			requestURI = project.getRequestURI();
 			appendContent(insertForm());
 		}
 	}
@@ -102,14 +86,12 @@
 		HTMLHelper.label(form, "insert-key", "Insert key");
 		Element insertKeyInput = HTMLHelper.input(form, "text", "insert-key");
 		insertKeyInput.addAttribute(new Attribute("size", String.valueOf(KEY_INPUT_SIZE)));
-		if(insertURI != null)
-			insertKeyInput.addAttribute(new Attribute("value", insertURI.toString()));
+		insertKeyInput.addAttribute(new Attribute("value", insertURI.toString()));
 
 		HTMLHelper.label(form, "request-key", "Request key");
 		Element requestKeyInput = HTMLHelper.input(form, "text", "request-key");
 		requestKeyInput.addAttribute(new Attribute("size", String.valueOf(KEY_INPUT_SIZE)));
-		if(requestURI != null)
-			requestKeyInput.addAttribute(new Attribute("value", requestURI.toString()));
+		requestKeyInput.addAttribute(new Attribute("value", insertURI.getURI().toString()));
 
 		HTMLHelper.input(form, "submit", "submit");