Author: scabanovich Date: 2012-01-26 18:30:15 -0500 (Thu, 26 Jan 2012) New Revision: 38232 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java Log: JBIDE-6132 https://issues.jboss.org/browse/JBIDE-6132 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 2012-01-26 23:22:39 UTC (rev 38231) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorMenuInvoker.java 2012-01-26 23:30:15 UTC (rev 38232) @@ -18,9 +18,8 @@ import org.eclipse.swt.events.MouseEvent; 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.XModelFactory; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.options.PreferenceModelUtilities; import org.jboss.tools.common.model.ui.navigator.TreeViewerMenuInvoker; import org.jboss.tools.common.model.util.FindObjectHelper; @@ -34,10 +33,7 @@ protected XModelObject getWorkspaceObject() { if(eclipseWorkspace == null) { - XModel model = PreferenceModelUtilities.getPreferenceModel(); - if(model != null) { - eclipseWorkspace = model.createModelObject("EclipseWorkspace", null); //$NON-NLS-1$ - } + eclipseWorkspace = XModelFactory.getDefaultInstance().createModelObject("EclipseWorkspace", null); //$NON-NLS-1$ } return eclipseWorkspace; }