Author: dazarov Date: 2008-11-13 08:28:25 -0500 (Thu, 13 Nov 2008) New Revision: 11758 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/actions/JSFCommandFactory.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesXModelUtil.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java Log: Refactoring: XModel actions usage in diagram editors 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-13 12:29:39 UTC (rev 11757) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/XModelUtil.java 2008-11-13 13:28:25 UTC (rev 11758) @@ -19,6 +19,9 @@ public class XModelUtil { private static final String DEFAULT_MODEL_VERSION = "5.0"; + + private static final String PROPERTIES_ACTION = "Properties/Properties"; + private static final String EDIT_ACTION = "5.0"; public static void addModifyListener(XModel model, Object listener) { RootImpl impl = (RootImpl)model.getRoot(); @@ -37,11 +40,11 @@ } public static void openProperyDialog(XModelObject object){ - XActionInvoker.invoke("Properties/Properties", object, new Properties()); + XActionInvoker.invoke(PROPERTIES_ACTION, object, new Properties()); } public static void openEditor(XModelObject object){ - XActionInvoker.invoke("Edit", object, null); + XActionInvoker.invoke(EDIT_ACTION, object, null); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java 2008-11-13 12:29:39 UTC (rev 11757) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java 2008-11-13 13:28:25 UTC (rev 11758) @@ -16,7 +16,9 @@ import org.jboss.tools.common.model.XModelObject; public class JSFXModelUtil { + private static final String ADD_RULE_ACTION = "CreateActions.AddRule"; + public static void addRule(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.AddRule", object, properties); + XActionInvoker.invoke(ADD_RULE_ACTION, object, properties); } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/actions/JSFCommandFactory.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/actions/JSFCommandFactory.java 2008-11-13 12:29:39 UTC (rev 11757) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/actions/JSFCommandFactory.java 2008-11-13 13:28:25 UTC (rev 11758) @@ -18,7 +18,12 @@ import org.jboss.tools.jsf.ui.editor.model.commands.JSFCompoundCommand; public class JSFCommandFactory { + private static final String DELETE_ACTION = "DeleteActions.Delete"; + private static final String COPY_ACTION = "CopyActions.Copy"; + private static final String CUT_ACTION = "CopyActions.Cut"; + private static final String PASTE_ACTION = "CopyActions.Paste"; + private static Command createCommand(List objects, String commandPath) { Object source = null; if (objects.isEmpty()) @@ -36,19 +41,19 @@ } public static Command createDeleteCommand(List objects) { - return createCommand(objects, "DeleteActions.Delete"); + return createCommand(objects, DELETE_ACTION); } public static Command createCopyCommand(List objects) { - return createCommand(objects, "CopyActions.Copy"); + return createCommand(objects, COPY_ACTION); } public static Command createCutCommand(List objects) { - return createCommand(objects, "CopyActions.Cut"); + return createCommand(objects, CUT_ACTION); } public static Command createPasteCommand(List objects) { - return createCommand(objects, "CopyActions.Paste"); + return createCommand(objects, PASTE_ACTION); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesXModelUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesXModelUtil.java 2008-11-13 12:29:39 UTC (rev 11757) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/SeamPagesXModelUtil.java 2008-11-13 13:28:25 UTC (rev 11758) @@ -16,11 +16,14 @@ import org.jboss.tools.common.model.XModelObject; public class SeamPagesXModelUtil { + private static final String ADD_PAGE_ACTION = "CreateActions.AddPage"; + private static final String ADD_EXCEPTION_ACTION = "CreateActions.AddException"; + public static void addPage(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.AddPage", object, properties); + XActionInvoker.invoke(ADD_PAGE_ACTION, object, properties); } public static void addException(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.AddException", object, properties); + XActionInvoker.invoke(ADD_EXCEPTION_ACTION, object, properties); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java 2008-11-13 12:29:39 UTC (rev 11757) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/actions/PagesCommandFactory.java 2008-11-13 13:28:25 UTC (rev 11758) @@ -20,6 +20,10 @@ import org.jboss.tools.seam.ui.pages.editor.edit.PagesEditPart; public class PagesCommandFactory { + private static final String DELETE_ACTION = "DeleteActions.Delete"; + private static final String COPY_ACTION = "CopyActions.Copy"; + private static final String CUT_ACTION = "CopyActions.Cut"; + private static final String PASTE_ACTION = "CopyActions.Paste"; private static Command createCommand(List objects, String commandPath) { Object source = null; @@ -38,19 +42,19 @@ } public static Command createDeleteCommand(List objects) { - return createCommand(objects, "DeleteActions.Delete"); + return createCommand(objects, DELETE_ACTION); } public static Command createCopyCommand(List objects) { - return createCommand(objects, "CopyActions.Copy"); + return createCommand(objects, COPY_ACTION); } public static Command createCutCommand(List objects) { - return createCommand(objects, "CopyActions.Cut"); + return createCommand(objects, CUT_ACTION); } public static Command createPasteCommand(List objects) { - return createCommand(objects, "CopyActions.Paste"); + return createCommand(objects, PASTE_ACTION); } } Modified: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java 2008-11-13 12:29:39 UTC (rev 11757) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java 2008-11-13 13:28:25 UTC (rev 11758) @@ -16,23 +16,29 @@ import org.jboss.tools.common.model.XModelObject; public class StrutsXModelUtil { + private static final String ADD_RULE_ACTION = "CreateActions.AddRule"; + private static final String CREATE_ACTION_ACTION = "CreateActions.CreateAction"; + private static final String CREATE_EXCEPTION_ACTION = "CreateActions.CreateException"; + private static final String CREATE_FORWARD_ACTION = "CreateActions.CreateForward"; + private static final String CREATE_PAGE_ACTION = "CreateActions.CreatePage"; + public static void addRule(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.AddRule", object, properties); + XActionInvoker.invoke(ADD_RULE_ACTION, object, properties); } public static void addAction(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.CreateAction", object, properties); + XActionInvoker.invoke(CREATE_ACTION_ACTION, object, properties); } public static void addException(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.CreateException", object, properties); + XActionInvoker.invoke(CREATE_EXCEPTION_ACTION, object, properties); } public static void addForward(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.CreateForward", object, properties); + XActionInvoker.invoke(CREATE_FORWARD_ACTION, object, properties); } public static void addPage(XModelObject object, Properties properties){ - XActionInvoker.invoke("CreateActions.CreatePage", object, properties); + XActionInvoker.invoke(CREATE_PAGE_ACTION, object, properties); } }