smell 'Large Eclass' moved from ...ecore to ...ecore.metricbased
diff --git a/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties b/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties
index b80a78c..49965f9 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore.compositional/build.properties
@@ -6,8 +6,4 @@
bin/,\
build.properties,\
src/
-src.includes = src/,\
- plugin.xml,\
- build.properties,\
- bin/,\
- META-INF/
+src.includes = bin/
diff --git a/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties b/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties
index c1ed33c..1272807 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore.henshin/build.properties
@@ -8,8 +8,4 @@
src/,\
transformations/
src.includes = transformations/,\
- src/,\
- plugin.xml,\
- build.properties,\
- bin/,\
- META-INF/
+ bin/
diff --git a/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties b/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties
index d8fd41a..c2c054a 100644
--- a/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore.ocl/build.properties
@@ -6,8 +6,4 @@
bin/,\
build.properties,\
src/
-src.includes = src/,\
- plugin.xml,\
- build.properties,\
- bin/,\
- META-INF/
+src.includes = bin/
diff --git a/org.eclipse.emf.refactor.metrics.ecore/build.properties b/org.eclipse.emf.refactor.metrics.ecore/build.properties
index 872d386..25c7d8c 100644
--- a/org.eclipse.emf.refactor.metrics.ecore/build.properties
+++ b/org.eclipse.emf.refactor.metrics.ecore/build.properties
@@ -6,8 +6,4 @@
src/,\
bin/,\
build.properties
-src.includes = src/,\
- plugin.xml,\
- build.properties,\
- bin/,\
- META-INF/
+src.includes = bin/
diff --git a/org.eclipse.emf.refactor.smells.ecore/.settings/org.eclipse.core.resources.prefs b/org.eclipse.emf.refactor.smells.ecore.henshin/.settings/org.eclipse.core.resources.prefs
similarity index 99%
rename from org.eclipse.emf.refactor.smells.ecore/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.emf.refactor.smells.ecore.henshin/.settings/org.eclipse.core.resources.prefs
index 274f876..8f4646a 100644
--- a/org.eclipse.emf.refactor.smells.ecore/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.emf.refactor.smells.ecore.henshin/.settings/org.eclipse.core.resources.prefs
@@ -1,3 +1,3 @@
-eclipse.preferences.version=1
-encoding//transformations/speculative.henshin=UTF-8
-encoding//transformations/speculative.henshin_diagram=UTF-8
+eclipse.preferences.version=1
+encoding//transformations/speculative.henshin=UTF-8
+encoding//transformations/speculative.henshin_diagram=UTF-8
diff --git a/org.eclipse.emf.refactor.smells.ecore.henshin/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.ecore.henshin/META-INF/MANIFEST.MF
index be61f7e..0de2e9b 100644
--- a/org.eclipse.emf.refactor.smells.ecore.henshin/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.ecore.henshin/META-INF/MANIFEST.MF
@@ -5,6 +5,9 @@
Bundle-Version: 0.7.0
Bundle-Activator: org.eclipse.emf.refactor.smells.ecore.henshin.Activator
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.refactor.smells;bundle-version="0.7.0",
+ org.eclipse.emf.refactor.smells.henshin;bundle-version="0.7.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.smells.ecore.henshin/bin/org/eclipse/emf/refactor/smells/ecore/henshin/SpeculativeGeneralityEClass.class b/org.eclipse.emf.refactor.smells.ecore.henshin/bin/org/eclipse/emf/refactor/smells/ecore/henshin/SpeculativeGeneralityEClass.class
new file mode 100644
index 0000000..c158939
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.ecore.henshin/bin/org/eclipse/emf/refactor/smells/ecore/henshin/SpeculativeGeneralityEClass.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.ecore.henshin/build.properties b/org.eclipse.emf.refactor.smells.ecore.henshin/build.properties
index 34d2e4d..e9863e2 100644
--- a/org.eclipse.emf.refactor.smells.ecore.henshin/build.properties
+++ b/org.eclipse.emf.refactor.smells.ecore.henshin/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ plugin.xml
diff --git a/org.eclipse.emf.refactor.smells.ecore.henshin/plugin.xml b/org.eclipse.emf.refactor.smells.ecore.henshin/plugin.xml
new file mode 100644
index 0000000..f76877c
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.ecore.henshin/plugin.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.emf.refactor.smells">
+ <modelsmell
+ id="org.eclipse.emf.refactor.smells.ecore.speculativegeneralityeclass"
+ modelsmell_description="The model contains an abstract EClass that is inherited by one concrete EClass only."
+ modelsmell_finderclass="org.eclipse.emf.refactor.smells.ecore.henshin.SpeculativeGeneralityEClass"
+ modelsmell_metamodel="http://www.eclipse.org/emf/2002/Ecore"
+ modelsmell_name="Speculative Generality EClass">
+ </modelsmell>
+ </extension>
+
+</plugin>
diff --git a/org.eclipse.emf.refactor.smells.ecore/src/org/eclipse/emf/refactor/smells/ecore/SpeculativeGeneralityEClass.java b/org.eclipse.emf.refactor.smells.ecore.henshin/src/org/eclipse/emf/refactor/smells/ecore/henshin/SpeculativeGeneralityEClass.java
similarity index 87%
rename from org.eclipse.emf.refactor.smells.ecore/src/org/eclipse/emf/refactor/smells/ecore/SpeculativeGeneralityEClass.java
rename to org.eclipse.emf.refactor.smells.ecore.henshin/src/org/eclipse/emf/refactor/smells/ecore/henshin/SpeculativeGeneralityEClass.java
index b8e92c7..92a1a6a 100644
--- a/org.eclipse.emf.refactor.smells.ecore/src/org/eclipse/emf/refactor/smells/ecore/SpeculativeGeneralityEClass.java
+++ b/org.eclipse.emf.refactor.smells.ecore.henshin/src/org/eclipse/emf/refactor/smells/ecore/henshin/SpeculativeGeneralityEClass.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.smells.ecore;
+package org.eclipse.emf.refactor.smells.ecore.henshin;
import java.io.IOException;
import java.net.URL;
@@ -8,7 +8,6 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.ecore.EObject;
-
import org.eclipse.emf.refactor.smells.henshin.managers.HenshinRuntimeManager;
import org.eclipse.emf.refactor.smells.interfaces.IModelSmellFinder;
@@ -25,7 +24,7 @@
}
private String getFullPath(String transformationPath){
- URL url = FileLocator.find(org.eclipse.emf.refactor.smells.ecore.Activator.getDefault().getBundle(),
+ URL url = FileLocator.find(Activator.getDefault().getBundle(),
new Path(transformationPath), Collections.EMPTY_MAP);
URL fileUrl = null;
try {
diff --git a/org.eclipse.emf.refactor.smells.ecore/transformations/speculative.henshin b/org.eclipse.emf.refactor.smells.ecore.henshin/transformations/speculative.henshin
similarity index 100%
rename from org.eclipse.emf.refactor.smells.ecore/transformations/speculative.henshin
rename to org.eclipse.emf.refactor.smells.ecore.henshin/transformations/speculative.henshin
diff --git a/org.eclipse.emf.refactor.smells.ecore/transformations/speculative.henshin_diagram b/org.eclipse.emf.refactor.smells.ecore.henshin/transformations/speculative.henshin_diagram
similarity index 100%
rename from org.eclipse.emf.refactor.smells.ecore/transformations/speculative.henshin_diagram
rename to org.eclipse.emf.refactor.smells.ecore.henshin/transformations/speculative.henshin_diagram
diff --git a/org.eclipse.emf.refactor.smells.ecore/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.ecore/META-INF/MANIFEST.MF
index a071fb2..0096c08 100644
--- a/org.eclipse.emf.refactor.smells.ecore/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.refactor.smells.ecore/META-INF/MANIFEST.MF
@@ -7,8 +7,6 @@
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.8.1",
- org.eclipse.emf.refactor.smells;bundle-version="0.7.0",
- org.eclipse.emf.refactor.metrics;bundle-version="0.7.0",
- org.eclipse.emf.refactor.smells.henshin;bundle-version="0.7.0"
+ org.eclipse.emf.refactor.smells;bundle-version="0.7.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.smells.ecore/bin/org/eclipse/emf/refactor/smells/ecore/SpeculativeGeneralityEClass.class b/org.eclipse.emf.refactor.smells.ecore/bin/org/eclipse/emf/refactor/smells/ecore/SpeculativeGeneralityEClass.class
deleted file mode 100644
index f9d1ead..0000000
--- a/org.eclipse.emf.refactor.smells.ecore/bin/org/eclipse/emf/refactor/smells/ecore/SpeculativeGeneralityEClass.class
+++ /dev/null
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.ecore/build.properties b/org.eclipse.emf.refactor.smells.ecore/build.properties
index 8b184d9..f1ab0b1 100644
--- a/org.eclipse.emf.refactor.smells.ecore/build.properties
+++ b/org.eclipse.emf.refactor.smells.ecore/build.properties
@@ -3,6 +3,5 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- transformations/,\
src/,\
bin/
diff --git a/org.eclipse.emf.refactor.smells.ecore/plugin.xml b/org.eclipse.emf.refactor.smells.ecore/plugin.xml
index 10ff667..9b8b65b 100644
--- a/org.eclipse.emf.refactor.smells.ecore/plugin.xml
+++ b/org.eclipse.emf.refactor.smells.ecore/plugin.xml
@@ -10,20 +10,6 @@
modelsmell_metamodel="http://www.eclipse.org/emf/2002/Ecore"
modelsmell_name="Unnamed EClass">
</modelsmell>
- <modelsmell
- id="org.eclipse.emf.refactor.smells.ecore.largeeclass"
- modelsmell_description="The model contains an EClass owning more features (EAttributes and EOperations) than the specified limit."
- modelsmell_finderclass="org.eclipse.emf.refactor.smells.ecore.LargeEClass"
- modelsmell_metamodel="http://www.eclipse.org/emf/2002/Ecore"
- modelsmell_name="Large EClass">
- </modelsmell>
- <modelsmell
- id="org.eclipse.emf.refactor.smells.ecore.speculativegeneralityeclass"
- modelsmell_description="The model contains an abstract EClass that is inherited by one concrete EClass only."
- modelsmell_finderclass="org.eclipse.emf.refactor.smells.ecore.SpeculativeGeneralityEClass"
- modelsmell_metamodel="http://www.eclipse.org/emf/2002/Ecore"
- modelsmell_name="Speculative Generality EClass">
- </modelsmell>
</extension>
</plugin>
diff --git a/org.eclipse.emf.refactor.smells.metricbased/.classpath b/org.eclipse.emf.refactor.smells.metricbased/.classpath
new file mode 100644
index 0000000..8a8f166
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.emf.refactor.smells.metricbased/.project b/org.eclipse.emf.refactor.smells.metricbased/.project
new file mode 100644
index 0000000..b128b4d
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.refactor.smells.metricbased</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.emf.refactor.smells.metricbased/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.emf.refactor.smells.metricbased/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..f287d53
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.emf.refactor.smells.metricbased/META-INF/MANIFEST.MF b/org.eclipse.emf.refactor.smells.metricbased/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..26d1d80
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SmellsEcoreMetricbased
+Bundle-SymbolicName: org.eclipse.emf.refactor.smells.metricbased;singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Activator: org.eclipse.emf.refactor.smells.metricbased.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.8.1",
+ org.eclipse.emf.refactor.smells;bundle-version="0.7.0",
+ org.eclipse.emf.refactor.metrics;bundle-version="0.7.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.emf.refactor.smells.metricbased/bin/org/eclipse/emf/refactor/smells/metricbased/Activator.class b/org.eclipse.emf.refactor.smells.metricbased/bin/org/eclipse/emf/refactor/smells/metricbased/Activator.class
new file mode 100644
index 0000000..ccfcbaa
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/bin/org/eclipse/emf/refactor/smells/metricbased/Activator.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.ecore/bin/org/eclipse/emf/refactor/smells/ecore/LargeEClass.class b/org.eclipse.emf.refactor.smells.metricbased/bin/org/eclipse/emf/refactor/smells/metricbased/LargeEClass.class
similarity index 84%
rename from org.eclipse.emf.refactor.smells.ecore/bin/org/eclipse/emf/refactor/smells/ecore/LargeEClass.class
rename to org.eclipse.emf.refactor.smells.metricbased/bin/org/eclipse/emf/refactor/smells/metricbased/LargeEClass.class
index e1d54e9..14b1936 100644
--- a/org.eclipse.emf.refactor.smells.ecore/bin/org/eclipse/emf/refactor/smells/ecore/LargeEClass.class
+++ b/org.eclipse.emf.refactor.smells.metricbased/bin/org/eclipse/emf/refactor/smells/metricbased/LargeEClass.class
Binary files differ
diff --git a/org.eclipse.emf.refactor.smells.metricbased/build.properties b/org.eclipse.emf.refactor.smells.metricbased/build.properties
new file mode 100644
index 0000000..49965f9
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/build.properties
@@ -0,0 +1,9 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ bin/,\
+ build.properties,\
+ src/
+src.includes = bin/
diff --git a/org.eclipse.emf.refactor.smells.metricbased/plugin.xml b/org.eclipse.emf.refactor.smells.metricbased/plugin.xml
new file mode 100644
index 0000000..9fb806f
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/plugin.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.emf.refactor.smells">
+ <modelsmell
+ id="org.eclipse.emf.refactor.smells.ecore.largeeclass"
+ modelsmell_description="The model contains an EClass owning more features (EAttributes and EOperations) than the specified limit."
+ modelsmell_finderclass="org.eclipse.emf.refactor.smells.metricbased.LargeEClass"
+ modelsmell_metamodel="http://www.eclipse.org/emf/2002/Ecore"
+ modelsmell_name="Large EClass">
+ </modelsmell>
+ </extension>
+
+</plugin>
diff --git a/org.eclipse.emf.refactor.smells.metricbased/src/org/eclipse/emf/refactor/smells/metricbased/Activator.java b/org.eclipse.emf.refactor.smells.metricbased/src/org/eclipse/emf/refactor/smells/metricbased/Activator.java
new file mode 100644
index 0000000..76f2d2e
--- /dev/null
+++ b/org.eclipse.emf.refactor.smells.metricbased/src/org/eclipse/emf/refactor/smells/metricbased/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.emf.refactor.smells.metricbased;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.emf.refactor.smells.metricbased"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
diff --git a/org.eclipse.emf.refactor.smells.ecore/src/org/eclipse/emf/refactor/smells/ecore/LargeEClass.java b/org.eclipse.emf.refactor.smells.metricbased/src/org/eclipse/emf/refactor/smells/metricbased/LargeEClass.java
similarity index 97%
rename from org.eclipse.emf.refactor.smells.ecore/src/org/eclipse/emf/refactor/smells/ecore/LargeEClass.java
rename to org.eclipse.emf.refactor.smells.metricbased/src/org/eclipse/emf/refactor/smells/metricbased/LargeEClass.java
index 6dbef49..34668da 100644
--- a/org.eclipse.emf.refactor.smells.ecore/src/org/eclipse/emf/refactor/smells/ecore/LargeEClass.java
+++ b/org.eclipse.emf.refactor.smells.metricbased/src/org/eclipse/emf/refactor/smells/metricbased/LargeEClass.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.smells.ecore;
+package org.eclipse.emf.refactor.smells.metricbased;
import java.util.LinkedList;
import java.util.List;
