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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-12-05 13:11:16 +0000 (Wed, 05 Dec 2007)
New Revision: 16311

Modified:
   trunk/apps/Echo/src/plugins/echo/Echo.java
   trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java
Log:
Echo: a few things need to be done when the plugin respirator is available

Modified: trunk/apps/Echo/src/plugins/echo/Echo.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/Echo.java	2007-12-05 12:58:26 UTC (rev 16310)
+++ trunk/apps/Echo/src/plugins/echo/Echo.java	2007-12-05 13:11:16 UTC (rev 16311)
@@ -42,9 +42,7 @@
 	private final XSLTransform transform;
 	private final HashMap<String,Page> pages;
 	private final ProjectManager projectManager;
-	private final Project project;
-	private final NodesManager nodesManager;
-	private final BlockManager blockManager;
+	private Project project;
 	private final Page welcomePage;
 	
 	public Echo() throws Exception {
@@ -64,14 +62,7 @@
 			this.transform = new XSLTransform(styleSheet);
 
 			this.projectManager = new ProjectManager(this);
-			if(projectManager.countProjects() == 0)
-				projectManager.newProject("My Flog");
 
-			this.project = projectManager.loadProject("001");
-			this.nodesManager = project.getNodesManager();
-			this.blockManager = project.getBlockManager();
-			transform.setParameter("baseDir", project.getProjectDir().getAbsolutePath() + "/");
-
 			this.welcomePage = StaticPage.createFromContentFile("Welcome", "welcome.xml");
 			this.pages = new HashMap<String, Page>();
 		} catch (Exception e) {
@@ -84,6 +75,14 @@
 	public void runPlugin(PluginRespirator p) {
 		try {
 			this.respirator = p;
+			if(projectManager.countProjects() == 0)
+				projectManager.newProject("My Flog");
+
+			this.project = projectManager.loadProject("001");
+			NodesManager nodesManager = project.getNodesManager();
+			BlockManager blockManager = project.getBlockManager();
+			transform.setParameter("baseDir", project.getProjectDir().getAbsolutePath() + "/");
+			
 			String formPsw = respirator.getNode().clientCore.formPassword;
 
 			pages.put("plugins.echo.Echo", welcomePage);

Modified: trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java
===================================================================
--- trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java	2007-12-05 12:58:26 UTC (rev 16310)
+++ trunk/apps/Echo/src/plugins/echo/editor/InsertPage.java	2007-12-05 13:11:16 UTC (rev 16311)
@@ -41,7 +41,9 @@
 		USK requestURI = null;
 		try {
 			requestURI = USK.create(project.getRequestURI());
-		} catch (MalformedURLException e) {} // will NPE anyway
+		} catch (MalformedURLException e) {
+			appendError(e);
+		}
 
 		if (request.isPartSet("insert-key")) {					
 			try {