7:09 a.m.
Author: dazarov
Date: 2008-11-12 08:09:32 -0500 (Wed, 12 Nov 2008)
New Revision: 11706
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/CommentEditPart.java
Log:
Refactoring XModel actions for diagrams
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java 2008-11-12
12:46:40 UTC (rev 11705)
+++
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java 2008-11-12
13:09:32 UTC (rev 11706)
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.common.model.util;
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.impl.*;
@@ -32,5 +35,13 @@
String modelVersionStr = fss.getAttributeValue(XModelConstants.MODEL_VERSION);
return (modelVersionStr == null || "".equals(modelVersionStr)) ?
DEFAULT_MODEL_VERSION : modelVersionStr;
}
+
+ public static void openProperyDialog(XModelObject object){
+ XActionInvoker.invoke("Properties/Properties", object, new Properties());
+ }
+
+ public static void openEditor(XModelObject object){
+ XActionInvoker.invoke("Edit", object, null);
+ }
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-11-12
12:46:40 UTC (rev 11705)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/LinkEditPart.java 2008-11-12
13:09:32 UTC (rev 11706)
@@ -12,7 +12,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.util.Properties;
import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.FreeformViewport;
@@ -38,8 +37,8 @@
import org.jboss.tools.common.gef.edit.GEFRootEditPart;
import org.jboss.tools.common.gef.figures.GEFLabel;
import org.jboss.tools.common.gef.figures.xpl.CustomLocator;
-import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.XModelUtil;
import org.jboss.tools.seam.ui.pages.editor.PagesEditor;
import org.jboss.tools.seam.ui.pages.editor.PagesEditor.ModelSelectionProvider;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
@@ -239,7 +238,7 @@
((ModelSelectionProvider)editor.getModelSelectionProvider()).scroll(vp,
part.getNodeFigure());
}else{
- XActionInvoker.invoke("Properties/Properties",
(XModelObject)getLink().getData(), new Properties());
+ XModelUtil.openProperyDialog((XModelObject)getLink().getData());
}
}
}
Modified:
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/CommentEditPart.java
===================================================================
---
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/CommentEditPart.java 2008-11-12
12:46:40 UTC (rev 11705)
+++
trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/CommentEditPart.java 2008-11-12
13:09:32 UTC (rev 11706)
@@ -15,9 +15,8 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.GraphicalEditPart;
-
-import org.jboss.tools.common.meta.action.XActionInvoker;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.XModelUtil;
import org.jboss.tools.struts.ui.editor.figures.CommentFigure;
public class CommentEditPart extends ProcessItemEditPart {
@@ -70,7 +69,7 @@
}
public void doDoubleClick(){
- XActionInvoker.invoke("Edit",
(XModelObject)getProcessItemModel().getSource(),null);
+ XModelUtil.openEditor((XModelObject)getProcessItemModel().getSource());
}
protected void layoutForwards(){