[Cdk-commits] CVS: cdk/src/org/openscience/cdk/applications/jchempaint JChemPaintMenuBar.java,1.13,1.14 JChemPaintEditorPanel.java,1.39,1.40

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22961/src/org/openscience/cdk/applications/jchempaint

Modified Files:
	JChemPaintMenuBar.java JChemPaintEditorPanel.java 
Log Message:
Fixed the Plugin menu: the menu creating in customizeView() must be after setting up the CDKPluginManager.

Index: JChemPaintMenuBar.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/JChemPaintMenuBar.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JChemPaintMenuBar.java	4 Aug 2005 14:35:43 -0000	1.13
+++ JChemPaintMenuBar.java	18 Aug 2005 22:49:33 -0000	1.14
@@ -102,9 +102,15 @@
 	 */
 	protected void createMenubar(JChemPaintPanel jcpPanel, boolean addPluginMenu, String menuDefinition) {
 		addNormalMenuBar(jcpPanel, menuDefinition);
-		if (addPluginMenu && ((JChemPaintEditorPanel)jcpPanel).getPluginManager() != null) {
-            logger.info("Creating Plugin menu");
-            this.add(((JChemPaintEditorPanel)jcpPanel).getPluginManager().getMenu());
+		if (addPluginMenu) {
+			logger.info("Creating plugin menu");
+			if (((JChemPaintEditorPanel)jcpPanel).getPluginManager() != null) {
+	            this.add(((JChemPaintEditorPanel)jcpPanel).getPluginManager().getMenu());
+			} else {
+				logger.warn("Could not find a plugin manager!");
+			}
+		} else {
+			logger.info("Not creating plugin menu");
 		}
 		this.add(Box.createHorizontalGlue());
 		this.add(createMenu(jcpPanel, "help"));

Index: JChemPaintEditorPanel.java
===================================================================
RCS file: /cvsroot/cdk/cdk/src/org/openscience/cdk/applications/jchempaint/JChemPaintEditorPanel.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- JChemPaintEditorPanel.java	27 Jul 2005 18:50:14 -0000	1.39
+++ JChemPaintEditorPanel.java	18 Aug 2005 22:49:33 -0000	1.40
@@ -130,8 +130,8 @@
 		if (isEmbedded == true) {
 		    this.setEmbedded();
 		}
-    customizeView();
 		setupPluginManager();
+	    customizeView();
 		super.setJChemPaintModel(new JChemPaintModel());
 		setShowToolBar(true, lines);
 		if (logger == null)
@@ -282,7 +282,7 @@
 			pluginManager = new CDKPluginManager(jcph.getJChemPaintDir().toString(), this);
 
 			// load the plugins that come with JCP itself
-			// pluginManager.loadPlugin("org.openscience.cdkplugin.dirbrowser.DirBrowserPlugin");
+			pluginManager.loadPlugin("org.openscience.cdkplugin.dirbrowser.DirBrowserPlugin");
 
 			// load the user plugins
 			pluginManager.loadPlugins(new File(jcph.getJChemPaintDir(), "plugins").toString());
@@ -292,8 +292,8 @@
 				pluginManager.loadPlugins(System.getProperty("plugin.dir"));
 			}
 		} catch (Exception exc) {
-			//logger.error("Could not initialize Plugin-Manager. I might be in a sandbox.");
-			//logger.debug(exc);
+			logger.error("Could not initialize Plugin-Manager. I might be in a sandbox.");
+			logger.debug(exc);
 		}
 	}