Author: scabanovich Date: 2011-06-09 18:33:23 -0400 (Thu, 09 Jun 2011) New Revision: 31990 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java Log: JBIDE-9110 https://issues.jboss.org/browse/JBIDE-9110 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2011-06-09 21:58:49 UTC (rev 31989) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/TreeFormPage.java 2011-06-09 22:33:23 UTC (rev 31990) @@ -29,6 +29,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.ITextOperationTarget; +import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.ISelectionProvider; @@ -195,6 +196,7 @@ // ISelectionChangedListener public void selectionChanged(SelectionChangedEvent event) { + if(event.getSelection() instanceof ITextSelection) return; XModelObject xmo = getModelObject(event.getSelection()); if(selection == xmo) return; selection = xmo; @@ -275,7 +277,7 @@ } private XModelObject getModelObject(ISelection selection) { - if(selection == null || selection.isEmpty()) return null; + if(!(selection instanceof IStructuredSelection) || selection.isEmpty()) return null; IStructuredSelection s = (IStructuredSelection)selection; Object o = s.getFirstElement(); return (o instanceof XModelObject) ? (XModelObject)o : null; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java 2011-06-09 21:58:49 UTC (rev 31989) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/form/SampleTreeForm.java 2011-06-09 22:33:23 UTC (rev 31990) @@ -16,6 +16,7 @@ import org.jboss.tools.common.editor.SelectionNotifier; import org.jboss.tools.common.editor.XModelObjectTreeViewComponent; +import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; @@ -141,7 +142,7 @@ Viewer viewer = tree.getViewer(); ISelection oldSelection = viewer.getSelection(); ISelection newSelection = event.getSelection(); - if (oldSelection.equals(newSelection)) return; + if (oldSelection.equals(newSelection) || newSelection instanceof ITextSelection) return; viewer.setSelection(newSelection); if(viewer.getSelection().isEmpty() && !oldSelection.isEmpty()) { viewer.setSelection(oldSelection);