Author: scabanovich Date: 2008-06-10 09:26:05 -0400 (Tue, 10 Jun 2008) New Revision: 8678 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/RenameViewSupport.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java Log: JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java 2008-06-10 13:18:48 UTC (rev 8677) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/AddExceptionHandler.java 2008-06-10 13:26:05 UTC (rev 8678) @@ -18,7 +18,7 @@ XModelObject created = (XModelObject)prop.get("created"); if(created == null) return; String path = created.getPathPart(); - XModelObject item = SeamPagesDiagramStructureHelper.getInstance().getProcess(object).getChildByPath(path); + XModelObject item = SeamPagesDiagramStructureHelper.getInstance().getDiagram(object).getChildByPath(path); String shape = getShape(prop); if(item != null && shape != null) { item.setAttributeValue("shape", shape); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/RenameViewSupport.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/RenameViewSupport.java 2008-06-10 13:18:48 UTC (rev 8677) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/RenameViewSupport.java 2008-06-10 13:26:05 UTC (rev 8678) @@ -76,7 +76,7 @@ Properties p = extractStepData(0); String path = AddViewSupport.revalidatePath(p.getProperty(ATTR_VIEW_ID)); if(initialPath.equals(path)) return; - SeamPagesDiagramHelper h = SeamPagesDiagramHelper.getHelper(SeamPagesDiagramStructureHelper.instance.getProcess(item)); + SeamPagesDiagramHelper h = SeamPagesDiagramHelper.getHelper(SeamPagesDiagramStructureHelper.instance.getDiagram(item)); h.addUpdateLock(this); try { replace(item, initialPath, path); Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java 2008-06-10 13:18:48 UTC (rev 8677) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/handlers/SelectOnDiagramHandler.java 2008-06-10 13:26:05 UTC (rev 8678) @@ -62,7 +62,7 @@ //or should we return object itself, if params are displayed by diagram? return getItemOnDiagram(object.getParent()); } - XModelObject diagram = SeamPagesDiagramStructureHelper.instance.getProcess(object); + XModelObject diagram = SeamPagesDiagramStructureHelper.instance.getDiagram(object); return (diagram == null) ? null : getItemOnDiagram(diagram, object); } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-10 13:18:48 UTC (rev 8677) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramStructureHelper.java 2008-06-10 13:26:05 UTC (rev 8678) @@ -15,6 +15,10 @@ return instance; } + public XModelObject getDiagram(XModelObject object) { + return getProcess(object); + } + public XModelObject getParentProcess(XModelObject element) { XModelObject p = element; while(p != null && p.getFileType() == XModelObject.NONE &&