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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-12-05 12:58:26 +0000 (Wed, 05 Dec 2007)
New Revision: 16310

Modified:
   trunk/apps/Echo/src/plugins/echo/Project.java
   trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java
Log:
Echo: doh

Modified: trunk/apps/Echo/src/plugins/echo/Project.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/Project.java	2007-12-05 12:45:00 UTC (rev 16309)
+++ trunk/apps/Echo/src/plugins/echo/Project.java	2007-12-05 12:58:26 UTC (rev 16310)
@@ -64,9 +64,9 @@
 	*	Returns the insert URI of this project
 	*	@return the insert URI of this project
 	*/
-	public InsertableClientSSK getInsertURI() {
+	public FreenetURI getInsertURI() {
 		
-		return getURI("insertURI");
+		return getURI("insertURI").getInsertURI();
 		
 	}
 

Modified: trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java	2007-12-05 12:45:00 UTC (rev 16309)
+++ trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java	2007-12-05 12:58:26 UTC (rev 16310)
@@ -25,7 +25,6 @@
 	private Project project;
 	private FCPServer fcpServer;
 	private String formPassword;
-	private	InsertableClientSSK insertURI;
  
 	public InsertPage(ProjectManager projectManager, FCPServer server, String formPassword){
 	
@@ -39,57 +38,45 @@
 
 		clear();
 		project = projectManager.getCurrentProject();
+		USK requestURI = null;
+		try {
+			requestURI = USK.create(project.getRequestURI());
+		} catch (MalformedURLException e) {} // will NPE anyway
 
-		if (request.isPartSet("insert-key")) {
-				
-// 				if(clientPutDir == null || clientPutDir.hasFinished()) {
-					insertURI = null;
-					
-					try {
-						insertURI = InsertableClientSSK.create(new FreenetURI(request.getPartAsString("insert-key", MAX_KEY_LENGTH)));
-					} catch(MalformedURLException mue) {
-						appendError("Invalid insertion key : " + mue.getMessage());
-					}
-					
-					if(insertURI != null) {						
-						try {
-							SiteGenerator generator = new SiteGenerator(project);
-							generator.generate();
+		if (request.isPartSet("insert-key")) {					
+			try {
+				SiteGenerator generator = new SiteGenerator(project);
+				generator.generate();
 
-							SimpleDirectoryInserter inserter = new SimpleDirectoryInserter(fcpServer);
-							inserter.insert(new File(project.getProjectDir(), "out"), "index.html", insertURI.getInsertURI());
-							
-							insertURI = InsertableClientSSK.create(insertURI.getInsertURI().setSuggestedEdition(insertURI.getURI().getSuggestedEdition() + 1));
-							project.setInsertURI(insertURI);
-							
-							appendContent(HTMLHelper.link("/queue/", "Go to the queue page."));
-						} catch (Exception e) {
-							appendError(e);
-						}
-					} else 
-						appendContent(insertForm());
+				SimpleDirectoryInserter inserter = new SimpleDirectoryInserter(fcpServer);
+				inserter.insert(new File(project.getProjectDir(), "out"), "index.html", project.getInsertURI());
+
+				InsertableClientSSK insertURI = InsertableClientSSK.create(project.getInsertURI().setSuggestedEdition(requestURI.suggestedEdition + 1));
+				project.setInsertURI(insertURI);
+
+				appendContent(HTMLHelper.link("/queue/", "Go to the queue page."));
+			} catch(Exception e) {
+				appendError(e);
+			}
 // 				}
 		} else {
-			insertURI = project.getInsertURI();
-			appendContent(insertForm());
+			appendContent(insertForm(requestURI));
 		}
 	}
 
-	private Element insertForm() {
+	private Element insertForm(USK uri) {
 
 		Element form = HTMLHelper.form("", formPassword);
 
 		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)));
-		insertKeyInput.addAttribute(new Attribute("value", insertURI.toString()));
+		insertKeyInput.addAttribute(new Attribute("value", uri.getBaseSSK().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)));
-		try {
-			requestKeyInput.addAttribute(new Attribute("value", USK.create(insertURI.getURI()).toString()));
-		} catch (MalformedURLException e) {}
+		requestKeyInput.addAttribute(new Attribute("value", uri.toString()));
 
 		HTMLHelper.input(form, "submit", "submit");