Reduce unneccessary plugins
Change-Id: If337bc5b00f80dfcf54ac72d21beaf03118cdcef
diff --git a/plugins/org.eclipse.emf.henshin.multicda.cda/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.henshin.multicda.cda/META-INF/MANIFEST.MF
index 12b3914..cffa618 100644
--- a/plugins/org.eclipse.emf.henshin.multicda.cda/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.henshin.multicda.cda/META-INF/MANIFEST.MF
@@ -5,18 +5,13 @@
Bundle-SymbolicName: org.eclipse.emf.henshin.multicda.cda;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Activator: org.eclipse.emf.henshin.multicda.cda.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.filesystem;bundle-version="1.5.0",
+Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.10.1",
org.eclipse.emf.ecore.xmi;bundle-version="2.11.1",
org.eclipse.emf.henshin.model;bundle-version="1.5.0",
org.eclipse.emf.henshin.interpreter;bundle-version="1.5.0",
org.eclipse.emf.henshin.multicda.cpa;bundle-version="1.5.0",
org.junit;bundle-version="4.0.0",
- org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
- org.eclipse.uml2.uml;bundle-version="5.1.2",
org.eclipse.emf.ecore,
org.eclipse.emf.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -26,6 +21,5 @@
org.eclipse.emf.henshin.multicda.cda.conflict,
org.eclipse.emf.henshin.multicda.cda.dependency,
org.eclipse.emf.henshin.multicda.cda.framework,
- org.eclipse.emf.henshin.multicda.cda.runner,
org.eclipse.emf.henshin.multicda.cda.tasks,
org.eclipse.emf.henshin.multicda.cda.units
diff --git a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/Activator.java b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/Activator.java
index 51dd793..2b9ac73 100644
--- a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/Activator.java
+++ b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/Activator.java
@@ -1,12 +1,12 @@
package org.eclipse.emf.henshin.multicda.cda;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
-public class Activator extends AbstractUIPlugin {
+public class Activator extends Plugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.eclipse.emf.henshin.multicda.cda"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CdaWorker.java b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CdaWorker.java
index 4a6f083..858961c 100644
--- a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CdaWorker.java
+++ b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CdaWorker.java
@@ -26,12 +26,12 @@
import org.eclipse.emf.henshin.multicda.cda.framework.Condition.ReasonSize;
import org.eclipse.emf.henshin.multicda.cda.framework.Condition.StateProvider;
import org.eclipse.emf.henshin.multicda.cda.framework.Condition.State;
-import org.eclipse.emf.henshin.multicda.cda.runner.RulePreparator;
import org.eclipse.emf.henshin.multicda.cda.units.Atom;
import org.eclipse.emf.henshin.multicda.cda.units.Reason;
import org.eclipse.emf.henshin.multicda.cda.units.Span;
import org.eclipse.emf.henshin.multicda.cda.units.SymmetricReason;
import org.eclipse.emf.henshin.multicda.cpa.result.CriticalPair;
+import org.eclipse.emf.henshin.preprocessing.RulePreparator;
/**
* This worker provides execution, analysis and testing for Multi CDA
diff --git a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CpaWorker.java b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CpaWorker.java
index 1e51e88..ae71189 100644
--- a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CpaWorker.java
+++ b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/framework/CpaWorker.java
@@ -14,7 +14,6 @@
import org.eclipse.emf.henshin.model.Unit;
import org.eclipse.emf.henshin.model.resource.HenshinResourceSet;
import org.eclipse.emf.henshin.multicda.cda.ConflictAnalysis;
-import org.eclipse.emf.henshin.multicda.cda.runner.RulePreparator;
import org.eclipse.emf.henshin.multicda.cpa.CDAOptions;
import org.eclipse.emf.henshin.multicda.cpa.CpaByAGG;
import org.eclipse.emf.henshin.multicda.cpa.UnsupportedRuleException;
@@ -24,6 +23,7 @@
import org.eclipse.emf.henshin.multicda.cpa.result.CriticalPair;
import org.eclipse.emf.henshin.multicda.cpa.result.Dependency;
import org.eclipse.emf.henshin.preprocessing.NonDeletingPreparator;
+import org.eclipse.emf.henshin.preprocessing.RulePreparator;
/**
* This worker provides execution, analysis and testing for CPA
diff --git a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/runner/RulePreparator.java b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/preprocessing/RulePreparator.java
similarity index 95%
rename from plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/runner/RulePreparator.java
rename to plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/preprocessing/RulePreparator.java
index 106aec7..b22a059 100644
--- a/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/multicda/cda/runner/RulePreparator.java
+++ b/plugins/org.eclipse.emf.henshin.multicda.cda/src/org/eclipse/emf/henshin/preprocessing/RulePreparator.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.henshin.multicda.cda.runner;
+package org.eclipse.emf.henshin.preprocessing;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.emf.henshin.multicda.cpa.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.henshin.multicda.cpa.ui/META-INF/MANIFEST.MF
index 674f759..6b03398 100644
--- a/plugins/org.eclipse.emf.henshin.multicda.cpa.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.henshin.multicda.cpa.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,6 @@
org.eclipse.ui.workbench,
org.eclipse.emf.common.ui;bundle-version="2.9.0",
org.eclipse.emf.edit;bundle-version="2.10.1",
- org.eclipse.core.filesystem;bundle-version="1.4.100",
org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
org.eclipse.e4.core.contexts;bundle-version="1.3.100",
org.eclipse.emf.henshin.multicda.cda
