[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-CVS ] plugins/Console/console ConsolePlugin.java,1.67,1.68 ProjectTreeListener.java,1.7,1.8
From:       Alan Ezust <ezust () users ! sourceforge ! net>
Date:       2005-09-29 21:33:25
Message-ID: E1EL61y-0003ZE-Rw () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/jedit/plugins/Console/console
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23072/console

Modified Files:
	ConsolePlugin.java ProjectTreeListener.java 
Log Message:
Removed Manual Registration code in favor of setting properties,
as per projectviewer.event package API docs.

However, I am currently unable to see any evidence of a listener being registered.




Index: ConsolePlugin.java
===================================================================
RCS file: /cvsroot/jedit/plugins/Console/console/ConsolePlugin.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- ConsolePlugin.java	24 Sep 2005 06:49:08 -0000	1.67
+++ ConsolePlugin.java	29 Sep 2005 21:33:23 -0000	1.68
@@ -29,7 +29,6 @@
 import java.io.IOException;
 import java.io.StreamTokenizer;
 import java.io.StringReader;
-import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -111,21 +110,6 @@
 		CommandoToolBar.init();
 
 
-		/*
-		try
-		{
-			ClassLoader cl = new JARClassLoader();
-			projectTreeListener = cl.loadClass("console.ProjectTreeListener");
-			Method m = projectTreeListener.getMethod("reset", new Class[] {});
-			m.invoke(null, new Object[] {});
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-			Log.log(Log.WARNING, e, "Failed to register ProjectTreeListener");
-			// ProjectViewer was probably not installed but we don't
-			// care.
-		} */
 	} // }}}
 
 	// {{{ stop() method
@@ -134,14 +118,6 @@
 		BeanShell.getNameSpace().addCommandPath(CMD_PATH, getClass());
 		CommandoToolBar.remove();
 		jEdit.removeActionSet(allCommands);
-		/*
-		if (projectTreeListener != null) try 
-		{
-			Method m = projectTreeListener.getMethod("cleanup", new Class[] {});
-			m.invoke(null, new Object[] {});
-		} 
-		catch (Exception e) {}
-		*/
 	} // }}}
 
 	// {{{ handleMessage() method

Index: ProjectTreeListener.java
===================================================================
RCS file: /cvsroot/jedit/plugins/Console/console/ProjectTreeListener.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ProjectTreeListener.java	24 Sep 2005 02:48:37 -0000	1.7
+++ ProjectTreeListener.java	29 Sep 2005 21:33:23 -0000	1.8
@@ -24,19 +24,15 @@
 package console;
 
 // {{{ imports
-import java.util.Iterator;
-
-import javax.swing.JTree;
 
+import org.gjt.sp.jedit.BeanShell;
 import org.gjt.sp.jedit.EditAction;
 import org.gjt.sp.jedit.PluginJAR;
 import org.gjt.sp.jedit.View;
 import org.gjt.sp.jedit.jEdit;
 import org.gjt.sp.jedit.gui.DockableWindowManager;
-import org.gjt.sp.util.Log;
 
 import bsh.NameSpace;
-import bsh.UtilEvalError;
 
 import projectviewer.ProjectViewer;
 import projectviewer.event.ProjectViewerAdapter;
@@ -57,25 +53,22 @@
 
 public class ProjectTreeListener extends ProjectViewerAdapter
 {
-
-	// {{{ Reset() - static singleton
-	/**
-	 * Creates instance if necessary, 
-	 * loads properties, 
-	 * registers listener if necessary
-	 */
-	public static void reset()
-	{
-		if (instance == null)
-		{
-			instance = new ProjectTreeListener();
-		}
-		else {
-			instance.update();
+	
+	public static void reset() {
+		if (instance == null) {
+			new ProjectTreeListener();
 		}
+		instance.update();
+	}
+	
+	public ProjectTreeListener()
+	{
+		update();
+		instance = this;
 	}
 	// }}}
 
+	
 	// {{{ projectLoaded()
 	/**
 	 * On project change...
@@ -97,9 +90,11 @@
 				{
 				}
 				View view = jEdit.getActiveView();
-				EditAction action = jEdit
-						.getAction("chdir-pv-root");
-				action.invoke(view);
+				String code = "changeToPvRoot(view);";
+				NameSpace namespace =  BeanShell.getNameSpace();
+				BeanShell.eval(view, namespace, code);
+/*				EditAction action = jEdit.getAction("chdir-pv-root");
+				action.invoke(view); */
 			}
 		}.start();
 	}
@@ -126,52 +121,7 @@
 	}
 	// }}}
 	
-	// {{{ private ctor
-	/** Private ctor */
-	private ProjectTreeListener()
-	{
-		update();
-	}
-	// }}}
-	
-	
-	public static void cleanup() {
-		PluginJAR jar = jEdit.getPlugin("console.ConsolePlugin").getPluginJAR();
-		View view = jEdit.getActiveView();
-		DockableWindowManager wm = view
-				.getDockableWindowManager();
-		ProjectViewer viewer = (ProjectViewer) wm
-				.getDockable("projectviewer");
-		viewer.removeProjectViewerListeners(jar);
-		
-	}
-	
-	// {{{ Register()
-	/** Registers a listener */
-	private void register()
-	{
-		if (registered)
-			return;
-		try
-		{
-			View view = jEdit.getActiveView();
-			DockableWindowManager wm = view
-					.getDockableWindowManager();
-			ProjectViewer viewer = (ProjectViewer) wm
-					.getDockable("projectviewer");
-			//  PluginJAR jar = jEdit.getPlugin("console.ConsolePlugin").getPluginJAR();
-			// TODO: CHECK THAT THIS IS ACTUALLY DOING SOMETHING:
-			// viewer.removeProjectViewerListeners(ProjectTreeListener.class, null);
-			// viewer.removeProjectViewerListeners(jar);
-			viewer.addProjectViewerListener(this, null);
-			registered = true;
-		}
-		catch (Exception e)
-		{
-		}
 
-	}
-	// }}}
 	
 	// {{{ update()
 	/** Reloads properties and updates flags */
@@ -181,14 +131,14 @@
 				.getBooleanProperty("console.changedir.pvchange");
 		onNodeSelection = jEdit
 				.getBooleanProperty("console.changedir.pvselect");
-		register();
+//		register();
 
 	}
 	// }}}
 	
 	// {{{ Data Members 
 	// {{{ Static members 
-	static boolean registered = false;
+//	static boolean registered = false;
 
 	static ProjectTreeListener instance;
 



-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]