Author: dgolovin Date: 2008-06-06 20:37:56 -0400 (Fri, 06 Jun 2008) New Revision: 8622 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPluginStartup.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java Log: Fix exception During tests execution. Code requested for workbench moved to IStartup implementation java.lang.IllegalStateException: Workbench has not been created yet. [java] at org.eclipse.ui.PlatformUI.getWorkbench(PlatformUI.java:92) [java] at org.jboss.tools.common.model.plugin.ModelPlugin.start(ModelPlugin.java:76) [java] at org.eclipse.osgi.framework.internal.core.BundleContextImpl$2.run(BundleContextImpl.java:1009) [java] at java.security.AccessController.doPrivileged(Native Method) Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java 2008-06-07 00:37:27 UTC (rev 8621) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPlugin.java 2008-06-07 00:37:56 UTC (rev 8622) @@ -22,6 +22,7 @@ import org.eclipse.ui.IWindowListener; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.internal.Workbench; import org.jboss.tools.common.log.BaseUIPlugin; import org.jboss.tools.common.log.IPluginLog; import org.jboss.tools.common.model.XModelConstants; @@ -72,22 +73,6 @@ public void start(BundleContext context) throws Exception { System.setProperty(XModelConstants.HOME, EclipseResourceUtil.getInstallPath(context.getBundle())); super.start(context); - try { - /* - FIXME That's not right solution to obtain workbench because there could be no workbench yet - If so it leads to the exception below and problem with model plug-in activation - java.lang.IllegalStateException: Workbench has not been created yet. - [java] at org.eclipse.ui.PlatformUI.getWorkbench(PlatformUI.java:92) - [java] at org.jboss.tools.common.model.plugin.ModelPlugin.start(ModelPlugin.java:76) - [java] at org.eclipse.osgi.framework.internal.core.BundleContextImpl$2.run(BundleContextImpl.java:1009) - [java] at java.security.AccessController.doPrivileged(Native Method) - */ - - PlatformUI.getWorkbench().addWindowListener(this); - } catch (Exception e) { - getPluginLog().logError(e); - } -// ClassLoaderUtil.init(); Display.getDefault().asyncExec(new Runnable() { public void run() { ClassLoaderUtil.init(); Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPluginStartup.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPluginStartup.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPluginStartup.java 2008-06-07 00:37:56 UTC (rev 8622) @@ -0,0 +1,12 @@ +package org.jboss.tools.common.model.plugin; + +import org.eclipse.ui.IStartup; +import org.eclipse.ui.PlatformUI; + +public class ModelPluginStartup implements IStartup { + + public void earlyStartup() { + PlatformUI.getWorkbench().addWindowListener(ModelPlugin.getDefault()); + } + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/plugin/ModelPluginStartup.java ___________________________________________________________________ Name: svn:mime-type + text/plain