Author: scabanovich Date: 2008-06-09 05:54:58 -0400 (Mon, 09 Jun 2008) New Revision: 8638 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java Log: JBIDE-2285 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-09 02:27:19 UTC (rev 8637) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-09 09:54:58 UTC (rev 8638) @@ -106,6 +106,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.XModelTransferBuffer; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; +import org.jboss.tools.seam.pages.xml.model.handlers.SelectOnDiagramHandler; import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; @@ -593,6 +594,19 @@ protected void setSelectedModelObject(XModelObject object) { if(object == null) return; + + // Make projection to diagram XML if necessary. + XModelObject diagramXML = (XModelObject)getPagesModel().getData(); + if(diagramXML == null) return; + XModelObject fileXML = diagramXML.getParent(); + if(fileXML == null || !object.getPath().startsWith(fileXML.getPath())) { + return; + } + if(!diagramXML.getPath().startsWith(object.getPath())) { + object = SelectOnDiagramHandler.getItemOnDiagram(object); + if(object == null) return; + } + EObject element = getPagesModel().findElement(object); if(element == null) {