Author: scabanovich Date: 2009-02-06 11:17:14 -0500 (Fri, 06 Feb 2009) New Revision: 13514 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java Log: JBIDE-3634 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java 2009-02-06 14:30:13 UTC (rev 13513) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java 2009-02-06 16:17:14 UTC (rev 13514) @@ -57,10 +57,15 @@ } p.getSite().getSelectionProvider().setSelection(getSelection((XModelObject)object)); IWorkbenchPage page = ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); - IViewPart vs = page.findView("org.eclipse.ui.views.ContentOutline"); - ISelectionProvider sp = vs == null ? null : vs.getSite().getSelectionProvider(); - if(sp != null) { + + ISelection s = p.getSite().getSelectionProvider().getSelection(); + + if(isXModelSelection(s)) { + IViewPart vs = page.findView("org.eclipse.ui.views.ContentOutline"); + ISelectionProvider sp = vs == null ? null : vs.getSite().getSelectionProvider(); + if(sp != null) { sp.setSelection(getSelection(object)); + } } } }); @@ -71,6 +76,15 @@ private StructuredSelection getSelection(XModelObject o) { return new StructuredSelection(new Object[]{o}); } + + private boolean isXModelSelection(ISelection s) { + if(s == null || s.isEmpty() || !(s instanceof IStructuredSelection)) { + return false; + } + IStructuredSelection ss = (IStructuredSelection)s; + Object o = ss.getFirstElement(); + return o instanceof XModelObject; + } String[] views = new String[]{ "org.jboss.tools.jst.web.ui.navigator.WebProjectsView"