moved model modifier operation/data model to module core: committed for JL
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/operation/ModelModifierOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ModelModifierOperation.java
similarity index 93%
rename from plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/operation/ModelModifierOperation.java
rename to plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ModelModifierOperation.java
index fa2760a..bc93069 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/operation/ModelModifierOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ModelModifierOperation.java
@@ -14,7 +14,7 @@
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-package org.eclipse.wst.common.internal.emfworkbench.operation;
+package org.eclipse.wst.common.componentcore.internal.operation;
import java.lang.reflect.InvocationTargetException;
@@ -27,20 +27,15 @@
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.wst.common.internal.emfworkbench.integration.ModelModifier;
-
/**
* @author DABERG
*
* To change the template for this generated type comment go to Window>Preferences>Java>Code
* Generation>Code and Comments
*/
-public abstract class ModelModifierOperation extends EditModelOperation {
+public abstract class ModelModifierOperation extends ArtifactEditOperation {
protected ModelModifier modifier;
- public ModelModifierOperation() {
- //default constructor
- }
-
/**
* @param dataModel
*/
@@ -95,7 +90,7 @@
public void adaptAllNew(Notifier notifier) {
//do nothing
}
- }, editModel.getCommandStack());
+ }, getArtifactEdit().getCommandStack());
}
/*
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/operation/ModelModifierOperationDataModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ModelModifierOperationDataModel.java
similarity index 89%
rename from plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/operation/ModelModifierOperationDataModel.java
rename to plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ModelModifierOperationDataModel.java
index e358b01..5394beb 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/operation/ModelModifierOperationDataModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ModelModifierOperationDataModel.java
@@ -14,8 +14,7 @@
* To change the template for this generated file go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-package org.eclipse.wst.common.internal.emfworkbench.operation;
-
+package org.eclipse.wst.common.componentcore.internal.operation;
/**
* @author DABERG
@@ -23,7 +22,7 @@
* To change the template for this generated type comment go to Window>Preferences>Java>Code
* Generation>Code and Comments
*/
-public abstract class ModelModifierOperationDataModel extends EditModelOperationDataModel {
+public abstract class ModelModifierOperationDataModel extends ArtifactEditOperationDataModel {
/**
* Optionally set the EditingDomain that should be used to create generic EMF commands. Type -
* EditingDomain
diff --git a/plugins/org.eclipse.wst.common.modulecore/plugin.xml b/plugins/org.eclipse.wst.common.modulecore/plugin.xml
index 1cfc262..b1d7666 100644
--- a/plugins/org.eclipse.wst.common.modulecore/plugin.xml
+++ b/plugins/org.eclipse.wst.common.modulecore/plugin.xml
@@ -24,6 +24,7 @@
<import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="org.eclipse.wst.server.core"/>
<import plugin="org.eclipse.core.commands"/>
+ <import plugin="org.eclipse.emf.edit"/>
</requires>
