Author: dazarov Date: 2008-11-12 12:12:02 -0500 (Wed, 12 Nov 2008) New Revision: 11724 Added: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/dnd/XModelTransferDropTargetListener.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/StrutsDiagramEditPolicy.java Log: Refactoring: XModel actions usage on Struts diagram Added: 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 (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java 2008-11-12 17:12:02 UTC (rev 11724) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2008 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.struts.model; + +import java.util.Properties; + +import org.jboss.tools.common.meta.action.XActionInvoker; +import org.jboss.tools.common.model.XModelObject; + +public class StrutsXModelUtil { + public static void addRule(XModelObject object, Properties properties){ + XActionInvoker.invoke("CreateActions.AddRule", object, properties); + } + + public static void addAction(XModelObject object, Properties properties){ + XActionInvoker.invoke("CreateActions.CreateAction", object, properties); + } + + public static void addException(XModelObject object, Properties properties){ + XActionInvoker.invoke("CreateActions.CreateException", object, properties); + } + + public static void addForward(XModelObject object, Properties properties){ + XActionInvoker.invoke("CreateActions.CreateForward", object, properties); + } + + public static void addPage(XModelObject object, Properties properties){ + XActionInvoker.invoke("CreateActions.CreatePage", object, properties); + } +} Property changes on: trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/StrutsXModelUtil.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/dnd/XModelTransferDropTargetListener.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/dnd/XModelTransferDropTargetListener.java 2008-11-12 16:58:51 UTC (rev 11723) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/dnd/XModelTransferDropTargetListener.java 2008-11-12 17:12:02 UTC (rev 11724) @@ -10,24 +10,23 @@ ******************************************************************************/ package org.jboss.tools.struts.ui.editor.dnd; +import java.io.File; +import java.util.Properties; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; import org.eclipse.draw2d.geometry.Point; -import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.eclipse.gef.dnd.TemplateTransfer; import org.eclipse.jface.util.TransferDropTargetListener; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.Transfer; -import java.io.File; -import java.util.Properties; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.resources.ResourcesPlugin; - -import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.struts.model.StrutsXModelUtil; import org.jboss.tools.struts.ui.editor.StrutsEditor; import org.jboss.tools.struts.ui.editor.edit.StrutsDiagramEditPart; @@ -90,7 +89,7 @@ properties.put("process.mouse.y","" + point.y); } - XActionInvoker.invoke("CreateActions.AddRule", (XModelObject)editor.getStrutsModel().getSource(), properties); + StrutsXModelUtil.addRule((XModelObject)editor.getStrutsModel().getSource(), properties); return; } DndHelper.drop(editor.getStrutsModel().getSource(), point); Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/StrutsDiagramEditPolicy.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/StrutsDiagramEditPolicy.java 2008-11-12 16:58:51 UTC (rev 11723) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/edit/StrutsDiagramEditPolicy.java 2008-11-12 17:12:02 UTC (rev 11724) @@ -18,9 +18,8 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.RootComponentEditPolicy; import org.eclipse.gef.requests.CreateRequest; - -import org.jboss.tools.common.meta.action.XActionInvoker; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.struts.model.StrutsXModelUtil; import org.jboss.tools.struts.ui.editor.ActionTemplate; import org.jboss.tools.struts.ui.editor.GlobalExceptionTemplate; import org.jboss.tools.struts.ui.editor.GlobalForwardTemplate; @@ -100,7 +99,7 @@ properties.put("process.mouse.y","" + location.y); } - XActionInvoker.invoke("CreateActions.CreateAction", (XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(),properties); + StrutsXModelUtil.addAction((XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(), properties); } public boolean canUndo() { @@ -132,7 +131,7 @@ properties.put("process.mouse.y","" + location.y); } - XActionInvoker.invoke("CreateActions.CreateForward", (XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(),properties); + StrutsXModelUtil.addForward((XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(), properties); } public boolean canUndo() { @@ -164,7 +163,7 @@ properties.put("process.mouse.y","" + location.y); } - XActionInvoker.invoke("CreateActions.CreateException", (XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(),properties); + StrutsXModelUtil.addException((XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(), properties); } public boolean canUndo() { @@ -196,7 +195,7 @@ properties.put("process.mouse.y","" + location.y); } - XActionInvoker.invoke("CreateActions.CreatePage", (XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(),properties); + StrutsXModelUtil.addPage((XModelObject)((IStrutsModel)getDiagramEditPart().getModel()).getSource(), properties); } public boolean canUndo() {