Author: scabanovich Date: 2007-10-25 07:04:52 -0400 (Thu, 25 Oct 2007) New Revision: 4504 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java Log: JBIDE-1181 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java 2007-10-25 10:02:53 UTC (rev 4503) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java 2007-10-25 11:04:52 UTC (rev 4504) @@ -14,6 +14,7 @@ import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.Point; import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.util.FindObjectHelper; @@ -25,7 +26,7 @@ import org.jboss.tools.common.model.ui.navigator.*; public class NavigatorMenuInvoker extends TreeViewerMenuInvoker { - private static XModelObject eclipseWorkspace = PreferenceModelUtilities.getPreferenceModel().createModelObject("EclipseWorkspace", null); + private static XModelObject eclipseWorkspace = null; public XModelObject getModelObjectAt(Point p) { XModelObject o = super.getModelObjectAt(p); @@ -33,6 +34,12 @@ } protected XModelObject getWorkspaceObject() { + if(eclipseWorkspace == null) { + XModel model = PreferenceModelUtilities.getPreferenceModel(); + if(model != null) { + eclipseWorkspace = model.createModelObject("EclipseWorkspace", null); + } + } return eclipseWorkspace; }