Author: scabanovich Date: 2008-06-05 06:43:07 -0400 (Thu, 05 Jun 2008) New Revision: 8570 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 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/SeamPagesGuiEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java Log: JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesContextMenuProvider.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -73,8 +73,8 @@ if(lastDownEvent != null) { Point point = new Point(lastDownEvent.x, lastDownEvent.y); ((PagesDiagramEditPart)getViewer().getRootEditPart().getChildren().get(0)).getFigure().translateToRelative(point); - p.setProperty("process.mouse.x", "" + point.x); - p.setProperty("process.mouse.y", "" + point.y); + p.setProperty("mouse.x", "" + point.x); + p.setProperty("mouse.y", "" + point.y); lastDownEvent = null; } XModelObjectActionList list = new XModelObjectActionList(object.getModelEntity().getActionList(), object, getTargets(ss), new Object[]{object, p}); 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-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -106,7 +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.helpers.SeamPagesProcessStructureHelper; +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; import org.jboss.tools.seam.ui.pages.editor.dnd.FileTransferDropTargetListener; @@ -557,7 +557,7 @@ if (viewer == null) return null; XModelObject o = getTarget(viewer.getSelection()); - XModelObject ref = SeamPagesProcessStructureHelper.instance.getReference(o); + XModelObject ref = SeamPagesDiagramStructureHelper.instance.getReference(o); return ref; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -26,8 +26,8 @@ import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.jst.web.model.WebProcess; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; -import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesProcessImpl; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; +import org.jboss.tools.seam.pages.xml.model.impl.SeamPagesDiagramImpl; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; @@ -40,7 +40,7 @@ private PagesEditor gui = null; private IModelObjectEditorInput input; private boolean isInitialized = false; - private XModelObject installedProcess = null; + private XModelObject diagramXML = null; private PagesModel model; public void dispose() { @@ -51,7 +51,7 @@ disposeGui(); gui = null; input = null; - installedProcess = null; + diagramXML = null; super.dispose(); } @@ -72,11 +72,11 @@ return (gui == null) ? null : gui.getModelSelectionProvider(); } - protected XModelObject getInstalledObject() { - return installedProcess; + protected XModelObject getDiagramXML() { + return diagramXML; } - private WebProcess findInstalledObject() { + private WebProcess findDiagramXML() { XModelObject o1 = input.getXModelObject(); if(o1 == null) return null; XModelObject c = o1.getChildByPath("process"); @@ -86,11 +86,11 @@ } protected void updateGui() { - WebProcess f = findInstalledObject(); - if(f != installedProcess) disposeGui(); + WebProcess f = findDiagramXML(); + if(f != diagramXML) disposeGui(); else if(isInitialized) return; isInitialized = true; - installedProcess = f; + diagramXML = f; guiControl.setVisible(f != null); if(f == null) return; try { @@ -116,7 +116,7 @@ private PagesModel createModel() { PagesModel model = PagesFactory.eINSTANCE.createPagesModel(); - model.setData(installedProcess); + model.setData(diagramXML); model.load(); return model; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/DndHelper.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -59,8 +59,8 @@ properties.setProperty("isDrop", "true"); properties.setProperty("actionSourceGUIComponentID", "editor"); if (point != null) { - properties.put("process.mouse.x", "" + point.x); - properties.put("process.mouse.y", "" + point.y); + properties.put("mouse.x", "" + point.x); + properties.put("mouse.y", "" + point.y); } try { DnDUtil.paste((XModelObject) target, properties); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/dnd/XModelTransferDropTargetListener.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -96,8 +96,8 @@ event.currentDataType)) { Properties properties = new Properties(); if (point != null) { - properties.put("process.mouse.x", "" + point.x); - properties.put("process.mouse.y", "" + point.y); + properties.put("mouse.x", "" + point.x); + properties.put("mouse.y", "" + point.y); } XActionInvoker Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/LinkImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel; @@ -494,7 +494,7 @@ } else { return; } - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); setName(h.getItemOutputPresentation(object)); setShortcut(h.isShortcut(object)); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage; @@ -191,7 +191,7 @@ updatelock++; try { XModelObject item = getModelObject(); - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper .getInstance(); setName(h.getPageTitle(item)); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesElementImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -30,7 +30,7 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; @@ -651,9 +651,9 @@ if(pagesModel == null) return; if(childData instanceof XModelObject) { - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); XModelObject object = (XModelObject)childData; - if(object.getModelEntity().getName().equals(SeamPagesConstants.ENT_PROCESS_ITEM_OUTPUT)) { + if(object.getModelEntity().getName().equals(SeamPagesConstants.ENT_DIAGRAM_ITEM_OUTPUT)) { PagesElement from = this; //pagesModel.findElement(object); XModelObject t = h.getItemOutputTarget(object); if(t == null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -19,7 +19,7 @@ import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement; @@ -44,7 +44,7 @@ * <!-- end-user-doc --> * @generated NOT */ - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); /** * <!-- begin-user-doc --> @@ -187,15 +187,15 @@ * @generated NOT */ public void load() { - XModelObject installedProcess = (XModelObject)getData(); - if(installedProcess == null) return; + XModelObject diagramXML = (XModelObject)getData(); + if(diagramXML == null) return; elementsByPath = new HashMap<String, PagesElement>(); linksByPath = new HashMap<String, Link>(); - addElement(installedProcess, this); + addElement(diagramXML, this); - XModelObject[] is = h.getItems(installedProcess); + XModelObject[] is = h.getItems(diagramXML); for (int i = 0; i < is.length; i++) { addItem(is[i]); } @@ -203,8 +203,8 @@ for (int i = 0; i < is.length; i++) { addItemLinks(is[i]); } - installedProcess.getModel().removeModelTreeListener(modelListener); - installedProcess.getModel().addModelTreeListener(modelListener); + diagramXML.getModel().removeModelTreeListener(modelListener); + diagramXML.getModel().addModelTreeListener(modelListener); } /** @@ -269,9 +269,9 @@ * @generated NOT */ public void dispose() { - XModelObject installedProcess = (XModelObject)getData(); - if(installedProcess == null) return; - installedProcess.getModel().removeModelTreeListener(modelListener); + XModelObject diagramXML = (XModelObject)getData(); + if(diagramXML == null) return; + diagramXML.getModel().removeModelTreeListener(modelListener); } /** @@ -288,8 +288,8 @@ */ public void nodeChanged(XModelTreeEvent event) { if(getData() == null) return; - XModelObject installedProcess = (XModelObject)getData(); - if(!event.getModelObject().getPath().startsWith(installedProcess.getPath())) { + XModelObject diagramXML = (XModelObject)getData(); + if(!event.getModelObject().getPath().startsWith(diagramXML.getPath())) { return; } PagesElement item = findElement(event.getInfo().toString()); @@ -309,21 +309,21 @@ */ public void structureChanged(XModelTreeEvent event) { if(getData() == null) return; - XModelObject installedProcess = (XModelObject)getData(); + XModelObject diagramXML = (XModelObject)getData(); XModelObject target = event.getModelObject(); - if(!target.getPath().startsWith(installedProcess.getPath())) { + if(!target.getPath().startsWith(diagramXML.getPath())) { return; } if(event.kind() == XModelTreeEvent.CHILD_ADDED) { XModelObject added = (XModelObject)event.getInfo(); - if(target == installedProcess) { + if(target == diagramXML) { childAdded(added); } else { PagesElement item = findElement(target); item.childAdded(added); } } else if(event.kind() == XModelTreeEvent.CHILD_REMOVED) { - if(target == installedProcess) { + if(target == diagramXML) { PagesElement removed = findElement(event.getInfo()); if(removed != null) { Link[] ls = removed.getOutputLinks().toArray(new Link[0]); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -11,7 +11,7 @@ import org.eclipse.emf.ecore.EClass; import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper; +import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException; @@ -51,7 +51,7 @@ */ public void dataChanged() { XModelObject item = getModelObject(); - SeamPagesProcessStructureHelper h = SeamPagesProcessStructureHelper.getInstance(); + SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance(); setName(item.getPresentationString()); int[] shape = h.asIntArray(item, "shape"); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPolicy.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -78,8 +78,8 @@ public void execute(){ Properties properties = new Properties(); if(location != null){ - properties.put("process.mouse.x","" + location.x); - properties.put("process.mouse.y","" + location.y); + properties.put("mouse.x","" + location.x); + properties.put("mouse.y","" + location.y); } XActionInvoker.invoke("CreateActions.AddException", (XModelObject)((PagesModel)getDiagramEditPart().getModel()).getData(),properties); @@ -110,8 +110,8 @@ public void execute(){ Properties properties = new Properties(); if(location != null) { - properties.put("process.mouse.x","" + location.x); - properties.put("process.mouse.y","" + location.y); + properties.put("mouse.x","" + location.x); + properties.put("mouse.y","" + location.y); } XActionInvoker.invoke("CreateActions.AddPage", (XModelObject)((PagesModel)getDiagramEditPart().getModel()).getData(),properties); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java 2008-06-05 10:42:38 UTC (rev 8569) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/wizard/SelectItemWizardView.java 2008-06-05 10:43:07 UTC (rev 8570) @@ -17,12 +17,12 @@ public class SelectItemWizardView extends SelectWebProcessItemWizardView { protected String getItemEntity() { - return SeamPagesConstants.ENT_PROCESS_ITEM; + return SeamPagesConstants.ENT_DIAGRAM_ITEM; } protected String getKey(XModelObject o) { String entity = o.getModelEntity().getName(); - if(entity.equals(SeamPagesConstants.ENT_PROCESS_ITEM)) + if(entity.equals(SeamPagesConstants.ENT_DIAGRAM_ITEM)) return o.getAttributeValue(SeamPagesConstants.ATTR_PATH); String key = o.getParent().getAttributeValue(SeamPagesConstants.ATTR_PATH) + ":" + o.getPresentationString(); return key;