Author: dazarov
Date: 2008-11-12 11:58:51 -0500 (Wed, 12 Nov 2008)
New Revision: 11723
Added:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/XModelTransferDropTargetListener.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/JSFDiagramEditPolicy.java
Log:
Refactoring: XModel action usage on JSF diagram
Added:
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
(rev 0)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java 2008-11-12
16:58:51 UTC (rev 11723)
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * 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.jsf.model;
+
+import java.util.Properties;
+
+import org.jboss.tools.common.meta.action.XActionInvoker;
+import org.jboss.tools.common.model.XModelObject;
+
+public class JSFXModelUtil {
+ public static void addRule(XModelObject object, Properties properties){
+ XActionInvoker.invoke("CreateActions.AddRule", object, properties);
+ }
+}
Property changes on:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFXModelUtil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/XModelTransferDropTargetListener.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/XModelTransferDropTargetListener.java 2008-11-12
16:49:33 UTC (rev 11722)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/dnd/XModelTransferDropTargetListener.java 2008-11-12
16:58:51 UTC (rev 11723)
@@ -10,25 +10,23 @@
******************************************************************************/
package org.jboss.tools.jsf.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.jsf.model.JSFXModelUtil;
import org.jboss.tools.jsf.ui.editor.JSFEditor;
import org.jboss.tools.jsf.ui.editor.edit.JSFDiagramEditPart;
@@ -100,9 +98,7 @@
properties.put("process.mouse.y", "" + point.y);
}
- XActionInvoker
- .invoke("CreateActions.AddRule", (XModelObject) editor
- .getJSFModel().getSource(), properties);
+ JSFXModelUtil.addRule((XModelObject) editor.getJSFModel().getSource(), properties);
return;
}
DndHelper.drop(editor.getJSFModel().getSource(), point);
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/JSFDiagramEditPolicy.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/JSFDiagramEditPolicy.java 2008-11-12
16:49:33 UTC (rev 11722)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/edit/JSFDiagramEditPolicy.java 2008-11-12
16:58:51 UTC (rev 11723)
@@ -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.jsf.model.JSFXModelUtil;
import org.jboss.tools.jsf.ui.editor.model.impl.JSFModel;
public class JSFDiagramEditPolicy extends RootComponentEditPolicy{
@@ -71,7 +70,7 @@
properties.put("process.mouse.y","" + location.y);
}
- XActionInvoker.invoke("CreateActions.AddRule",
(XModelObject)((JSFModel)getDiagramEditPart().getModel()).getSource(),properties);
+ JSFXModelUtil.addRule((XModelObject)((JSFModel)getDiagramEditPart().getModel()).getSource(),
properties);
}
public boolean canUndo() {