From b8ffef8ee7d18f019c8182413e71d2c656f47a3e Mon Sep 17 00:00:00 2001
From: Kevin Kassin <kevinkassin@gmx.de>
Date: Wed, 20 Sep 2017 22:53:45 +0200
Subject: [PATCH] Commit 20.9 23:00
renamed transformation packages to ...iorm...,
changed java version of transformation.test to 1.8,
diagrams of groups and compartment types now have snapping
---
org.framed.iorm.ui/META-INF/MANIFEST.MF | 2 +-
.../iorm/ui/multipage/MultipageEditor.java | 2 +-
.../shapes/CompartmentTypePattern.java | 2 +-
.../iorm/ui/pattern/shapes/GroupPattern.java | 2 +-
org.framed.orm.transformation.test/.classpath | 14 +++---
org.framed.orm.transformation.test/.project | 2 +-
.../.settings/org.eclipse.jdt.core.prefs | 6 +--
.../META-INF/MANIFEST.MF | 14 +++---
.../build.properties | 4 +-
org.framed.orm.transformation.test/plugin.xml | 2 +-
.../test/TransformationTestSuite.java | 10 ++--
.../test/model/test/TestCase.java | 28 +++++------
.../test/model/test/TestFactory.java | 6 +--
.../test/model/test/TestPackage.java | 38 +++++++--------
.../test/model/test/impl/TestCaseImpl.java | 15 +++---
.../test/model/test/impl/TestFactoryImpl.java | 5 +-
.../test/model/test/impl/TestPackageImpl.java | 11 ++---
.../test/testgeneration/ConfigGenerator.java | 46 +------------------
.../test/testgeneration/TestGenerator.java | 6 +--
.../model/test/util/TestAdapterFactory.java | 11 ++---
.../test/model/test/util/TestSwitch.java | 7 ++-
.../test/validation/TestCaseValidator.java | 4 +-
org.framed.orm.transformation/.project | 2 +-
.../META-INF/MANIFEST.MF | 6 +--
.../transformation/Activator.java | 4 +-
.../transformation/EpsilonStandalone.java | 4 +-
.../TransformationExecutor.java | 2 +-
27 files changed, 103 insertions(+), 152 deletions(-)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/TransformationTestSuite.java (96%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/TestCase.java (72%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/TestFactory.java (79%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/TestPackage.java (78%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/impl/TestCaseImpl.java (94%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/impl/TestFactoryImpl.java (94%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/impl/TestPackageImpl.java (95%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/testgeneration/ConfigGenerator.java (84%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/testgeneration/TestGenerator.java (96%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/util/TestAdapterFactory.java (89%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/util/TestSwitch.java (94%)
rename org.framed.orm.transformation.test/src/org/framed/{orm => iorm}/transformation/test/model/test/validation/TestCaseValidator.java (79%)
rename org.framed.orm.transformation/src/org/framed/{orm => iorm}/transformation/Activator.java (88%)
rename org.framed.orm.transformation/src/org/framed/{orm => iorm}/transformation/EpsilonStandalone.java (93%)
rename org.framed.orm.transformation/src/org/framed/{orm => iorm}/transformation/TransformationExecutor.java (98%)
diff --git a/org.framed.iorm.ui/META-INF/MANIFEST.MF b/org.framed.iorm.ui/META-INF/MANIFEST.MF
index 17c6190c..72a0b7a6 100644
--- a/org.framed.iorm.ui/META-INF/MANIFEST.MF
+++ b/org.framed.iorm.ui/META-INF/MANIFEST.MF
@@ -30,6 +30,6 @@ Require-Bundle: org.framed.iorm.featuremodel;bundle-version="1.0.0",
Import-Package: org.eclipse.graphiti.features;version="0.13.2",
org.framed.iorm.model,
org.framed.iorm.model.provider,
- org.framed.orm.transformation
+ org.framed.iorm.transformation
Export-Package: org.framed.iorm.ui.exceptions,
org.framed.iorm.ui.literals
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java
index 318fb0e5..400660f1 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/multipage/MultipageEditor.java
@@ -33,6 +33,7 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.part.FileEditorInput;
import org.framed.iorm.model.Model;
+import org.framed.iorm.transformation.TransformationExecutor;
import org.framed.iorm.ui.exceptions.InvalidTypeOfEditorInputException;
import org.framed.iorm.ui.exceptions.TransformationFailedException;
import org.framed.iorm.ui.literals.IdentifierLiterals;
@@ -49,7 +50,6 @@ import org.framed.iorm.ui.util.PropertyUtil;
import org.framed.iorm.ui.providers.DiagramTypeProvider; //*import for javadoc link
import org.framed.iorm.ui.providers.ToolBehaviorProvider;
import org.framed.iorm.ui.wizards.RoleModelWizard; //*import for javadoc link
-import org.framed.orm.transformation.TransformationExecutor;
/**
* This class is creates the overall editor to edit the role model.
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/CompartmentTypePattern.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/CompartmentTypePattern.java
index dd2f39a0..481ffb0f 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/CompartmentTypePattern.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/CompartmentTypePattern.java
@@ -363,7 +363,7 @@ public class CompartmentTypePattern extends FRaMEDShapePattern implements IPatte
width-2*PUFFER_BETWEEN_ELEMENTS, horizontalFirstThird-HEIGHT_NAME_SHAPE-2*PUFFER_BETWEEN_ELEMENTS);
//groups diagram
- Diagram contentDiagram = pictogramElementCreateService.createDiagram(DIAGRAM_TYPE, addedCompartmentType.getName(), 10, false);
+ Diagram contentDiagram = pictogramElementCreateService.createDiagram(DIAGRAM_TYPE, addedCompartmentType.getName(), 10, true);
PropertyUtil.setDiagram_KindValue(contentDiagram, DIAGRAM_KIND_COMPARTMENT_DIAGRAM);
AddGroupOrCompartmentTypeContext agctc = (AddGroupOrCompartmentTypeContext) addContext;
link(contentDiagram, agctc.getModelToLink());
diff --git a/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/GroupPattern.java b/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/GroupPattern.java
index f801aa7e..ec92bcb1 100644
--- a/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/GroupPattern.java
+++ b/org.framed.iorm.ui/src/org/framed/iorm/ui/pattern/shapes/GroupPattern.java
@@ -324,7 +324,7 @@ public class GroupPattern extends FRaMEDShapePattern implements IPattern {
width-2*PUFFER_BETWEEN_ELEMENTS, height-GROUP_CORNER_RADIUS);
//groups diagram
- Diagram contentDiagram = pictogramElementCreateService.createDiagram(DIAGRAM_TYPE, addedGroup.getName(), 10, false);
+ Diagram contentDiagram = pictogramElementCreateService.createDiagram(DIAGRAM_TYPE, addedGroup.getName(), 10, true);
PropertyUtil.setDiagram_KindValue(contentDiagram, DIAGRAM_KIND_GROUP_DIAGRAM);
AddGroupOrCompartmentTypeContext agctc = (AddGroupOrCompartmentTypeContext) addContext;
link(contentDiagram, agctc.getModelToLink());
diff --git a/org.framed.orm.transformation.test/.classpath b/org.framed.orm.transformation.test/.classpath
index e8ea977a..e334ecd9 100644
--- a/org.framed.orm.transformation.test/.classpath
+++ b/org.framed.orm.transformation.test/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.framed.orm.transformation.test/.project b/org.framed.orm.transformation.test/.project
index d34fa380..a6c4e44b 100644
--- a/org.framed.orm.transformation.test/.project
+++ b/org.framed.orm.transformation.test/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.framed.orm.transformation.test</name>
+ <name>org.framed.iorm.transformation.test</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.framed.orm.transformation.test/.settings/org.eclipse.jdt.core.prefs b/org.framed.orm.transformation.test/.settings/org.eclipse.jdt.core.prefs
index f42de363..0c68a61d 100644
--- a/org.framed.orm.transformation.test/.settings/org.eclipse.jdt.core.prefs
+++ b/org.framed.orm.transformation.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/org.framed.orm.transformation.test/META-INF/MANIFEST.MF b/org.framed.orm.transformation.test/META-INF/MANIFEST.MF
index 9c76958e..8698a8ad 100644
--- a/org.framed.orm.transformation.test/META-INF/MANIFEST.MF
+++ b/org.framed.orm.transformation.test/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.framed.orm.transformation.test;singleton:=true
+Bundle-SymbolicName: org.framed.iorm.transformation.test;singleton:=true
Bundle-Version: 2.0.3
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
- org.framed.orm.transformation;bundle-version="1.0.0",
+ org.framed.iorm.transformation;bundle-version="1.0.0",
org.junit,
org.rosi.crom.metamodel;visibility:=reexport,
org.framed.iorm.model;bundle-version="0.1.0";visibility:=reexport,
@@ -16,11 +16,11 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.compare;bundle-version="3.5.501",
org.eclipse.emf.compare;bundle-version="3.1.0",
de.ovgu.featureide.fm.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.framed.orm.transformation.test.model.test,
- org.framed.orm.transformation.test.model.test.impl,
- org.framed.orm.transformation.test.model.test.testgeneration,
- org.framed.orm.transformation.test.model.test.util
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.framed.iorm.transformation.test.model.test,
+ org.framed.iorm.transformation.test.model.test.impl,
+ org.framed.iorm.transformation.test.model.test.testgeneration,
+ org.framed.iorm.transformation.test.model.test.util
Bundle-ActivationPolicy: lazy
Import-Package: de.ovgu.featureide.fm.core,
de.ovgu.featureide.fm.core.configuration,
diff --git a/org.framed.orm.transformation.test/build.properties b/org.framed.orm.transformation.test/build.properties
index b855b244..6c5ac855 100644
--- a/org.framed.orm.transformation.test/build.properties
+++ b/org.framed.orm.transformation.test/build.properties
@@ -4,9 +4,7 @@ bin.includes = .,\
model/,\
META-INF/,\
plugin.xml,\
- plugin.properties,\
- testcases1/
+ plugin.properties\
jars.compile.order = .
source.. = src/
output.. = bin/
-src.includes = testcases1/
diff --git a/org.framed.orm.transformation.test/plugin.xml b/org.framed.orm.transformation.test/plugin.xml
index 38b5e733..521976a5 100644
--- a/org.framed.orm.transformation.test/plugin.xml
+++ b/org.framed.orm.transformation.test/plugin.xml
@@ -10,7 +10,7 @@
<!-- @generated testmodel -->
<package
uri="http://org.framed/testmodel"
- class="org.framed.orm.transformation.test.model.test.TestPackage"
+ class="org.framed.iorm.transformation.test.model.test.TestPackage"
genModel="model/testmodel.genmodel"/>
</extension>
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/TransformationTestSuite.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/TransformationTestSuite.java
similarity index 96%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/TransformationTestSuite.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/TransformationTestSuite.java
index f5a975bf..e1bddb9a 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/TransformationTestSuite.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/TransformationTestSuite.java
@@ -1,4 +1,4 @@
-package org.framed.orm.transformation.test;
+package org.framed.iorm.transformation.test;
import static org.junit.Assert.fail;
@@ -36,9 +36,9 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.framed.orm.transformation.TransformationExecutor;
-import org.framed.orm.transformation.test.model.test.TestCase;
-import org.framed.orm.transformation.test.model.test.testgeneration.TestGenerator;
+import org.framed.iorm.transformation.TransformationExecutor;
+import org.framed.iorm.transformation.test.model.test.TestCase;
+import org.framed.iorm.transformation.test.model.test.testgeneration.TestGenerator;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -323,7 +323,7 @@ public class TransformationTestSuite {
*/
public void deleteGeneratedTestCase() {
String filename = testCase.getTitle().substring(15);
- Bundle bundle = Platform.getBundle("org.framed.orm.transformation.test");
+ Bundle bundle = Platform.getBundle("org.framed.iorm.transformation.test");
URL fileURL = bundle.getEntry("testcases/Generated/" + filename + ".xmi");
try {
File file = new File(FileLocator.resolve(fileURL).toURI());
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestCase.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestCase.java
similarity index 72%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestCase.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestCase.java
index 125bd8dc..79e9f036 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestCase.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestCase.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test;
+package org.framed.iorm.transformation.test.model.test;
import org.eclipse.emf.ecore.EObject;
@@ -13,17 +13,17 @@ import org.framed.iorm.model.Model;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.framed.orm.transformation.test.model.test.TestCase#getTitle <em>Title</em>}</li>
- * <li>{@link org.framed.orm.transformation.test.model.test.TestCase#getDescription <em>Description
+ * <li>{@link org.framed.iorm.transformation.test.model.test.TestCase#getTitle <em>Title</em>}</li>
+ * <li>{@link org.framed.iorm.transformation.test.model.test.TestCase#getDescription <em>Description
* </em>}</li>
- * <li>{@link org.framed.orm.transformation.test.model.test.TestCase#getFramedModel <em>Framed Model
+ * <li>{@link org.framed.iorm.transformation.test.model.test.TestCase#getFramedModel <em>Framed Model
* </em>}</li>
- * <li>{@link org.framed.orm.transformation.test.model.test.TestCase#getCromModel <em>Crom Model
+ * <li>{@link org.framed.iorm.transformation.test.model.test.TestCase#getCromModel <em>Crom Model
* </em>}</li>
* </ul>
* </p>
*
- * @see org.framed.orm.transformation.test.model.test.TestPackage#getTestCase()
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage#getTestCase()
* @model
* @generated
*/
@@ -38,14 +38,14 @@ public interface TestCase extends EObject {
*
* @return the value of the '<em>Title</em>' attribute.
* @see #setTitle(String)
- * @see org.framed.orm.transformation.test.model.test.TestPackage#getTestCase_Title()
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage#getTestCase_Title()
* @model
* @generated
*/
String getTitle();
/**
- * Sets the value of the '{@link org.framed.orm.transformation.test.model.test.TestCase#getTitle
+ * Sets the value of the '{@link org.framed.iorm.transformation.test.model.test.TestCase#getTitle
* <em>Title</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value the new value of the '<em>Title</em>' attribute.
@@ -64,7 +64,7 @@ public interface TestCase extends EObject {
*
* @return the value of the '<em>Description</em>' attribute.
* @see #setDescription(String)
- * @see org.framed.orm.transformation.test.model.test.TestPackage#getTestCase_Description()
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage#getTestCase_Description()
* @model
* @generated
*/
@@ -72,7 +72,7 @@ public interface TestCase extends EObject {
/**
* Sets the value of the '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getDescription
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getDescription
* <em>Description</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value the new value of the '<em>Description</em>' attribute.
@@ -92,7 +92,7 @@ public interface TestCase extends EObject {
*
* @return the value of the '<em>Framed Model</em>' containment reference.
* @see #setFramedModel(Model)
- * @see org.framed.orm.transformation.test.model.test.TestPackage#getTestCase_FramedModel()
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage#getTestCase_FramedModel()
* @model containment="true"
* @generated
*/
@@ -100,7 +100,7 @@ public interface TestCase extends EObject {
/**
* Sets the value of the '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getFramedModel
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getFramedModel
* <em>Framed Model</em>}' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value the new value of the '<em>Framed Model</em>' containment reference.
@@ -120,7 +120,7 @@ public interface TestCase extends EObject {
*
* @return the value of the '<em>Crom Model</em>' containment reference.
* @see #setCromModel(crom_l1_composed.Model)
- * @see org.framed.orm.transformation.test.model.test.TestPackage#getTestCase_CromModel()
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage#getTestCase_CromModel()
* @model containment="true"
* @generated
*/
@@ -128,7 +128,7 @@ public interface TestCase extends EObject {
/**
* Sets the value of the '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getCromModel <em>Crom Model</em>}
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getCromModel <em>Crom Model</em>}
* ' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param value the new value of the '<em>Crom Model</em>' containment reference.
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestFactory.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestFactory.java
similarity index 79%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestFactory.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestFactory.java
index 10100361..d759b948 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestFactory.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestFactory.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test;
+package org.framed.iorm.transformation.test.model.test;
import org.eclipse.emf.ecore.EFactory;
@@ -8,7 +8,7 @@ import org.eclipse.emf.ecore.EFactory;
* <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each
* non-abstract class of the model. <!-- end-user-doc -->
*
- * @see org.framed.orm.transformation.test.model.test.TestPackage
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage
* @generated
*/
public interface TestFactory extends EFactory {
@@ -17,7 +17,7 @@ public interface TestFactory extends EFactory {
*
* @generated
*/
- TestFactory eINSTANCE = org.framed.orm.transformation.test.model.test.impl.TestFactoryImpl.init();
+ TestFactory eINSTANCE = org.framed.iorm.transformation.test.model.test.impl.TestFactoryImpl.init();
/**
* Returns a new object of class '<em>Case</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestPackage.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestPackage.java
similarity index 78%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestPackage.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestPackage.java
index ae153829..176c7236 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/TestPackage.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/TestPackage.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test;
+package org.framed.iorm.transformation.test.model.test;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EReference;
* </ul>
* <!-- end-user-doc -->
*
- * @see org.framed.orm.transformation.test.model.test.TestFactory
+ * @see org.framed.iorm.transformation.test.model.test.TestFactory
* @model kind="package"
* @generated
*/
@@ -50,15 +50,15 @@ public interface TestPackage extends EPackage {
*
* @generated
*/
- TestPackage eINSTANCE = org.framed.orm.transformation.test.model.test.impl.TestPackageImpl.init();
+ TestPackage eINSTANCE = org.framed.iorm.transformation.test.model.test.impl.TestPackageImpl.init();
/**
* The meta object id for the '
- * {@link org.framed.orm.transformation.test.model.test.impl.TestCaseImpl <em>Case</em>}' class.
+ * {@link org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl <em>Case</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @see org.framed.orm.transformation.test.model.test.impl.TestCaseImpl
- * @see org.framed.orm.transformation.test.model.test.impl.TestPackageImpl#getTestCase()
+ * @see org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl
+ * @see org.framed.iorm.transformation.test.model.test.impl.TestPackageImpl#getTestCase()
* @generated
*/
int TEST_CASE = 0;
@@ -120,22 +120,22 @@ public interface TestPackage extends EPackage {
/**
* Returns the meta object for class '
- * {@link org.framed.orm.transformation.test.model.test.TestCase <em>Case</em>}'. <!--
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase <em>Case</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for class '<em>Case</em>'.
- * @see org.framed.orm.transformation.test.model.test.TestCase
+ * @see org.framed.iorm.transformation.test.model.test.TestCase
* @generated
*/
EClass getTestCase();
/**
* Returns the meta object for the attribute '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getTitle <em>Title</em>}'. <!--
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getTitle <em>Title</em>}'. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Title</em>'.
- * @see org.framed.orm.transformation.test.model.test.TestCase#getTitle()
+ * @see org.framed.iorm.transformation.test.model.test.TestCase#getTitle()
* @see #getTestCase()
* @generated
*/
@@ -143,11 +143,11 @@ public interface TestPackage extends EPackage {
/**
* Returns the meta object for the attribute '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getDescription
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getDescription
* <em>Description</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Description</em>'.
- * @see org.framed.orm.transformation.test.model.test.TestCase#getDescription()
+ * @see org.framed.iorm.transformation.test.model.test.TestCase#getDescription()
* @see #getTestCase()
* @generated
*/
@@ -155,11 +155,11 @@ public interface TestPackage extends EPackage {
/**
* Returns the meta object for the containment reference '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getFramedModel
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getFramedModel
* <em>Framed Model</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the containment reference '<em>Framed Model</em>'.
- * @see org.framed.orm.transformation.test.model.test.TestCase#getFramedModel()
+ * @see org.framed.iorm.transformation.test.model.test.TestCase#getFramedModel()
* @see #getTestCase()
* @generated
*/
@@ -167,11 +167,11 @@ public interface TestPackage extends EPackage {
/**
* Returns the meta object for the containment reference '
- * {@link org.framed.orm.transformation.test.model.test.TestCase#getCromModel <em>Crom Model</em>}
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase#getCromModel <em>Crom Model</em>}
* '. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the containment reference '<em>Crom Model</em>'.
- * @see org.framed.orm.transformation.test.model.test.TestCase#getCromModel()
+ * @see org.framed.iorm.transformation.test.model.test.TestCase#getCromModel()
* @see #getTestCase()
* @generated
*/
@@ -202,11 +202,11 @@ public interface TestPackage extends EPackage {
interface Literals {
/**
* The meta object literal for the '
- * {@link org.framed.orm.transformation.test.model.test.impl.TestCaseImpl <em>Case</em>}' class.
+ * {@link org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl <em>Case</em>}' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
- * @see org.framed.orm.transformation.test.model.test.impl.TestCaseImpl
- * @see org.framed.orm.transformation.test.model.test.impl.TestPackageImpl#getTestCase()
+ * @see org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl
+ * @see org.framed.iorm.transformation.test.model.test.impl.TestPackageImpl#getTestCase()
* @generated
*/
EClass TEST_CASE = eINSTANCE.getTestCase();
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestCaseImpl.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestCaseImpl.java
similarity index 94%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestCaseImpl.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestCaseImpl.java
index 02a78623..182ad255 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestCaseImpl.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestCaseImpl.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test.impl;
+package org.framed.iorm.transformation.test.model.test.impl;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -12,9 +12,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.framed.iorm.model.Model;
-
-import org.framed.orm.transformation.test.model.test.TestCase;
-import org.framed.orm.transformation.test.model.test.TestPackage;
+import org.framed.iorm.transformation.test.model.test.TestCase;
+import org.framed.iorm.transformation.test.model.test.TestPackage;
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Case</b></em>'. <!--
@@ -22,13 +21,13 @@ import org.framed.orm.transformation.test.model.test.TestPackage;
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.framed.orm.transformation.test.model.test.impl.TestCaseImpl#getTitle <em>Title
+ * <li>{@link org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl#getTitle <em>Title
* </em>}</li>
- * <li>{@link org.framed.orm.transformation.test.model.test.impl.TestCaseImpl#getDescription <em>
+ * <li>{@link org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl#getDescription <em>
* Description</em>}</li>
- * <li>{@link org.framed.orm.transformation.test.model.test.impl.TestCaseImpl#getFramedModel <em>
+ * <li>{@link org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl#getFramedModel <em>
* Framed Model</em>}</li>
- * <li>{@link org.framed.orm.transformation.test.model.test.impl.TestCaseImpl#getCromModel <em>Crom
+ * <li>{@link org.framed.iorm.transformation.test.model.test.impl.TestCaseImpl#getCromModel <em>Crom
* Model</em>}</li>
* </ul>
* </p>
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestFactoryImpl.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestFactoryImpl.java
similarity index 94%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestFactoryImpl.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestFactoryImpl.java
index 7d284afd..94ec91d4 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestFactoryImpl.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestFactoryImpl.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test.impl;
+package org.framed.iorm.transformation.test.model.test.impl;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
@@ -9,8 +9,7 @@ import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.framed.orm.transformation.test.model.test.*;
+import org.framed.iorm.transformation.test.model.test.*;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestPackageImpl.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestPackageImpl.java
similarity index 95%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestPackageImpl.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestPackageImpl.java
index 67c82d9f..6cd25c87 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/impl/TestPackageImpl.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/impl/TestPackageImpl.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test.impl;
+package org.framed.iorm.transformation.test.model.test.impl;
import crom_l1_composed.Crom_l1_composedPackage;
@@ -12,10 +12,9 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.framed.iorm.model.OrmPackage;
-
-import org.framed.orm.transformation.test.model.test.TestCase;
-import org.framed.orm.transformation.test.model.test.TestFactory;
-import org.framed.orm.transformation.test.model.test.TestPackage;
+import org.framed.iorm.transformation.test.model.test.TestCase;
+import org.framed.iorm.transformation.test.model.test.TestFactory;
+import org.framed.iorm.transformation.test.model.test.TestPackage;
/**
* <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->
@@ -40,7 +39,7 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
* if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.framed.orm.transformation.test.model.test.TestPackage#eNS_URI
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage#eNS_URI
* @see #init()
* @generated
*/
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/testgeneration/ConfigGenerator.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/testgeneration/ConfigGenerator.java
similarity index 84%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/testgeneration/ConfigGenerator.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/testgeneration/ConfigGenerator.java
index a1c107de..7b5abd3a 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/testgeneration/ConfigGenerator.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/testgeneration/ConfigGenerator.java
@@ -1,26 +1,12 @@
-package org.framed.orm.transformation.test.model.test.testgeneration;
+package org.framed.iorm.transformation.test.model.test.testgeneration;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.framed.iorm.ui.exceptions.FeatureModelNotReadableException;
-import org.framed.iorm.ui.literals.URLLiterals;
-import org.osgi.framework.Bundle;
-
-import de.ovgu.featureide.fm.core.base.IFeatureModel;
-import de.ovgu.featureide.fm.core.configuration.Configuration;
-import de.ovgu.featureide.fm.core.configuration.SelectableFeature;
-import de.ovgu.featureide.fm.core.configuration.Selection;
import de.ovgu.featureide.fm.core.io.UnsupportedModelException;
-import de.ovgu.featureide.fm.core.io.manager.FeatureModelManager;
/**
* @author Kevin Kassin<br>
@@ -68,17 +54,7 @@ public class ConfigGenerator {
* the file of the corresponding feature model.
*/
File featureModelFile = null;
-
- /**
- * the actual feature model used for the configuration
- */
- private IFeatureModel featureModel;
-
- /**
- * URLs to the feature model and its standard configuration gathered from {@link URLLiterals}
- */
- private final URL URL_TO_FEATUREMODEL = URLLiterals.URL_TO_FEATUREMODEL;
-
+
/**
* Constructor
*/
@@ -120,24 +96,6 @@ public class ConfigGenerator {
return bitSetCopy;
}
- /**
- * Reads the included Feature Model from the bundle org.framed.orm.featuremodel
- *
- * @throws FileNotFoundException
- * @throws UnsupportedModelException
- */
- public void readFeatureModel() throws FileNotFoundException, UnsupportedModelException {
- File featureModelFile = null;
- try {
- featureModelFile = new File(FileLocator.resolve(URL_TO_FEATUREMODEL).toURI());
- } catch (URISyntaxException | IOException e) { e.printStackTrace(); }
- FeatureModelManager featureModelManager = FeatureModelManager.getInstance(featureModelFile.toPath());
- if(featureModelManager.getLastProblems().containsError()) {
- throw new FeatureModelNotReadableException();
- }
- featureModel = featureModelManager.getObject();
- }
-
/**
* Set Requirements that are used to generate valid configurations that cover every requirement.<br>
* <br>
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/testgeneration/TestGenerator.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/testgeneration/TestGenerator.java
similarity index 96%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/testgeneration/TestGenerator.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/testgeneration/TestGenerator.java
index 98a61433..71d59867 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/testgeneration/TestGenerator.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/testgeneration/TestGenerator.java
@@ -1,4 +1,4 @@
-package org.framed.orm.transformation.test.model.test.testgeneration;
+package org.framed.iorm.transformation.test.model.test.testgeneration;
import java.io.File;
import java.io.IOException;
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.framed.iorm.featuremodel.FRaMEDFeature;
-import org.framed.orm.transformation.test.model.test.TestCase;
+import org.framed.iorm.transformation.test.model.test.TestCase;
import org.osgi.framework.Bundle;
import crom_l1_composed.*;
@@ -46,7 +46,7 @@ public class TestGenerator {
public void generateTestCases() throws IOException, URISyntaxException, UnsupportedModelException {
List<BitSet> configList = new ArrayList<BitSet>();
configGenerator = new ConfigGenerator();
- Bundle bundle = Platform.getBundle("org.framed.orm.transformation.test");
+ Bundle bundle = Platform.getBundle("org.framed.iorm.transformation.test");
URL fileURL = bundle.getEntry("testcases/Generated/baseTest.xmi");
File file = new File(FileLocator.resolve(fileURL).toURI());
String str_config;
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/util/TestAdapterFactory.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/util/TestAdapterFactory.java
similarity index 89%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/util/TestAdapterFactory.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/util/TestAdapterFactory.java
index 2622cbfb..4d5cec85 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/util/TestAdapterFactory.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/util/TestAdapterFactory.java
@@ -1,6 +1,6 @@
/**
*/
-package org.framed.orm.transformation.test.model.test.util;
+package org.framed.iorm.transformation.test.model.test.util;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
@@ -8,14 +8,13 @@ import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
-
-import org.framed.orm.transformation.test.model.test.*;
+import org.framed.iorm.transformation.test.model.test.*;
/**
* <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter
* <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->
*
- * @see org.framed.orm.transformation.test.model.test.TestPackage
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage
* @generated
*/
public class TestAdapterFactory extends AdapterFactoryImpl {
@@ -89,13 +88,13 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
/**
* Creates a new adapter for an object of class '
- * {@link org.framed.orm.transformation.test.model.test.TestCase <em>Case</em>}'. <!--
+ * {@link org.framed.iorm.transformation.test.model.test.TestCase <em>Case</em>}'. <!--
* begin-user-doc --> This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway. <!--
* end-user-doc -->
*
* @return the new adapter.
- * @see org.framed.orm.transformation.test.model.test.TestCase
+ * @see org.framed.iorm.transformation.test.model.test.TestCase
* @generated
*/
public Adapter createTestCaseAdapter() {
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/util/TestSwitch.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/util/TestSwitch.java
similarity index 94%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/util/TestSwitch.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/util/TestSwitch.java
index 05946ee5..bf500ec1 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/util/TestSwitch.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/util/TestSwitch.java
@@ -1,13 +1,12 @@
/**
*/
-package org.framed.orm.transformation.test.model.test.util;
+package org.framed.iorm.transformation.test.model.test.util;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-
-import org.framed.orm.transformation.test.model.test.*;
+import org.framed.iorm.transformation.test.model.test.*;
/**
* <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the
@@ -16,7 +15,7 @@ import org.framed.orm.transformation.test.model.test.*;
* inheritance hierarchy until a non-null result is returned, which is the result of the switch.
* <!-- end-user-doc -->
*
- * @see org.framed.orm.transformation.test.model.test.TestPackage
+ * @see org.framed.iorm.transformation.test.model.test.TestPackage
* @generated
*/
public class TestSwitch<T> extends Switch<T> {
diff --git a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/validation/TestCaseValidator.java b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/validation/TestCaseValidator.java
similarity index 79%
rename from org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/validation/TestCaseValidator.java
rename to org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/validation/TestCaseValidator.java
index 4f368102..1b2f64ad 100644
--- a/org.framed.orm.transformation.test/src/org/framed/orm/transformation/test/model/test/validation/TestCaseValidator.java
+++ b/org.framed.orm.transformation.test/src/org/framed/iorm/transformation/test/model/test/validation/TestCaseValidator.java
@@ -2,12 +2,12 @@
*
* $Id$
*/
-package org.framed.orm.transformation.test.model.test.validation;
+package org.framed.iorm.transformation.test.model.test.validation;
import org.framed.iorm.model.Model;
/**
- * A sample validator interface for {@link org.framed.orm.transformation.test.model.test.TestCase}.
+ * A sample validator interface for {@link org.framed.iorm.transformation.test.model.test.TestCase}.
* This doesn't really do anything, and it's not a real EMF artifact. It was generated by the
* org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can
* be extended. This can be disabled with -vmargs
diff --git a/org.framed.orm.transformation/.project b/org.framed.orm.transformation/.project
index bb45fec9..d2c0e256 100644
--- a/org.framed.orm.transformation/.project
+++ b/org.framed.orm.transformation/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.framed.orm.transformation</name>
+ <name>org.framed.iorm.transformation</name>
<comment></comment>
<projects>
</projects>
diff --git a/org.framed.orm.transformation/META-INF/MANIFEST.MF b/org.framed.orm.transformation/META-INF/MANIFEST.MF
index ce2af287..8f2113c7 100644
--- a/org.framed.orm.transformation/META-INF/MANIFEST.MF
+++ b/org.framed.orm.transformation/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Transformation
-Bundle-SymbolicName: org.framed.orm.transformation;singleton:=true
+Bundle-SymbolicName: org.framed.iorm.transformation;singleton:=true
Bundle-Version: 2.0.3
-Bundle-Activator: org.framed.orm.transformation.Activator
+Bundle-Activator: org.framed.iorm.transformation.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.epsilon.eol.engine,
@@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.ui,
org.rosi.crom.metamodel;bundle-version="0.1.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Export-Package: org.framed.orm.transformation
+Export-Package: org.framed.iorm.transformation
diff --git a/org.framed.orm.transformation/src/org/framed/orm/transformation/Activator.java b/org.framed.orm.transformation/src/org/framed/iorm/transformation/Activator.java
similarity index 88%
rename from org.framed.orm.transformation/src/org/framed/orm/transformation/Activator.java
rename to org.framed.orm.transformation/src/org/framed/iorm/transformation/Activator.java
index c070661f..a5004927 100644
--- a/org.framed.orm.transformation/src/org/framed/orm/transformation/Activator.java
+++ b/org.framed.orm.transformation/src/org/framed/iorm/transformation/Activator.java
@@ -1,4 +1,4 @@
-package org.framed.orm.transformation;
+package org.framed.iorm.transformation;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -9,7 +9,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.framed.orm.transformation"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.framed.iorm.transformation"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/org.framed.orm.transformation/src/org/framed/orm/transformation/EpsilonStandalone.java b/org.framed.orm.transformation/src/org/framed/iorm/transformation/EpsilonStandalone.java
similarity index 93%
rename from org.framed.orm.transformation/src/org/framed/orm/transformation/EpsilonStandalone.java
rename to org.framed.orm.transformation/src/org/framed/iorm/transformation/EpsilonStandalone.java
index 217b5676..6cc4e9b2 100644
--- a/org.framed.orm.transformation/src/org/framed/orm/transformation/EpsilonStandalone.java
+++ b/org.framed.orm.transformation/src/org/framed/iorm/transformation/EpsilonStandalone.java
@@ -1,4 +1,4 @@
-package org.framed.orm.transformation;
+package org.framed.iorm.transformation;
import java.net.URI;
import java.net.URISyntaxException;
@@ -57,7 +57,7 @@ public abstract class EpsilonStandalone {
}
private URI getTransformationFile() {
- Bundle bundle = Platform.getBundle("org.framed.orm.transformation");
+ Bundle bundle = Platform.getBundle("org.framed.iorm.transformation");
URL fileURL = bundle.getEntry(getSource());
try {
diff --git a/org.framed.orm.transformation/src/org/framed/orm/transformation/TransformationExecutor.java b/org.framed.orm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java
similarity index 98%
rename from org.framed.orm.transformation/src/org/framed/orm/transformation/TransformationExecutor.java
rename to org.framed.orm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java
index 86e104f3..0b55cdf6 100644
--- a/org.framed.orm.transformation/src/org/framed/orm/transformation/TransformationExecutor.java
+++ b/org.framed.orm.transformation/src/org/framed/iorm/transformation/TransformationExecutor.java
@@ -1,4 +1,4 @@
-package org.framed.orm.transformation;
+package org.framed.iorm.transformation;
import java.util.ArrayList;
import java.util.List;
--
GitLab