Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-11-03 21:48:24 +0000
committerMartin Taal2013-11-03 21:48:24 +0000
commitfd925ae0239b74fe2f1e1f2d6bfee8fa8896b2be (patch)
tree58b96e0a5a4372a85eeaf0b29478986419d537b7
parentb26a4547656ed33d901ae5d5e5857f01b0c97baa (diff)
downloadorg.eclipse.emf.texo-fd925ae0239b74fe2f1e1f2d6bfee8fa8896b2be.tar.gz
org.eclipse.emf.texo-fd925ae0239b74fe2f1e1f2d6bfee8fa8896b2be.tar.xz
org.eclipse.emf.texo-fd925ae0239b74fe2f1e1f2d6bfee8fa8896b2be.zip
Updated for Kepler
-rw-r--r--core/org.eclipse.emf.texo.json/.classpath6
-rw-r--r--core/org.eclipse.emf.texo.xml/.classpath6
-rwxr-xr-xcore/org.eclipse.emf.texo/.classpath6
-rw-r--r--generator/org.eclipse.emf.texo.modelgenerator/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.orm.edit/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.orm/.classpath2
-rw-r--r--generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/template-persistence.xml47
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap7
-rw-r--r--infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap7
-rw-r--r--runtime/org.eclipse.emf.texo.server/.classpath6
-rwxr-xr-xtests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch3
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch3
-rwxr-xr-xtests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java2
-rw-r--r--tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/models/samples/graphiti.ecore752
-rwxr-xr-xtests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF1
-rw-r--r--tests/org.eclipse.emf.texo.orm.test/src/META-INF/sessions.xml8
-rwxr-xr-xtests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/JPATest.java8
-rw-r--r--tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF12
-rwxr-xr-xtests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/BaseTest.java2
-rw-r--r--tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java2
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AbstractText.java84
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelFactory.java20
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelPackage.java32
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelFactory.java297
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelPackage.java299
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyle.java303
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyleRegion.java134
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/UnderlineStyle.java264
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleDao.java30
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleRegionDao.java30
-rw-r--r--tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore74
-rw-r--r--tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz363802.java2
-rw-r--r--tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz393240.java8
-rwxr-xr-xtests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestTemplateOverride.java2
-rw-r--r--tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestUtils.java59
-rw-r--r--tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF3
37 files changed, 2078 insertions, 451 deletions
diff --git a/core/org.eclipse.emf.texo.json/.classpath b/core/org.eclipse.emf.texo.json/.classpath
index 45fde860..64c5e31b 100644
--- a/core/org.eclipse.emf.texo.json/.classpath
+++ b/core/org.eclipse.emf.texo.json/.classpath
@@ -1,10 +1,6 @@
<?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/J2SE-1.5">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/org.eclipse.emf.texo.xml/.classpath b/core/org.eclipse.emf.texo.xml/.classpath
index 45fde860..64c5e31b 100644
--- a/core/org.eclipse.emf.texo.xml/.classpath
+++ b/core/org.eclipse.emf.texo.xml/.classpath
@@ -1,10 +1,6 @@
<?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/J2SE-1.5">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/core/org.eclipse.emf.texo/.classpath b/core/org.eclipse.emf.texo/.classpath
index 45fde860..64c5e31b 100755
--- a/core/org.eclipse.emf.texo/.classpath
+++ b/core/org.eclipse.emf.texo/.classpath
@@ -1,10 +1,6 @@
<?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/J2SE-1.5">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/generator/org.eclipse.emf.texo.modelgenerator/.classpath b/generator/org.eclipse.emf.texo.modelgenerator/.classpath
index 3e360dd7..7380c130 100644
--- a/generator/org.eclipse.emf.texo.modelgenerator/.classpath
+++ b/generator/org.eclipse.emf.texo.modelgenerator/.classpath
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="xtend-gen"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/generator/org.eclipse.emf.texo.orm.edit/.classpath b/generator/org.eclipse.emf.texo.orm.edit/.classpath
index 304e8618..64c5e31b 100644
--- a/generator/org.eclipse.emf.texo.orm.edit/.classpath
+++ b/generator/org.eclipse.emf.texo.orm.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/generator/org.eclipse.emf.texo.orm/.classpath b/generator/org.eclipse.emf.texo.orm/.classpath
index 304e8618..64c5e31b 100644
--- a/generator/org.eclipse.emf.texo.orm/.classpath
+++ b/generator/org.eclipse.emf.texo.orm/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/template-persistence.xml b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/template-persistence.xml
new file mode 100644
index 00000000..23aecf05
--- /dev/null
+++ b/generator/org.eclipse.emf.texo.orm/src/org/eclipse/emf/texo/orm/annotator/template-persistence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0"
+ xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+ <persistence-unit name="texo-orm-hsqldb">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <mapping-file>META-INF/orm.xml</mapping-file>
+ <properties>
+ <property name="eclipselink.session.customizer" value="org.eclipse.emf.texo.test.TexoSessionCustomizer"/>
+ <property name="eclipselink.target-database" value="org.eclipse.persistence.platform.database.HSQLPlatform"/>
+ <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:{dbname}"/>
+ <property name="javax.persistence.jdbc.user" value="sa"/>
+ <property name="javax.persistence.jdbc.password" value=""/>
+
+ <!-- EclipseLink should create the database schema automatically -->
+
+ <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+ <property name="eclipselink.ddl-generation.output-mode" value="database" />
+ <!-- property name="eclipselink.drop-ddl-jdbc-file-name" value="{dbname}-drop.sql"/>
+ <property name="eclipselink.create-ddl-jdbc-file-name" value="{dbname}-create.sql"/>
+ <property name="eclipselink.application-location" value="ddl/"/-->
+ <property name="eclipselink.logging.level" value="WARNING" />
+ </properties>
+ </persistence-unit>
+
+ <persistence-unit name="texo-class-mysql">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+{class}
+ <properties>
+ <property name="eclipselink.target-database" value="Mysql"/>
+ <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+ <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/{dbname}"/>
+ <property name="javax.persistence.jdbc.user" value="root"/>
+ <property name="javax.persistence.jdbc.password" value="root"/>
+
+ <!-- EclipseLink should create the database schema automatically -->
+ <property name="eclipselink.ddl-generation" value="drop-and-create-tables" />
+ <property name="eclipselink.ddl-generation.output-mode" value="database" />
+ <!-- property name="eclipselink.drop-ddl-jdbc-file-name" value="{dbname}-drop.sql"/>
+ <property name="eclipselink.create-ddl-jdbc-file-name" value="{dbname}-create.sql"/>
+ <property name="eclipselink.application-location" value="ddl/"/-->
+ <property name="eclipselink.logging.level" value="WARNING" />
+ </properties>
+ </persistence-unit>
+</persistence> \ No newline at end of file
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap b/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
index 5ca34567..ef523a17 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/build/texo.rmap
@@ -68,6 +68,11 @@
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Kepler)">
+ <uri format="{0}/jetty/updates/jetty-bundles-8.x">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
<uri format="{0}/releases/juno">
<bc:propertyRef key="eclipse.download"/>
@@ -130,7 +135,7 @@
</uri>
</provider>
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
- <uri format="http://www.elver.org/eclipse/2.0.0/update/">
+ <uri format="http://www.elver.org/eclipse/2.1.0/update/">
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
diff --git a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
index b031b365..b0c928c5 100644
--- a/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
+++ b/infra/org.eclipse.emf.texo.releng.buckminster/test/texo.rmap
@@ -76,6 +76,11 @@
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Kepler)">
+ <uri format="{0}/jetty/updates/jetty-bundles-8.x">
+ <bc:propertyRef key="eclipse.download"/>
+ </uri>
+ </provider>
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
<uri format="{0}/releases/juno">
<bc:propertyRef key="eclipse.download"/>
@@ -132,7 +137,7 @@
</uri>
</provider>
<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
- <uri format="http://www.elver.org/eclipse/2.0.0/update/">
+ <uri format="http://www.elver.org/eclipse/2.1.0/update/">
<bc:propertyRef key="eclipse.download"/>
</uri>
</provider>
diff --git a/runtime/org.eclipse.emf.texo.server/.classpath b/runtime/org.eclipse.emf.texo.server/.classpath
index 45fde860..64c5e31b 100644
--- a/runtime/org.eclipse.emf.texo.server/.classpath
+++ b/runtime/org.eclipse.emf.texo.server/.classpath
@@ -1,10 +1,6 @@
<?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/J2SE-1.5">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch
index 6ba19c52..0896549a 100755
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorSingleModelTest.launch
@@ -24,6 +24,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.modelgenerator.test.EclipseModelGeneratorSingleModelTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.modelgenerator.test"/>
@@ -32,7 +33,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.activation@default:default,javax.annotation*1.1.0.v201108011116@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet*2.4.0.v200806031604@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.transaction@default:false,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang*2.6.0.v201205030909@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.xbase.lib@default:default,org.hamcrest.core@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.log4j@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*11.0.2.v201303041551@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.ning.async-http-client@default:default,javax.activation*1.1.0.v201108011116@default:default,javax.activation*1.1.0.v201211130549@default:default,javax.annotation@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet*2.4.0.v200806031604@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jem.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.xbase.lib@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.junit*4.11.0.v201303080030@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch
index 25398bcb..68ed991c 100644
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/EclipseModelGeneratorTest.launch
@@ -24,6 +24,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.texo.modelgenerator.test.EclipseModelGeneratorTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.texo.modelgenerator.test"/>
@@ -32,7 +33,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.activation@default:default,javax.annotation*1.1.0.v201108011116@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet*2.4.0.v200806031604@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.transaction@default:false,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang*2.6.0.v201205030909@default:default,org.apache.commons.logging@default:default,org.apache.log4j@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.persistence.jpa.equinox.weaving@default:false,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.xbase.lib@default:default,org.hamcrest.core@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.log4j@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*11.0.2.v201303041551@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.ning.async-http-client@default:default,javax.activation*1.1.0.v201108011116@default:default,javax.activation*1.1.0.v201211130549@default:default,javax.annotation@default:default,javax.inject@default:default,javax.mail@default:default,javax.servlet*2.4.0.v200806031604@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jem.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.logback.appender@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.xbase.lib@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.junit*4.11.0.v201303080030@default:default,org.slf4j.api@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.texo.annotations.model@default:default,org.eclipse.emf.texo.eclipse@default:default,org.eclipse.emf.texo.generator@default:default,org.eclipse.emf.texo.modelgenerator.test@default:default,org.eclipse.emf.texo.modelgenerator@default:default,org.eclipse.emf.texo.orm@default:default,org.eclipse.emf.texo@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java
index 9dbad8e1..13f13652 100755
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/EclipseModelGeneratorSingleModelTest.java
@@ -50,7 +50,7 @@ public class EclipseModelGeneratorSingleModelTest extends EclipseModelGeneratorT
// modelFiles.add("issues/bz397220.ecore"); //$NON-NLS-1$
// modelFiles.add("texo/TexoDataRequest.xsd"); //$NON-NLS-1$
// modelFiles.add("texo/TexoDataResponse.xsd"); //$NON-NLS-1$
- modelFiles.add("issues/bz409157.ecore"); //$NON-NLS-1$
+ modelFiles.add("samples/graphiti.ecore"); //$NON-NLS-1$
// modelFiles.add("schemaconstructs/List.xsd");//$NON-NLS-1$
// modelFiles.add("issues/bz403743.ecore"); //$NON-NLS-1$
// modelFiles.add("samples/forum.xsd"); //$NON-NLS-1$
diff --git a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/models/samples/graphiti.ecore b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/models/samples/graphiti.ecore
index 9cb06974..ba9296f2 100644
--- a/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/models/samples/graphiti.ecore
+++ b/tests/org.eclipse.emf.texo.modelgenerator.test/src/org/eclipse/emf/texo/modelgenerator/test/models/samples/graphiti.ecore
@@ -1,365 +1,387 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mm"
- nsURI="http://eclipse.org/graphiti/mm" nsPrefix="mm">
- <eClassifiers xsi:type="ecore:EClass" name="Property">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PropertyContainer" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
- upperBound="-1" eType="#//Property" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GraphicsAlgorithmContainer" abstract="true"
- eSuperTypes="#//PropertyContainer"/>
- <eClassifiers xsi:type="ecore:EClass" name="StyleContainer" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="styles" ordered="false"
- upperBound="-1" eType="#//algorithms/styles/Style" containment="true" eOpposite="#//algorithms/styles/Style/styleContainer"/>
- </eClassifiers>
- <eSubpackages name="pictograms" nsURI="http://eclipse.org/graphiti/mm/pictograms"
- nsPrefix="pi">
- <eClassifiers xsi:type="ecore:EClass" name="Shape" eSuperTypes="#//pictograms/AnchorContainer">
- <eStructuralFeatures xsi:type="ecore:EReference" name="container" ordered="false"
- unique="false" eType="#//pictograms/ContainerShape" eOpposite="#//pictograms/ContainerShape/children"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ContainerShape" eSuperTypes="#//pictograms/Shape">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//pictograms/Shape" containment="true" eOpposite="#//pictograms/Shape/container"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//pictograms/ContainerShape #//StyleContainer">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="gridUnit" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramTypeId" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="connections" ordered="false"
- upperBound="-1" eType="#//pictograms/Connection" containment="true" eOpposite="#//pictograms/Connection/parent"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="snapToGrid" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="showGuides" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- <details key="suppressedGetVisibility" value="true"/>
- <details key="documentation" value=" @deprecated This attribute simply exists because of compatibility (after &#xD;&#xA;removing it old diagrams would not be readable any more). It is never &#xD;&#xA;evaluated, instead the Graphiti framework queries the tool behaviour provider &#xD;&#xA;if guides shall be shown in a diagram editor.&#xD;&#xA;"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="colors" ordered="false"
- upperBound="-1" eType="#//algorithms/styles/Color" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fonts" ordered="false"
- upperBound="-1" eType="#//algorithms/styles/Font" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="pictogramLinks" ordered="false"
- upperBound="-1" eType="#//pictograms/PictogramLink"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalGridUnit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
- defaultValueLiteral="-1"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- defaultValueLiteral="">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PictogramElement" abstract="true"
- eSuperTypes="#//GraphicsAlgorithmContainer">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="graphicsAlgorithm" ordered="false"
- unique="false" eType="#//algorithms/GraphicsAlgorithm" containment="true"
- eOpposite="#//algorithms/GraphicsAlgorithm/pictogramElement"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="active" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="link" ordered="false"
- unique="false" eType="#//pictograms/PictogramLink" containment="true" eOpposite="#//pictograms/PictogramLink/pictogramElement"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//pictograms/AnchorContainer">
- <eStructuralFeatures xsi:type="ecore:EReference" name="start" ordered="false"
- unique="false" lowerBound="1" eType="#//pictograms/Anchor" eOpposite="#//pictograms/Anchor/outgoingConnections"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false"
- unique="false" lowerBound="1" eType="#//pictograms/Anchor" eOpposite="#//pictograms/Anchor/incomingConnections"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
- unique="false" lowerBound="1" eType="#//pictograms/Diagram" eOpposite="#//pictograms/Diagram/connections"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="connectionDecorators"
- upperBound="-1" eType="#//pictograms/ConnectionDecorator" containment="true"
- eOpposite="#//pictograms/ConnectionDecorator/connection"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Anchor" abstract="true" eSuperTypes="#//pictograms/PictogramElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
- unique="false" lowerBound="1" eType="#//pictograms/AnchorContainer" eOpposite="#//pictograms/AnchorContainer/anchors"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingConnections"
- ordered="false" upperBound="-1" eType="#//pictograms/Connection" eOpposite="#//pictograms/Connection/start"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConnections"
- ordered="false" upperBound="-1" eType="#//pictograms/Connection" eOpposite="#//pictograms/Connection/end"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="referencedGraphicsAlgorithm"
- ordered="false" unique="false" eType="#//algorithms/GraphicsAlgorithm"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AnchorContainer" abstract="true" eSuperTypes="#//pictograms/PictogramElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="anchors" ordered="false"
- upperBound="-1" eType="#//pictograms/Anchor" containment="true" eOpposite="#//pictograms/Anchor/parent"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FixPointAnchor" eSuperTypes="#//pictograms/AdvancedAnchor">
- <eStructuralFeatures xsi:type="ecore:EReference" name="location" ordered="false"
- unique="false" lowerBound="1" eType="#//algorithms/styles/Point" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BoxRelativeAnchor" eSuperTypes="#//pictograms/AdvancedAnchor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="relativeWidth" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="relativeHeight" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ChopboxAnchor" eSuperTypes="#//pictograms/Anchor"/>
- <eClassifiers xsi:type="ecore:EClass" name="ConnectionDecorator" eSuperTypes="#//pictograms/Shape">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationRelative" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="connection" ordered="false"
- unique="false" lowerBound="1" eType="#//pictograms/Connection" eOpposite="#//pictograms/Connection/connectionDecorators"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FreeFormConnection" eSuperTypes="#//pictograms/Connection">
- <eStructuralFeatures xsi:type="ecore:EReference" name="bendpoints" upperBound="-1"
- eType="#//algorithms/styles/Point" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ManhattanConnection" eSuperTypes="#//pictograms/Connection"/>
- <eClassifiers xsi:type="ecore:EClass" name="PictogramLink" eSuperTypes="#//PropertyContainer">
- <eStructuralFeatures xsi:type="ecore:EReference" name="pictogramElement" ordered="false"
- unique="false" eType="#//pictograms/PictogramElement" eOpposite="#//pictograms/PictogramElement/link"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="businessObjects" upperBound="-1"
- eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AdvancedAnchor" abstract="true" eSuperTypes="#//pictograms/Anchor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="useAnchorLocationAsConnectionEndpoint"
- ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CurvedConnection" eSuperTypes="#//pictograms/Connection">
- <eStructuralFeatures xsi:type="ecore:EReference" name="controlPoints" upperBound="-1"
- eType="#//algorithms/styles/PrecisionPoint" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CompositeConnection" eSuperTypes="#//pictograms/Connection">
- <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
- eType="#//pictograms/CurvedConnection"/>
- </eClassifiers>
- </eSubpackages>
- <eSubpackages name="algorithms" nsURI="http://eclipse.org/graphiti/mm/algorithms"
- nsPrefix="al">
- <eClassifiers xsi:type="ecore:EClass" name="GraphicsAlgorithm" abstract="true"
- eSuperTypes="#//GraphicsAlgorithmContainer #//algorithms/styles/AbstractStyle">
- <eStructuralFeatures xsi:type="ecore:EReference" name="graphicsAlgorithmChildren"
- upperBound="-1" eType="#//algorithms/GraphicsAlgorithm" containment="true"
- eOpposite="#//algorithms/GraphicsAlgorithm/parentGraphicsAlgorithm"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parentGraphicsAlgorithm"
- ordered="false" unique="false" eType="#//algorithms/GraphicsAlgorithm" eOpposite="#//algorithms/GraphicsAlgorithm/graphicsAlgorithmChildren"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="pictogramElement" ordered="false"
- unique="false" eType="#//pictograms/PictogramElement" eOpposite="#//pictograms/PictogramElement/graphicsAlgorithm"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="style" ordered="false"
- unique="false" eType="#//algorithms/styles/Style"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//algorithms/GraphicsAlgorithm">
- <eStructuralFeatures xsi:type="ecore:EReference" name="points" upperBound="-1"
- eType="#//algorithms/styles/Point" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//algorithms/GraphicsAlgorithm"/>
- <eClassifiers xsi:type="ecore:EClass" name="Text" eSuperTypes="#//algorithms/AbstractText"/>
- <eClassifiers xsi:type="ecore:EClass" name="Polygon" eSuperTypes="#//algorithms/Polyline"/>
- <eClassifiers xsi:type="ecore:EClass" name="Rectangle" eSuperTypes="#//algorithms/GraphicsAlgorithm"/>
- <eClassifiers xsi:type="ecore:EClass" name="RoundedRectangle" eSuperTypes="#//algorithms/GraphicsAlgorithm">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerHeight" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerWidth" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Image" eSuperTypes="#//algorithms/GraphicsAlgorithm">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchH" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchV" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportional" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PlatformGraphicsAlgorithm" eSuperTypes="#//algorithms/GraphicsAlgorithm">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractText" abstract="true" eSuperTypes="#//algorithms/GraphicsAlgorithm">
- <eStructuralFeatures xsi:type="ecore:EReference" name="font" ordered="false"
- unique="false" eType="#//algorithms/styles/Font"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalAlignment"
- ordered="false" unique="false" eType="#//algorithms/styles/Orientation"
- defaultValueLiteral="ALIGNMENT_LEFT"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment" ordered="false"
- unique="false" eType="#//algorithms/styles/Orientation" defaultValueLiteral="ALIGNMENT_CENTER"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="angle" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
- defaultValueLiteral="0"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MultiText" eSuperTypes="#//algorithms/AbstractText"/>
- <eSubpackages name="styles" nsURI="http://eclipse.org/graphiti/mm/algorithms/styles"
- nsPrefix="st">
- <eClassifiers xsi:type="ecore:EEnum" name="LineStyle">
- <eLiterals name="SOLID"/>
- <eLiterals name="DASH" value="1"/>
- <eLiterals name="DASHDOT" value="2"/>
- <eLiterals name="DASHDOTDOT" value="3"/>
- <eLiterals name="DOT" value="4"/>
- <eLiterals name="UNSPECIFIED" value="5" literal="UNSPECIFIED"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="Orientation">
- <eLiterals name="ALIGNMENT_CENTER"/>
- <eLiterals name="ALIGNMENT_LEFT" value="1"/>
- <eLiterals name="ALIGNMENT_TOP" value="2"/>
- <eLiterals name="ALIGNMENT_RIGHT" value="3"/>
- <eLiterals name="ALIGNMENT_BOTTOM" value="4"/>
- <eLiterals name="ALIGNMENT_MIDDLE" value="5"/>
- <eLiterals name="UNSPECIFIED" value="6" literal="UNSPECIFIED"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="LocationType">
- <eLiterals name="LOCATION_TYPE_RELATIVE" value="1"/>
- <eLiterals name="LOCATION_TYPE_ABSOLUTE_START" value="2"/>
- <eLiterals name="LOCATION_TYPE_ABSOLUTE_END" value="3"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="RenderingStyle">
- <eStructuralFeatures xsi:type="ecore:EReference" name="adaptedGradientColoredAreas"
- eType="#//algorithms/styles/AdaptedGradientColoredAreas" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Style" eSuperTypes="#//StyleContainer #//algorithms/styles/AbstractStyle">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="font" ordered="false"
- unique="false" eType="#//algorithms/styles/Font"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalAlignment"
- ordered="false" unique="false" eType="#//algorithms/styles/Orientation"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment"
- ordered="false" unique="false" eType="#//algorithms/styles/Orientation"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="angle" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchH" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchV" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportional" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="styleContainer" ordered="false"
- unique="false" lowerBound="1" eType="#//StyleContainer" eOpposite="#//StyleContainer/styles"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractStyle" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="background" ordered="false"
- unique="false" eType="#//algorithms/styles/Color"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="foreground" ordered="false"
- unique="false" eType="#//algorithms/styles/Color"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineWidth" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" ordered="false"
- unique="false" eType="#//algorithms/styles/LineStyle"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="filled" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="true" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineVisible" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
- defaultValueLiteral="true" unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="renderingStyle" ordered="false"
- unique="false" eType="#//algorithms/styles/RenderingStyle" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="transparency" ordered="false"
- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GradientColoredLocation">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationType" lowerBound="1"
- eType="#//algorithms/styles/LocationType"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationValue" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="color" lowerBound="1"
- eType="#//algorithms/styles/Color" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GradientColoredArea">
- <eStructuralFeatures xsi:type="ecore:EReference" name="start" eType="#//algorithms/styles/GradientColoredLocation"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="end" eType="#//algorithms/styles/GradientColoredLocation"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GradientColoredAreas">
- <eStructuralFeatures xsi:type="ecore:EReference" name="gradientColor" upperBound="-1"
- eType="#//algorithms/styles/GradientColoredArea" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="styleAdaption" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AdaptedGradientColoredAreas">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="definedStyleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="adaptedGradientColoredAreas"
- upperBound="-1" eType="#//algorithms/styles/GradientColoredAreas" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="gradientType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Font">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="italic" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="bold" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Point">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Color">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="red" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="green" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" ordered="false"
- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="suppressedSetVisibility" value="true"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PrecisionPoint">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
- </eClassifiers>
- </eSubpackages>
- </eSubpackages>
-</ecore:EPackage> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mm" nsURI="http://eclipse.org/graphiti/mm" nsPrefix="mm">
+ <eClassifiers xsi:type="ecore:EClass" name="Property">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PropertyContainer" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="properties" ordered="false"
+ upperBound="-1" eType="#//Property" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GraphicsAlgorithmContainer" abstract="true"
+ eSuperTypes="#//PropertyContainer"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StyleContainer" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="styles" ordered="false"
+ upperBound="-1" eType="#//algorithms/styles/Style" containment="true" eOpposite="#//algorithms/styles/Style/styleContainer"/>
+ </eClassifiers>
+ <eSubpackages name="pictograms" nsURI="http://eclipse.org/graphiti/mm/pictograms"
+ nsPrefix="pi">
+ <eClassifiers xsi:type="ecore:EClass" name="Shape" eSuperTypes="#//pictograms/AnchorContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="container" ordered="false"
+ unique="false" eType="#//pictograms/ContainerShape" eOpposite="#//pictograms/ContainerShape/children"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ContainerShape" eSuperTypes="#//pictograms/Shape">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//pictograms/Shape" containment="true" eOpposite="#//pictograms/Shape/container"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Diagram" eSuperTypes="#//pictograms/ContainerShape #//StyleContainer">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="gridUnit" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="diagramTypeId" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connections" ordered="false"
+ upperBound="-1" eType="#//pictograms/Connection" containment="true" eOpposite="#//pictograms/Connection/parent"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="snapToGrid" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="showGuides" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ <details key="suppressedGetVisibility" value="true"/>
+ <details key="documentation" value=" @deprecated This attribute simply exists because of compatibility (after &#xD;&#xA;removing it old diagrams would not be readable any more). It is never &#xD;&#xA;evaluated, instead the Graphiti framework queries the tool behaviour provider &#xD;&#xA;if guides shall be shown in a diagram editor.&#xD;&#xA;"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="colors" ordered="false"
+ upperBound="-1" eType="#//algorithms/styles/Color" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="fonts" ordered="false"
+ upperBound="-1" eType="#//algorithms/styles/Font" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="pictogramLinks" ordered="false"
+ upperBound="-1" eType="#//pictograms/PictogramLink"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalGridUnit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ defaultValueLiteral="-1"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ defaultValueLiteral="">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PictogramElement" abstract="true"
+ eSuperTypes="#//GraphicsAlgorithmContainer">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="graphicsAlgorithm" ordered="false"
+ unique="false" eType="#//algorithms/GraphicsAlgorithm" containment="true"
+ eOpposite="#//algorithms/GraphicsAlgorithm/pictogramElement"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="active" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="link" ordered="false"
+ unique="false" eType="#//pictograms/PictogramLink" containment="true" eOpposite="#//pictograms/PictogramLink/pictogramElement"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//pictograms/AnchorContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="start" ordered="false"
+ unique="false" lowerBound="1" eType="#//pictograms/Anchor" eOpposite="#//pictograms/Anchor/outgoingConnections"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="end" ordered="false"
+ unique="false" lowerBound="1" eType="#//pictograms/Anchor" eOpposite="#//pictograms/Anchor/incomingConnections"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
+ unique="false" lowerBound="1" eType="#//pictograms/Diagram" eOpposite="#//pictograms/Diagram/connections"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connectionDecorators"
+ upperBound="-1" eType="#//pictograms/ConnectionDecorator" containment="true"
+ eOpposite="#//pictograms/ConnectionDecorator/connection"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Anchor" abstract="true" eSuperTypes="#//pictograms/PictogramElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent" ordered="false"
+ unique="false" lowerBound="1" eType="#//pictograms/AnchorContainer" eOpposite="#//pictograms/AnchorContainer/anchors"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="outgoingConnections"
+ ordered="false" upperBound="-1" eType="#//pictograms/Connection" eOpposite="#//pictograms/Connection/start"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="incomingConnections"
+ ordered="false" upperBound="-1" eType="#//pictograms/Connection" eOpposite="#//pictograms/Connection/end"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="referencedGraphicsAlgorithm"
+ ordered="false" unique="false" eType="#//algorithms/GraphicsAlgorithm"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AnchorContainer" abstract="true" eSuperTypes="#//pictograms/PictogramElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="anchors" ordered="false"
+ upperBound="-1" eType="#//pictograms/Anchor" containment="true" eOpposite="#//pictograms/Anchor/parent"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FixPointAnchor" eSuperTypes="#//pictograms/AdvancedAnchor">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="location" ordered="false"
+ unique="false" lowerBound="1" eType="#//algorithms/styles/Point" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BoxRelativeAnchor" eSuperTypes="#//pictograms/AdvancedAnchor">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="relativeWidth" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="relativeHeight" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ChopboxAnchor" eSuperTypes="#//pictograms/Anchor"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ConnectionDecorator" eSuperTypes="#//pictograms/Shape">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationRelative" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="location" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="connection" ordered="false"
+ unique="false" lowerBound="1" eType="#//pictograms/Connection" eOpposite="#//pictograms/Connection/connectionDecorators"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="FreeFormConnection" eSuperTypes="#//pictograms/Connection">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="bendpoints" upperBound="-1"
+ eType="#//algorithms/styles/Point" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ManhattanConnection" eSuperTypes="#//pictograms/Connection"/>
+ <eClassifiers xsi:type="ecore:EClass" name="PictogramLink" eSuperTypes="#//PropertyContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="pictogramElement" ordered="false"
+ unique="false" eType="#//pictograms/PictogramElement" eOpposite="#//pictograms/PictogramElement/link"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="businessObjects" upperBound="-1"
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AdvancedAnchor" abstract="true" eSuperTypes="#//pictograms/Anchor">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="useAnchorLocationAsConnectionEndpoint"
+ ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CurvedConnection" eSuperTypes="#//pictograms/Connection">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="controlPoints" upperBound="-1"
+ eType="#//algorithms/styles/PrecisionPoint" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CompositeConnection" eSuperTypes="#//pictograms/Connection">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+ eType="#//pictograms/CurvedConnection"/>
+ </eClassifiers>
+ </eSubpackages>
+ <eSubpackages name="algorithms" nsURI="http://eclipse.org/graphiti/mm/algorithms"
+ nsPrefix="al">
+ <eClassifiers xsi:type="ecore:EClass" name="GraphicsAlgorithm" abstract="true"
+ eSuperTypes="#//GraphicsAlgorithmContainer #//algorithms/styles/AbstractStyle">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="graphicsAlgorithmChildren"
+ upperBound="-1" eType="#//algorithms/GraphicsAlgorithm" containment="true"
+ eOpposite="#//algorithms/GraphicsAlgorithm/parentGraphicsAlgorithm"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parentGraphicsAlgorithm"
+ ordered="false" unique="false" eType="#//algorithms/GraphicsAlgorithm" eOpposite="#//algorithms/GraphicsAlgorithm/graphicsAlgorithmChildren"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="pictogramElement" ordered="false"
+ unique="false" eType="#//pictograms/PictogramElement" eOpposite="#//pictograms/PictogramElement/graphicsAlgorithm"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" ordered="false" unique="false"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" ordered="false" unique="false"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="style" ordered="false"
+ unique="false" eType="#//algorithms/styles/Style"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//algorithms/GraphicsAlgorithm">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="points" upperBound="-1"
+ eType="#//algorithms/styles/Point" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//algorithms/GraphicsAlgorithm"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Text" eSuperTypes="#//algorithms/AbstractText"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Polygon" eSuperTypes="#//algorithms/Polyline"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Rectangle" eSuperTypes="#//algorithms/GraphicsAlgorithm"/>
+ <eClassifiers xsi:type="ecore:EClass" name="RoundedRectangle" eSuperTypes="#//algorithms/GraphicsAlgorithm">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerHeight" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerWidth" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Image" eSuperTypes="#//algorithms/GraphicsAlgorithm">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" unique="false"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchH" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchV" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportional" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PlatformGraphicsAlgorithm" eSuperTypes="#//algorithms/GraphicsAlgorithm">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false" unique="false"
+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractText" abstract="true" eSuperTypes="#//algorithms/GraphicsAlgorithm">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="font" ordered="false"
+ unique="false" eType="#//algorithms/styles/Font"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalAlignment"
+ ordered="false" unique="false" eType="#//algorithms/styles/Orientation"
+ defaultValueLiteral="ALIGNMENT_LEFT"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment" ordered="false"
+ unique="false" eType="#//algorithms/styles/Orientation" defaultValueLiteral="ALIGNMENT_CENTER"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="angle" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
+ defaultValueLiteral="0"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="styleRegions" upperBound="-1"
+ eType="#//algorithms/styles/TextStyleRegion" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MultiText" eSuperTypes="#//algorithms/AbstractText"/>
+ <eSubpackages name="styles" nsURI="http://eclipse.org/graphiti/mm/algorithms/styles"
+ nsPrefix="st">
+ <eClassifiers xsi:type="ecore:EEnum" name="LineStyle">
+ <eLiterals name="SOLID"/>
+ <eLiterals name="DASH" value="1"/>
+ <eLiterals name="DASHDOT" value="2"/>
+ <eLiterals name="DASHDOTDOT" value="3"/>
+ <eLiterals name="DOT" value="4"/>
+ <eLiterals name="UNSPECIFIED" value="5" literal="UNSPECIFIED"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="Orientation">
+ <eLiterals name="ALIGNMENT_CENTER"/>
+ <eLiterals name="ALIGNMENT_LEFT" value="1"/>
+ <eLiterals name="ALIGNMENT_TOP" value="2"/>
+ <eLiterals name="ALIGNMENT_RIGHT" value="3"/>
+ <eLiterals name="ALIGNMENT_BOTTOM" value="4"/>
+ <eLiterals name="ALIGNMENT_MIDDLE" value="5"/>
+ <eLiterals name="UNSPECIFIED" value="6" literal="UNSPECIFIED"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="LocationType">
+ <eLiterals name="LOCATION_TYPE_RELATIVE" value="1"/>
+ <eLiterals name="LOCATION_TYPE_ABSOLUTE_START" value="2"/>
+ <eLiterals name="LOCATION_TYPE_ABSOLUTE_END" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="UnderlineStyle">
+ <eLiterals name="UNDERLINE_SINGLE"/>
+ <eLiterals name="UNDERLINE_DOUBLE" value="1"/>
+ <eLiterals name="UNDERLINE_ERROR" value="2"/>
+ <eLiterals name="UNDERLINE_SQUIGGLE" value="3"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RenderingStyle">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="adaptedGradientColoredAreas"
+ eType="#//algorithms/styles/AdaptedGradientColoredAreas" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Style" eSuperTypes="#//StyleContainer #//algorithms/styles/AbstractStyle">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="font" ordered="false"
+ unique="false" eType="#//algorithms/styles/Font"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalAlignment"
+ ordered="false" unique="false" eType="#//algorithms/styles/Orientation"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment"
+ ordered="false" unique="false" eType="#//algorithms/styles/Orientation"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="angle" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchH" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="stretchV" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="proportional" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="styleContainer" ordered="false"
+ unique="false" lowerBound="1" eType="#//StyleContainer" eOpposite="#//StyleContainer/styles"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractStyle" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="background" ordered="false"
+ unique="false" eType="#//algorithms/styles/Color"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreground" ordered="false"
+ unique="false" eType="#//algorithms/styles/Color"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineWidth" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineStyle" ordered="false"
+ unique="false" eType="#//algorithms/styles/LineStyle"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="filled" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="true" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineVisible" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
+ defaultValueLiteral="true" unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="renderingStyle" ordered="false"
+ unique="false" eType="#//algorithms/styles/RenderingStyle" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="transparency" ordered="false"
+ unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GradientColoredLocation">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationType" lowerBound="1"
+ eType="#//algorithms/styles/LocationType"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="locationValue" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="color" lowerBound="1"
+ eType="#//algorithms/styles/Color" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GradientColoredArea">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="start" eType="#//algorithms/styles/GradientColoredLocation"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="end" eType="#//algorithms/styles/GradientColoredLocation"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GradientColoredAreas">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="gradientColor" upperBound="-1"
+ eType="#//algorithms/styles/GradientColoredArea" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="styleAdaption" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AdaptedGradientColoredAreas">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="definedStyleId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="adaptedGradientColoredAreas"
+ upperBound="-1" eType="#//algorithms/styles/GradientColoredAreas" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="gradientType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Font">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="size" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="italic" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="bold" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Point">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="before" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="after" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Color">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="red" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="green" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" ordered="false"
+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="suppressedSetVisibility" value="true"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PrecisionPoint">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TextStyle">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="underline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlineStyle" eType="#//algorithms/styles/UnderlineStyle"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strikeout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="font" eType="#//algorithms/styles/Font"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreground" eType="#//algorithms/styles/Color"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="background" eType="#//algorithms/styles/Color"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="underlineColor" eType="#//algorithms/styles/Color"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="strikeoutColor" eType="#//algorithms/styles/Color"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TextStyleRegion">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//algorithms/styles/TextStyle"
+ containment="true"/>
+ </eClassifiers>
+ </eSubpackages>
+ </eSubpackages>
+</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
index f349703d..6d51e70e 100755
--- a/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.orm.test/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@ Require-Bundle: org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.0.1)",
org.eclipse.persistence.antlr;bundle-version="[2.0.0,4.0.0)",
org.eclipse.emf.texo.datagenerator;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
- org.eclipse.persistence.jpa.osgi;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.test;bundle-version="[0.1.0,1.0.0)",
org.eclipse.emf.texo.modelgenerator;bundle-version="[0.1.0,1.0.0)",
diff --git a/tests/org.eclipse.emf.texo.orm.test/src/META-INF/sessions.xml b/tests/org.eclipse.emf.texo.orm.test/src/META-INF/sessions.xml
new file mode 100644
index 00000000..a41f81a8
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.orm.test/src/META-INF/sessions.xml
@@ -0,0 +1,8 @@
+<?xml version = '1.0' encoding = 'UTF-8'?>
+<sessions version="1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.eclipse.org/eclipselink/xsds/eclipselink_sessions_1_0.xsd">
+ <session xsi:type="database-session">
+ <name>texo-test-project</name>
+ </session>
+</sessions> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/JPATest.java b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/JPATest.java
index 9bd6f3b5..6e657da4 100755
--- a/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/JPATest.java
+++ b/tests/org.eclipse.emf.texo.orm.test/src/org/eclipse/emf/texo/orm/test/JPATest.java
@@ -27,9 +27,7 @@ import org.eclipse.emf.texo.model.ModelPackage;
import org.eclipse.emf.texo.test.base.ModelPackageJPATest;
import org.eclipse.emf.texo.test.model.base.identifiable.IdentifiableModelPackage;
import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.eclipse.persistence.jpa.osgi.PersistenceProvider;
-import org.eclipse.persistence.sessions.Session;
-import org.eclipse.persistence.sessions.factories.SessionManager;
+import org.eclipse.persistence.jpa.PersistenceProvider;
/**
* Base JPA Test
@@ -151,8 +149,8 @@ public abstract class JPATest extends ModelPackageJPATest {
}
protected void reinitializeCachesAndEntityManager() {
- Session session = SessionManager.getManager().getSession(getPersistenceUnitName());
- session.getIdentityMapAccessor().initializeAllIdentityMaps();
+ // Session session = SessionManager.getManager().getSession(getPersistenceUnitName());
+ // session.getIdentityMapAccessor().initializeAllIdentityMaps();
em.close();
em = getEntityManagerFactory().createEntityManager();
}
diff --git a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
index 924014e8..9f17c324 100644
--- a/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.server.test/META-INF/MANIFEST.MF
@@ -20,16 +20,16 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.persistence.antlr;bundle-version="[3.0.0,4.0.0)",
org.hsqldb;bundle-version="[2.0.0,3.0.0)",
javax.persistence;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.persistence.jpa.osgi;bundle-version="[2.1.0,3.0.0)",
org.eclipse.jetty.server;bundle-version="[7.0.0,9.0.0)",
org.eclipse.jetty.util;bundle-version="[7.0.0,9.0.0)",
org.eclipse.jetty.servlet;bundle-version="[7.0.0,9.0.0)",
javax.servlet;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.jetty.http;bundle-version="[7.0.0,9.0.0)",
- org.eclipse.jetty.io;bundle-version="[7.0.0,9.0.0)",
- org.eclipse.jetty.security;bundle-version="[7.0.0,9.0.0)",
- org.eclipse.jetty.continuation;bundle-version="[7.0.0,9.0.0)",
- org.eclipse.jetty.client;bundle-version="[7.0.0,9.0.0)",
+ org.eclipse.jetty.client;bundle-version="[8.1.0,9.0.0)",
+ org.eclipse.jetty.http;bundle-version="[8.0.0,9.0.0)",
+ org.eclipse.jetty.io;bundle-version="[8.0.0,9.0.0)",
+ org.eclipse.jetty.security;bundle-version="[8.0.0,9.0.0)",
+ org.eclipse.jetty.server;bundle-version="[8.0.0,9.0.0)",
+ org.eclipse.jetty.continuation;bundle-version="[8.0.0,9.0.0)",
org.json;bundle-version="[1.0.0,2.1.0)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.test.emfmodel;bundle-version="[0.1.0,1.1.0)",
diff --git a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/BaseTest.java b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/BaseTest.java
index 25c018bc..bc0dc940 100755
--- a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/BaseTest.java
+++ b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/BaseTest.java
@@ -40,7 +40,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.eclipse.persistence.jpa.osgi.PersistenceProvider;
+import org.eclipse.persistence.jpa.PersistenceProvider;
import org.junit.After;
import org.junit.Before;
diff --git a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java
index c860235c..a162265f 100644
--- a/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java
+++ b/tests/org.eclipse.emf.texo.server.test/src/org/eclipse/emf/texo/server/test/ws/BaseWSWebTest.java
@@ -34,7 +34,7 @@ import org.eclipse.emf.texo.utils.ModelUtils;
import org.eclipse.emf.texo.xml.ModelXMLLoader;
import org.eclipse.emf.texo.xml.ModelXMLSaver;
import org.eclipse.emf.texo.xml.XMLWebServiceObjectResolver;
-import org.eclipse.jetty.client.ContentExchange;
+import org.eclipse.jetty.client.HttpExchange.ContentExchange;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.http.HttpMethods;
import org.eclipse.jetty.io.ByteArrayBuffer;
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AbstractText.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AbstractText.java
index 76bd546c..b9bd5e6b 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AbstractText.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AbstractText.java
@@ -1,15 +1,20 @@
package org.eclipse.graphiti.mm.algorithms;
+import java.util.ArrayList;
+import java.util.List;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
import org.eclipse.emf.texo.test.TexoTestObjectConverter;
import org.eclipse.emf.texo.test.TexoTestQNameConverter;
import org.eclipse.graphiti.mm.algorithms.styles.Font;
import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
+import org.eclipse.graphiti.mm.algorithms.styles.TextStyleRegion;
import org.eclipse.persistence.annotations.Converter;
import org.eclipse.persistence.annotations.Converters;
@@ -66,6 +71,15 @@ public abstract class AbstractText extends GraphicsAlgorithm {
private String value = null;
/**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @OneToMany(cascade = { CascadeType.ALL })
+ @OrderColumn()
+ private List<TextStyleRegion> styleRegions = new ArrayList<TextStyleRegion>();
+
+ /**
* Returns the value of '<em><b>font</b></em>' feature.
*
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -191,6 +205,76 @@ public abstract class AbstractText extends GraphicsAlgorithm {
}
/**
+ * Returns the value of '<em><b>styleRegions</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>styleRegions</b></em>' feature
+ * @generated
+ */
+ public List<TextStyleRegion> getStyleRegions() {
+ return styleRegions;
+ }
+
+ /**
+ * Adds to the <em>styleRegions</em> feature.
+ *
+ * @param styleRegionsValue
+ * the value to add
+ * @return true if the value is added to the collection (it was not yet present in the collection), false otherwise
+ * @generated
+ */
+ public boolean addToStyleRegions(TextStyleRegion styleRegionsValue) {
+ if (!styleRegions.contains(styleRegionsValue)) {
+ boolean result = styleRegions.add(styleRegionsValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Removes from the <em>styleRegions</em> feature.
+ *
+ * @param styleRegionsValue
+ * the value to remove
+ * @return true if the value is removed from the collection (it existed in the collection before removing), false
+ * otherwise
+ *
+ * @generated
+ */
+ public boolean removeFromStyleRegions(TextStyleRegion styleRegionsValue) {
+ if (styleRegions.contains(styleRegionsValue)) {
+ boolean result = styleRegions.remove(styleRegionsValue);
+ return result;
+ }
+ return false;
+ }
+
+ /**
+ * Clears the <em>styleRegions</em> feature.
+ *
+ * @generated
+ */
+ public void clearStyleRegions() {
+ while (!styleRegions.isEmpty()) {
+ removeFromStyleRegions(styleRegions.iterator().next());
+ }
+ }
+
+ /**
+ * Sets the '{@link AbstractText#getStyleRegions() <em>styleRegions</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newStyleRegions
+ * the new value of the '{@link AbstractText#getStyleRegions() styleRegions}' feature.
+ * @generated
+ */
+ public void setStyleRegions(List<TextStyleRegion> newStyleRegions) {
+ styleRegions = newStyleRegions;
+ }
+
+ /**
* A toString method which prints the values of all EAttributes of this instance. <!-- begin-user-doc --> <!--
* end-user-doc -->
*
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelFactory.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelFactory.java
index ab872893..bd104b65 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelFactory.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelFactory.java
@@ -19,6 +19,7 @@ import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
import org.eclipse.graphiti.mm.algorithms.styles.Point;
import org.eclipse.graphiti.mm.algorithms.styles.RenderingStyle;
import org.eclipse.graphiti.mm.algorithms.styles.Style;
+import org.eclipse.graphiti.mm.algorithms.styles.TextStyleRegion;
import org.eclipse.graphiti.mm.pictograms.PictogramElement;
/**
@@ -887,6 +888,8 @@ public class AlgorithmsModelFactory implements ModelFactory {
return getTarget().getAngle();
case AlgorithmsModelPackage.TEXT_VALUE_FEATURE_ID:
return getTarget().getValue();
+ case AlgorithmsModelPackage.TEXT_STYLEREGIONS_FEATURE_ID:
+ return getTarget().getStyleRegions();
default:
return super.eGet(eStructuralFeature);
}
@@ -972,6 +975,9 @@ public class AlgorithmsModelFactory implements ModelFactory {
case AlgorithmsModelPackage.TEXT_VALUE_FEATURE_ID:
getTarget().setValue((String) value);
return;
+ case AlgorithmsModelPackage.TEXT_STYLEREGIONS_FEATURE_ID:
+ getTarget().setStyleRegions((List<TextStyleRegion>) value);
+ return;
default:
super.eSet(eStructuralFeature, value);
}
@@ -1084,6 +1090,8 @@ public class AlgorithmsModelFactory implements ModelFactory {
return getTarget().getAngle();
case AlgorithmsModelPackage.ABSTRACTTEXT_VALUE_FEATURE_ID:
return getTarget().getValue();
+ case AlgorithmsModelPackage.ABSTRACTTEXT_STYLEREGIONS_FEATURE_ID:
+ return getTarget().getStyleRegions();
default:
return super.eGet(eStructuralFeature);
}
@@ -1169,6 +1177,9 @@ public class AlgorithmsModelFactory implements ModelFactory {
case AlgorithmsModelPackage.ABSTRACTTEXT_VALUE_FEATURE_ID:
getTarget().setValue((String) value);
return;
+ case AlgorithmsModelPackage.ABSTRACTTEXT_STYLEREGIONS_FEATURE_ID:
+ getTarget().setStyleRegions((List<TextStyleRegion>) value);
+ return;
default:
super.eSet(eStructuralFeature, value);
}
@@ -1182,6 +1193,8 @@ public class AlgorithmsModelFactory implements ModelFactory {
final int featureID = eClass().getFeatureID(eStructuralFeature);
switch (featureID) {
+ case AlgorithmsModelPackage.ABSTRACTTEXT_STYLEREGIONS_FEATURE_ID:
+ return getTarget().addToStyleRegions((TextStyleRegion) value);
default:
return super.eAddTo(eStructuralFeature, value);
}
@@ -1195,6 +1208,8 @@ public class AlgorithmsModelFactory implements ModelFactory {
final int featureID = eClass().getFeatureID(eStructuralFeature);
switch (featureID) {
+ case AlgorithmsModelPackage.ABSTRACTTEXT_STYLEREGIONS_FEATURE_ID:
+ return getTarget().removeFromStyleRegions((TextStyleRegion) value);
default:
return super.eRemoveFrom(eStructuralFeature, value);
}
@@ -2190,6 +2205,8 @@ public class AlgorithmsModelFactory implements ModelFactory {
return getTarget().getAngle();
case AlgorithmsModelPackage.MULTITEXT_VALUE_FEATURE_ID:
return getTarget().getValue();
+ case AlgorithmsModelPackage.MULTITEXT_STYLEREGIONS_FEATURE_ID:
+ return getTarget().getStyleRegions();
default:
return super.eGet(eStructuralFeature);
}
@@ -2275,6 +2292,9 @@ public class AlgorithmsModelFactory implements ModelFactory {
case AlgorithmsModelPackage.MULTITEXT_VALUE_FEATURE_ID:
getTarget().setValue((String) value);
return;
+ case AlgorithmsModelPackage.MULTITEXT_STYLEREGIONS_FEATURE_ID:
+ getTarget().setStyleRegions((List<TextStyleRegion>) value);
+ return;
default:
super.eSet(eStructuralFeature, value);
}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelPackage.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelPackage.java
index 16eaecf0..2b106ee1 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelPackage.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/AlgorithmsModelPackage.java
@@ -663,6 +663,13 @@ public class AlgorithmsModelPackage extends ModelPackage {
*
* @generated
*/
+ public static final int TEXT_STYLEREGIONS_FEATURE_ID = 24;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public static final int ABSTRACTTEXT_CLASSIFIER_ID = 9;
/**
@@ -838,6 +845,13 @@ public class AlgorithmsModelPackage extends ModelPackage {
*
* @generated
*/
+ public static final int ABSTRACTTEXT_STYLEREGIONS_FEATURE_ID = 24;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public static final int POLYGON_CLASSIFIER_ID = 4;
/**
@@ -1765,6 +1779,13 @@ public class AlgorithmsModelPackage extends ModelPackage {
public static final int MULTITEXT_VALUE_FEATURE_ID = 23;
/**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int MULTITEXT_STYLEREGIONS_FEATURE_ID = 24;
+
+ /**
* The static member with the instance of this {@link ModelPackage}. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -2180,6 +2201,17 @@ public class AlgorithmsModelPackage extends ModelPackage {
}
/**
+ * Returns the {@link EStructuralFeature} '<em><b>AbstractText.styleRegions</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>AbstractText.styleRegions</b></em>'.
+ * @generated
+ */
+ public EReference getAbstractText_StyleRegions() {
+ return (EReference) getAbstractTextEClass().getEAllStructuralFeatures().get(ABSTRACTTEXT_STYLEREGIONS_FEATURE_ID);
+ }
+
+ /**
* Returns the {@link EClass} '<em><b>Polygon</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return an instance of the {@link EClass} '<em><b>Polygon</b></em>'
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelFactory.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelFactory.java
index f85a341b..563cec3f 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelFactory.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelFactory.java
@@ -43,6 +43,8 @@ public class StylesModelFactory implements ModelFactory {
return createPoint();
case StylesModelPackage.PRECISIONPOINT_CLASSIFIER_ID:
return createPrecisionPoint();
+ case StylesModelPackage.TEXTSTYLEREGION_CLASSIFIER_ID:
+ return createTextStyleRegion();
case StylesModelPackage.RENDERINGSTYLE_CLASSIFIER_ID:
return createRenderingStyle();
case StylesModelPackage.ADAPTEDGRADIENTCOLOREDAREAS_CLASSIFIER_ID:
@@ -53,6 +55,8 @@ public class StylesModelFactory implements ModelFactory {
return createGradientColoredArea();
case StylesModelPackage.GRADIENTCOLOREDAREAS_CLASSIFIER_ID:
return createGradientColoredAreas();
+ case StylesModelPackage.TEXTSTYLE_CLASSIFIER_ID:
+ return createTextStyle();
default:
throw new IllegalArgumentException("The EClass '" + eClass.getName()
+ "' is not a valid EClass for this EPackage");
@@ -91,6 +95,9 @@ public class StylesModelFactory implements ModelFactory {
case StylesModelPackage.PRECISIONPOINT_CLASSIFIER_ID:
modelObject = new PrecisionPointModelObject();
break;
+ case StylesModelPackage.TEXTSTYLEREGION_CLASSIFIER_ID:
+ modelObject = new TextStyleRegionModelObject();
+ break;
case StylesModelPackage.RENDERINGSTYLE_CLASSIFIER_ID:
modelObject = new RenderingStyleModelObject();
break;
@@ -106,6 +113,9 @@ public class StylesModelFactory implements ModelFactory {
case StylesModelPackage.GRADIENTCOLOREDAREAS_CLASSIFIER_ID:
modelObject = new GradientColoredAreasModelObject();
break;
+ case StylesModelPackage.TEXTSTYLE_CLASSIFIER_ID:
+ modelObject = new TextStyleModelObject();
+ break;
default:
throw new IllegalArgumentException("The EClass '" + eClass + "' is not defined in this EPackage");
}
@@ -195,6 +205,16 @@ public class StylesModelFactory implements ModelFactory {
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
+ * @return an instance of the model object representing the EClass TextStyleRegion
+ * @generated
+ */
+ public TextStyleRegion createTextStyleRegion() {
+ return new TextStyleRegion();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
* @return an instance of the model object representing the EClass RenderingStyle
* @generated
*/
@@ -243,6 +263,16 @@ public class StylesModelFactory implements ModelFactory {
}
/**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the model object representing the EClass TextStyle
+ * @generated
+ */
+ public TextStyle createTextStyle() {
+ return new TextStyle();
+ }
+
+ /**
* Converts an instance of an {@link EDataType} to a String. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param eDataType
@@ -259,6 +289,8 @@ public class StylesModelFactory implements ModelFactory {
return createLineStyleFromString(value);
case StylesModelPackage.LOCATIONTYPE_CLASSIFIER_ID:
return createLocationTypeFromString(value);
+ case StylesModelPackage.UNDERLINESTYLE_CLASSIFIER_ID:
+ return createUnderlineStyleFromString(value);
default:
throw new IllegalArgumentException("The EDatatype '" + eDataType + "' is not defined in this EPackage");
}
@@ -281,6 +313,8 @@ public class StylesModelFactory implements ModelFactory {
return convertLineStyleToString((LineStyle) value);
case StylesModelPackage.LOCATIONTYPE_CLASSIFIER_ID:
return convertLocationTypeToString((LocationType) value);
+ case StylesModelPackage.UNDERLINESTYLE_CLASSIFIER_ID:
+ return convertUnderlineStyleToString((UnderlineStyle) value);
default:
throw new IllegalArgumentException("The EDatatype '" + eDataType + "' is not defined in this EPackage.");
}
@@ -377,6 +411,36 @@ public class StylesModelFactory implements ModelFactory {
}
/**
+ * Converts the EDataType: UnderlineStyle to a String. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the object to convert
+ * @return the String representing the value, if value == null then null is returned
+ * @generated
+ */
+ public String convertUnderlineStyleToString(UnderlineStyle value) {
+ if (value == null) {
+ return null;
+ }
+ return value.toString();
+ }
+
+ /**
+ * Creates an instance of the EDataType: UnderlineStyle from a String. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the string value to convert to an object
+ * @return the instance of the data type, if value == null then null is returned
+ * @generated
+ */
+ public UnderlineStyle createUnderlineStyleFromString(String value) {
+ if (value == null) {
+ return null;
+ }
+ return UnderlineStyle.get(value);
+ }
+
+ /**
* The adapter/wrapper for the EClass '<em><b>Style</b></em>'.
*
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1108,6 +1172,110 @@ public class StylesModelFactory implements ModelFactory {
}
/**
+ * The adapter/wrapper for the EClass '<em><b>TextStyleRegion</b></em>'.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param <E>
+ * the domain model java class
+ *
+ * @generated
+ */
+ public static class TextStyleRegionModelObject<E extends TextStyleRegion> extends
+ IdentifiableModelFactory.IdentifiableModelObject<E> {
+ /**
+ * @generated
+ */
+ @Override
+ public EClass eClass() {
+ return StylesModelPackage.INSTANCE.getTextStyleRegionEClass();
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public ModelPackage getModelPackage() {
+ return StylesModelPackage.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object eGet(EStructuralFeature eStructuralFeature) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case StylesModelPackage.TEXTSTYLEREGION_DB_ID_FEATURE_ID:
+ return getTarget().getDb_Id();
+ case StylesModelPackage.TEXTSTYLEREGION_DB_VERSION_FEATURE_ID:
+ return getTarget().getDb_version();
+ case StylesModelPackage.TEXTSTYLEREGION_START_FEATURE_ID:
+ return getTarget().getStart();
+ case StylesModelPackage.TEXTSTYLEREGION_END_FEATURE_ID:
+ return getTarget().getEnd();
+ case StylesModelPackage.TEXTSTYLEREGION_STYLE_FEATURE_ID:
+ return getTarget().getStyle();
+ default:
+ return super.eGet(eStructuralFeature);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public void eSet(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case StylesModelPackage.TEXTSTYLEREGION_DB_ID_FEATURE_ID:
+ getTarget().setDb_Id((Long) value);
+ return;
+ case StylesModelPackage.TEXTSTYLEREGION_DB_VERSION_FEATURE_ID:
+ getTarget().setDb_version((Integer) value);
+ return;
+ case StylesModelPackage.TEXTSTYLEREGION_START_FEATURE_ID:
+ getTarget().setStart((Integer) value);
+ return;
+ case StylesModelPackage.TEXTSTYLEREGION_END_FEATURE_ID:
+ getTarget().setEnd((Integer) value);
+ return;
+ case StylesModelPackage.TEXTSTYLEREGION_STYLE_FEATURE_ID:
+ getTarget().setStyle((TextStyle) value);
+ return;
+ default:
+ super.eSet(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eAddTo(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ default:
+ return super.eAddTo(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eRemoveFrom(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ default:
+ return super.eRemoveFrom(eStructuralFeature, value);
+ }
+ }
+ }
+
+ /**
* The adapter/wrapper for the EClass '<em><b>RenderingStyle</b></em>'.
*
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1620,4 +1788,133 @@ public class StylesModelFactory implements ModelFactory {
}
}
}
+
+ /**
+ * The adapter/wrapper for the EClass '<em><b>TextStyle</b></em>'.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param <E>
+ * the domain model java class
+ *
+ * @generated
+ */
+ public static class TextStyleModelObject<E extends TextStyle> extends
+ IdentifiableModelFactory.IdentifiableModelObject<E> {
+ /**
+ * @generated
+ */
+ @Override
+ public EClass eClass() {
+ return StylesModelPackage.INSTANCE.getTextStyleEClass();
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public ModelPackage getModelPackage() {
+ return StylesModelPackage.INSTANCE;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public Object eGet(EStructuralFeature eStructuralFeature) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case StylesModelPackage.TEXTSTYLE_DB_ID_FEATURE_ID:
+ return getTarget().getDb_Id();
+ case StylesModelPackage.TEXTSTYLE_DB_VERSION_FEATURE_ID:
+ return getTarget().getDb_version();
+ case StylesModelPackage.TEXTSTYLE_UNDERLINE_FEATURE_ID:
+ return getTarget().isUnderline();
+ case StylesModelPackage.TEXTSTYLE_UNDERLINESTYLE_FEATURE_ID:
+ return getTarget().getUnderlineStyle();
+ case StylesModelPackage.TEXTSTYLE_STRIKEOUT_FEATURE_ID:
+ return getTarget().isStrikeout();
+ case StylesModelPackage.TEXTSTYLE_FONT_FEATURE_ID:
+ return getTarget().getFont();
+ case StylesModelPackage.TEXTSTYLE_FOREGROUND_FEATURE_ID:
+ return getTarget().getForeground();
+ case StylesModelPackage.TEXTSTYLE_BACKGROUND_FEATURE_ID:
+ return getTarget().getBackground();
+ case StylesModelPackage.TEXTSTYLE_UNDERLINECOLOR_FEATURE_ID:
+ return getTarget().getUnderlineColor();
+ case StylesModelPackage.TEXTSTYLE_STRIKEOUTCOLOR_FEATURE_ID:
+ return getTarget().getStrikeoutColor();
+ default:
+ return super.eGet(eStructuralFeature);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public void eSet(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+ case StylesModelPackage.TEXTSTYLE_DB_ID_FEATURE_ID:
+ getTarget().setDb_Id((Long) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_DB_VERSION_FEATURE_ID:
+ getTarget().setDb_version((Integer) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_UNDERLINE_FEATURE_ID:
+ getTarget().setUnderline((Boolean) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_UNDERLINESTYLE_FEATURE_ID:
+ getTarget().setUnderlineStyle((UnderlineStyle) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_STRIKEOUT_FEATURE_ID:
+ getTarget().setStrikeout((Boolean) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_FONT_FEATURE_ID:
+ getTarget().setFont((Font) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_FOREGROUND_FEATURE_ID:
+ getTarget().setForeground((Color) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_BACKGROUND_FEATURE_ID:
+ getTarget().setBackground((Color) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_UNDERLINECOLOR_FEATURE_ID:
+ getTarget().setUnderlineColor((Color) value);
+ return;
+ case StylesModelPackage.TEXTSTYLE_STRIKEOUTCOLOR_FEATURE_ID:
+ getTarget().setStrikeoutColor((Color) value);
+ return;
+ default:
+ super.eSet(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eAddTo(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ default:
+ return super.eAddTo(eStructuralFeature, value);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public boolean eRemoveFrom(EStructuralFeature eStructuralFeature, Object value) {
+ final int featureID = eClass().getFeatureID(eStructuralFeature);
+ switch (featureID) {
+
+ default:
+ return super.eRemoveFrom(eStructuralFeature, value);
+ }
+ }
+ }
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelPackage.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelPackage.java
index 516f7c83..fe71b79d 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelPackage.java
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/StylesModelPackage.java
@@ -25,6 +25,8 @@ import org.eclipse.graphiti.mm.algorithms.styles.dao.PointDao;
import org.eclipse.graphiti.mm.algorithms.styles.dao.PrecisionPointDao;
import org.eclipse.graphiti.mm.algorithms.styles.dao.RenderingStyleDao;
import org.eclipse.graphiti.mm.algorithms.styles.dao.StyleDao;
+import org.eclipse.graphiti.mm.algorithms.styles.dao.TextStyleDao;
+import org.eclipse.graphiti.mm.algorithms.styles.dao.TextStyleRegionDao;
/**
* The <b>Package</b> for the model '<em><b>styles</b></em>'. It contains initialization code and access to the Factory
@@ -62,21 +64,28 @@ public class StylesModelPackage extends ModelPackage {
*
* @generated
*/
- public static final int ORIENTATION_CLASSIFIER_ID = 12;
+ public static final int ORIENTATION_CLASSIFIER_ID = 14;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
- public static final int LINESTYLE_CLASSIFIER_ID = 11;
+ public static final int LINESTYLE_CLASSIFIER_ID = 13;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
- public static final int LOCATIONTYPE_CLASSIFIER_ID = 13;
+ public static final int LOCATIONTYPE_CLASSIFIER_ID = 15;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int UNDERLINESTYLE_CLASSIFIER_ID = 16;
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -489,6 +498,48 @@ public class StylesModelPackage extends ModelPackage {
*
* @generated
*/
+ public static final int TEXTSTYLEREGION_CLASSIFIER_ID = 12;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLEREGION_DB_ID_FEATURE_ID = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLEREGION_DB_VERSION_FEATURE_ID = 1;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLEREGION_START_FEATURE_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLEREGION_END_FEATURE_ID = 3;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLEREGION_STYLE_FEATURE_ID = 4;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public static final int RENDERINGSTYLE_CLASSIFIER_ID = 0;
/**
@@ -667,6 +718,83 @@ public class StylesModelPackage extends ModelPackage {
public static final int GRADIENTCOLOREDAREAS_STYLEADAPTION_FEATURE_ID = 3;
/**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_CLASSIFIER_ID = 11;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_DB_ID_FEATURE_ID = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_DB_VERSION_FEATURE_ID = 1;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_UNDERLINE_FEATURE_ID = 2;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_UNDERLINESTYLE_FEATURE_ID = 3;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_STRIKEOUT_FEATURE_ID = 4;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_FONT_FEATURE_ID = 5;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_FOREGROUND_FEATURE_ID = 6;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_BACKGROUND_FEATURE_ID = 7;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_UNDERLINECOLOR_FEATURE_ID = 8;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static final int TEXTSTYLE_STRIKEOUTCOLOR_FEATURE_ID = 9;
+
+ /**
* The static member with the instance of this {@link ModelPackage}. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -708,6 +836,8 @@ public class StylesModelPackage extends ModelPackage {
ModelResolver.getInstance().registerClassModelMapping(Point.class, modelPackage.getPointEClass(), modelPackage);
ModelResolver.getInstance().registerClassModelMapping(PrecisionPoint.class, modelPackage.getPrecisionPointEClass(),
modelPackage);
+ ModelResolver.getInstance().registerClassModelMapping(TextStyleRegion.class,
+ modelPackage.getTextStyleRegionEClass(), modelPackage);
ModelResolver.getInstance().registerClassModelMapping(RenderingStyle.class, modelPackage.getRenderingStyleEClass(),
modelPackage);
ModelResolver.getInstance().registerClassModelMapping(AdaptedGradientColoredAreas.class,
@@ -718,6 +848,8 @@ public class StylesModelPackage extends ModelPackage {
modelPackage.getGradientColoredAreaEClass(), modelPackage);
ModelResolver.getInstance().registerClassModelMapping(GradientColoredAreas.class,
modelPackage.getGradientColoredAreasEClass(), modelPackage);
+ ModelResolver.getInstance().registerClassModelMapping(TextStyle.class, modelPackage.getTextStyleEClass(),
+ modelPackage);
ModelResolver.getInstance().registerClassModelMapping(Orientation.class, modelPackage.getOrientationEEnum(),
modelPackage);
@@ -725,6 +857,8 @@ public class StylesModelPackage extends ModelPackage {
modelPackage);
ModelResolver.getInstance().registerClassModelMapping(LocationType.class, modelPackage.getLocationTypeEEnum(),
modelPackage);
+ ModelResolver.getInstance().registerClassModelMapping(UnderlineStyle.class, modelPackage.getUnderlineStyleEEnum(),
+ modelPackage);
DaoRegistry.getInstance().registerDao(Style.class, StyleDao.class);
DaoRegistry.getInstance().registerDao(AbstractStyle.class, AbstractStyleDao.class);
@@ -732,11 +866,13 @@ public class StylesModelPackage extends ModelPackage {
DaoRegistry.getInstance().registerDao(Font.class, FontDao.class);
DaoRegistry.getInstance().registerDao(Point.class, PointDao.class);
DaoRegistry.getInstance().registerDao(PrecisionPoint.class, PrecisionPointDao.class);
+ DaoRegistry.getInstance().registerDao(TextStyleRegion.class, TextStyleRegionDao.class);
DaoRegistry.getInstance().registerDao(RenderingStyle.class, RenderingStyleDao.class);
DaoRegistry.getInstance().registerDao(AdaptedGradientColoredAreas.class, AdaptedGradientColoredAreasDao.class);
DaoRegistry.getInstance().registerDao(GradientColoredLocation.class, GradientColoredLocationDao.class);
DaoRegistry.getInstance().registerDao(GradientColoredArea.class, GradientColoredAreaDao.class);
DaoRegistry.getInstance().registerDao(GradientColoredAreas.class, GradientColoredAreasDao.class);
+ DaoRegistry.getInstance().registerDao(TextStyle.class, TextStyleDao.class);
// and return ourselves
return modelPackage;
@@ -1255,6 +1391,49 @@ public class StylesModelPackage extends ModelPackage {
}
/**
+ * Returns the {@link EClass} '<em><b>TextStyleRegion</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EClass} '<em><b>TextStyleRegion</b></em>'
+ * @generated
+ */
+ public EClass getTextStyleRegionEClass() {
+ return (EClass) getEPackage().getEClassifiers().get(TEXTSTYLEREGION_CLASSIFIER_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyleRegion.start</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyleRegion.start</b></em>'.
+ * @generated
+ */
+ public EAttribute getTextStyleRegion_Start() {
+ return (EAttribute) getTextStyleRegionEClass().getEAllStructuralFeatures().get(TEXTSTYLEREGION_START_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyleRegion.end</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyleRegion.end</b></em>'.
+ * @generated
+ */
+ public EAttribute getTextStyleRegion_End() {
+ return (EAttribute) getTextStyleRegionEClass().getEAllStructuralFeatures().get(TEXTSTYLEREGION_END_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyleRegion.style</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyleRegion.style</b></em>'.
+ * @generated
+ */
+ public EReference getTextStyleRegion_Style() {
+ return (EReference) getTextStyleRegionEClass().getEAllStructuralFeatures().get(TEXTSTYLEREGION_STYLE_FEATURE_ID);
+ }
+
+ /**
* Returns the {@link EClass} '<em><b>RenderingStyle</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return an instance of the {@link EClass} '<em><b>RenderingStyle</b></em>'
@@ -1441,6 +1620,104 @@ public class StylesModelPackage extends ModelPackage {
}
/**
+ * Returns the {@link EClass} '<em><b>TextStyle</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the {@link EClass} '<em><b>TextStyle</b></em>'
+ * @generated
+ */
+ public EClass getTextStyleEClass() {
+ return (EClass) getEPackage().getEClassifiers().get(TEXTSTYLE_CLASSIFIER_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.underline</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.underline</b></em>'.
+ * @generated
+ */
+ public EAttribute getTextStyle_Underline() {
+ return (EAttribute) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_UNDERLINE_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.underlineStyle</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.underlineStyle</b></em>'.
+ * @generated
+ */
+ public EAttribute getTextStyle_UnderlineStyle() {
+ return (EAttribute) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_UNDERLINESTYLE_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.strikeout</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.strikeout</b></em>'.
+ * @generated
+ */
+ public EAttribute getTextStyle_Strikeout() {
+ return (EAttribute) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_STRIKEOUT_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.font</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.font</b></em>'.
+ * @generated
+ */
+ public EReference getTextStyle_Font() {
+ return (EReference) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_FONT_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.foreground</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.foreground</b></em>'.
+ * @generated
+ */
+ public EReference getTextStyle_Foreground() {
+ return (EReference) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_FOREGROUND_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.background</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.background</b></em>'.
+ * @generated
+ */
+ public EReference getTextStyle_Background() {
+ return (EReference) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_BACKGROUND_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.underlineColor</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.underlineColor</b></em>'.
+ * @generated
+ */
+ public EReference getTextStyle_UnderlineColor() {
+ return (EReference) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_UNDERLINECOLOR_FEATURE_ID);
+ }
+
+ /**
+ * Returns the {@link EStructuralFeature} '<em><b>TextStyle.strikeoutColor</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return an instance of the {@link EStructuralFeature}: '<em><b>TextStyle.strikeoutColor</b></em>'.
+ * @generated
+ */
+ public EReference getTextStyle_StrikeoutColor() {
+ return (EReference) getTextStyleEClass().getEAllStructuralFeatures().get(TEXTSTYLE_STRIKEOUTCOLOR_FEATURE_ID);
+ }
+
+ /**
* Returns the EEnum '<em><b>Orientation</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return an instance of the EEnum representing '<em><b>Orientation</b></em>'
@@ -1471,6 +1748,16 @@ public class StylesModelPackage extends ModelPackage {
}
/**
+ * Returns the EEnum '<em><b>UnderlineStyle</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return an instance of the EEnum representing '<em><b>UnderlineStyle</b></em>'
+ * @generated
+ */
+ public EEnum getUnderlineStyleEEnum() {
+ return (EEnum) getEPackage().getEClassifiers().get(UNDERLINESTYLE_CLASSIFIER_ID);
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @param eClassifier
@@ -1493,6 +1780,8 @@ public class StylesModelPackage extends ModelPackage {
return Point.class;
case PRECISIONPOINT_CLASSIFIER_ID:
return PrecisionPoint.class;
+ case TEXTSTYLEREGION_CLASSIFIER_ID:
+ return TextStyleRegion.class;
case RENDERINGSTYLE_CLASSIFIER_ID:
return RenderingStyle.class;
case ADAPTEDGRADIENTCOLOREDAREAS_CLASSIFIER_ID:
@@ -1503,12 +1792,16 @@ public class StylesModelPackage extends ModelPackage {
return GradientColoredArea.class;
case GRADIENTCOLOREDAREAS_CLASSIFIER_ID:
return GradientColoredAreas.class;
+ case TEXTSTYLE_CLASSIFIER_ID:
+ return TextStyle.class;
case ORIENTATION_CLASSIFIER_ID:
return Orientation.class;
case LINESTYLE_CLASSIFIER_ID:
return LineStyle.class;
case LOCATIONTYPE_CLASSIFIER_ID:
return LocationType.class;
+ case UNDERLINESTYLE_CLASSIFIER_ID:
+ return UnderlineStyle.class;
default:
throw new IllegalArgumentException("The EClassifier '" + eClassifier + "' is not defined in this EPackage");
}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyle.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyle.java
new file mode 100644
index 00000000..62542a1e
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyle.java
@@ -0,0 +1,303 @@
+package org.eclipse.graphiti.mm.algorithms.styles;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.ManyToOne;
+import org.eclipse.emf.texo.test.TexoTestObjectConverter;
+import org.eclipse.emf.texo.test.TexoTestQNameConverter;
+import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
+import org.eclipse.persistence.annotations.Converter;
+import org.eclipse.persistence.annotations.Converters;
+
+/**
+ * A representation of the model object '<em><b>TextStyle</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@Entity(name = "st_TextStyle")
+@DiscriminatorColumn(length = 255)
+@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter"),
+ @Converter(converterClass = TexoTestQNameConverter.class, name = "TexoTestQNameConverter") })
+public class TextStyle extends Identifiable {
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ private boolean underline = false;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ @Enumerated(EnumType.STRING)
+ private UnderlineStyle underlineStyle = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ private boolean strikeout = false;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ private Font font = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ private Color foreground = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ private Color background = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ private Color underlineColor = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
+ private Color strikeoutColor = null;
+
+ /**
+ * Returns the value of '<em><b>underline</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>underline</b></em>' feature
+ * @generated
+ */
+ public boolean isUnderline() {
+ return underline;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#isUnderline() <em>underline</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newUnderline
+ * the new value of the '{@link TextStyle#isUnderline() underline}' feature.
+ * @generated
+ */
+ public void setUnderline(boolean newUnderline) {
+ underline = newUnderline;
+ }
+
+ /**
+ * Returns the value of '<em><b>underlineStyle</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>underlineStyle</b></em>' feature
+ * @generated
+ */
+ public UnderlineStyle getUnderlineStyle() {
+ return underlineStyle;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#getUnderlineStyle() <em>underlineStyle</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newUnderlineStyle
+ * the new value of the '{@link TextStyle#getUnderlineStyle() underlineStyle}' feature.
+ * @generated
+ */
+ public void setUnderlineStyle(UnderlineStyle newUnderlineStyle) {
+ underlineStyle = newUnderlineStyle;
+ }
+
+ /**
+ * Returns the value of '<em><b>strikeout</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>strikeout</b></em>' feature
+ * @generated
+ */
+ public boolean isStrikeout() {
+ return strikeout;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#isStrikeout() <em>strikeout</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newStrikeout
+ * the new value of the '{@link TextStyle#isStrikeout() strikeout}' feature.
+ * @generated
+ */
+ public void setStrikeout(boolean newStrikeout) {
+ strikeout = newStrikeout;
+ }
+
+ /**
+ * Returns the value of '<em><b>font</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>font</b></em>' feature
+ * @generated
+ */
+ public Font getFont() {
+ return font;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#getFont() <em>font</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newFont
+ * the new value of the '{@link TextStyle#getFont() font}' feature.
+ * @generated
+ */
+ public void setFont(Font newFont) {
+ font = newFont;
+ }
+
+ /**
+ * Returns the value of '<em><b>foreground</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>foreground</b></em>' feature
+ * @generated
+ */
+ public Color getForeground() {
+ return foreground;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#getForeground() <em>foreground</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newForeground
+ * the new value of the '{@link TextStyle#getForeground() foreground}' feature.
+ * @generated
+ */
+ public void setForeground(Color newForeground) {
+ foreground = newForeground;
+ }
+
+ /**
+ * Returns the value of '<em><b>background</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>background</b></em>' feature
+ * @generated
+ */
+ public Color getBackground() {
+ return background;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#getBackground() <em>background</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newBackground
+ * the new value of the '{@link TextStyle#getBackground() background}' feature.
+ * @generated
+ */
+ public void setBackground(Color newBackground) {
+ background = newBackground;
+ }
+
+ /**
+ * Returns the value of '<em><b>underlineColor</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>underlineColor</b></em>' feature
+ * @generated
+ */
+ public Color getUnderlineColor() {
+ return underlineColor;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#getUnderlineColor() <em>underlineColor</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newUnderlineColor
+ * the new value of the '{@link TextStyle#getUnderlineColor() underlineColor}' feature.
+ * @generated
+ */
+ public void setUnderlineColor(Color newUnderlineColor) {
+ underlineColor = newUnderlineColor;
+ }
+
+ /**
+ * Returns the value of '<em><b>strikeoutColor</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>strikeoutColor</b></em>' feature
+ * @generated
+ */
+ public Color getStrikeoutColor() {
+ return strikeoutColor;
+ }
+
+ /**
+ * Sets the '{@link TextStyle#getStrikeoutColor() <em>strikeoutColor</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newStrikeoutColor
+ * the new value of the '{@link TextStyle#getStrikeoutColor() strikeoutColor}' feature.
+ * @generated
+ */
+ public void setStrikeoutColor(Color newStrikeoutColor) {
+ strikeoutColor = newStrikeoutColor;
+ }
+
+ /**
+ * A toString method which prints the values of all EAttributes of this instance. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return "TextStyle " + " [underline: " + isUnderline() + "]" + " [underlineStyle: " + getUnderlineStyle() + "]"
+ + " [strikeout: " + isStrikeout() + "]";
+ }
+}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyleRegion.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyleRegion.java
new file mode 100644
index 00000000..5cd7563d
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/TextStyleRegion.java
@@ -0,0 +1,134 @@
+package org.eclipse.graphiti.mm.algorithms.styles;
+
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
+import org.eclipse.emf.texo.test.TexoTestObjectConverter;
+import org.eclipse.emf.texo.test.TexoTestQNameConverter;
+import org.eclipse.emf.texo.test.model.base.identifiable.Identifiable;
+import org.eclipse.persistence.annotations.Converter;
+import org.eclipse.persistence.annotations.Converters;
+
+/**
+ * A representation of the model object '<em><b>TextStyleRegion</b></em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@Entity(name = "st_TextStyleRegion")
+@DiscriminatorColumn(length = 255)
+@Converters({ @Converter(converterClass = TexoTestObjectConverter.class, name = "TexoTestObjectConverter"),
+ @Converter(converterClass = TexoTestQNameConverter.class, name = "TexoTestQNameConverter") })
+public class TextStyleRegion extends Identifiable {
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ private int start = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Basic()
+ private int end = 0;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @ManyToOne(cascade = { CascadeType.ALL })
+ private TextStyle style = null;
+
+ /**
+ * Returns the value of '<em><b>start</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>start</b></em>' feature
+ * @generated
+ */
+ public int getStart() {
+ return start;
+ }
+
+ /**
+ * Sets the '{@link TextStyleRegion#getStart() <em>start</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newStart
+ * the new value of the '{@link TextStyleRegion#getStart() start}' feature.
+ * @generated
+ */
+ public void setStart(int newStart) {
+ start = newStart;
+ }
+
+ /**
+ * Returns the value of '<em><b>end</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>end</b></em>' feature
+ * @generated
+ */
+ public int getEnd() {
+ return end;
+ }
+
+ /**
+ * Sets the '{@link TextStyleRegion#getEnd() <em>end</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newEnd
+ * the new value of the '{@link TextStyleRegion#getEnd() end}' feature.
+ * @generated
+ */
+ public void setEnd(int newEnd) {
+ end = newEnd;
+ }
+
+ /**
+ * Returns the value of '<em><b>style</b></em>' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value of '<em><b>style</b></em>' feature
+ * @generated
+ */
+ public TextStyle getStyle() {
+ return style;
+ }
+
+ /**
+ * Sets the '{@link TextStyleRegion#getStyle() <em>style</em>}' feature.
+ *
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param newStyle
+ * the new value of the '{@link TextStyleRegion#getStyle() style}' feature.
+ * @generated
+ */
+ public void setStyle(TextStyle newStyle) {
+ style = newStyle;
+ }
+
+ /**
+ * A toString method which prints the values of all EAttributes of this instance. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return "TextStyleRegion " + " [start: " + getStart() + "]" + " [end: " + getEnd() + "]";
+ }
+}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/UnderlineStyle.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/UnderlineStyle.java
new file mode 100644
index 00000000..1af3e60c
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/UnderlineStyle.java
@@ -0,0 +1,264 @@
+package org.eclipse.graphiti.mm.algorithms.styles;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A representation of the literals of the enumeration '<em><b>UnderlineStyle</b></em>'. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+public enum UnderlineStyle {
+
+ /**
+ * The enum: UNDERLINE_SINGLE <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ UNDERLINE_SINGLE(0, "UNDERLINE_SINGLE", "UNDERLINE_SINGLE") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isUNDERLINE_SINGLE() {
+ return true;
+ }
+ },
+ /**
+ * The enum: UNDERLINE_DOUBLE <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ UNDERLINE_DOUBLE(1, "UNDERLINE_DOUBLE", "UNDERLINE_DOUBLE") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isUNDERLINE_DOUBLE() {
+ return true;
+ }
+ },
+ /**
+ * The enum: UNDERLINE_ERROR <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ UNDERLINE_ERROR(2, "UNDERLINE_ERROR", "UNDERLINE_ERROR") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isUNDERLINE_ERROR() {
+ return true;
+ }
+ },
+ /**
+ * The enum: UNDERLINE_SQUIGGLE <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ UNDERLINE_SQUIGGLE(3, "UNDERLINE_SQUIGGLE", "UNDERLINE_SQUIGGLE") {
+
+ /**
+ * @return always true for this instance
+ * @generated
+ */
+ @Override
+ public boolean isUNDERLINE_SQUIGGLE() {
+ return true;
+ }
+ };
+
+ /**
+ * An array of all the '<em><b>UnderlineStyle</b></em>' enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private static final UnderlineStyle[] VALUES_ARRAY = new UnderlineStyle[] { UNDERLINE_SINGLE, UNDERLINE_DOUBLE,
+ UNDERLINE_ERROR, UNDERLINE_SQUIGGLE };
+
+ /**
+ * A public read-only list of all the '<em><b>UnderlineStyle</b></em>' enumerators. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public static final List<UnderlineStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+ /**
+ * Returns the '<em><b>UnderlineStyle</b></em>' literal with the specified literal value. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param literal
+ * the literal to use to get the enum instance
+ * @return the UnderlineStyle, the literal enum class
+ * @generated
+ */
+ public static UnderlineStyle get(String literal) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ UnderlineStyle result = VALUES_ARRAY[i];
+ if (result.toString().equals(literal)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>UnderlineStyle</b></em>' literal with the specified name. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param name
+ * the name to use to get the enum instance
+ * @return the UnderlineStyle, the literal enum class
+ * @generated
+ */
+ public static UnderlineStyle getByName(String name) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ UnderlineStyle result = VALUES_ARRAY[i];
+ if (result.getName().equals(name)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the '<em><b>UnderlineStyle</b></em>' literal with the specified integer value. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param value
+ * the value to use to get the enum instance
+ * @return the UnderlineStyle, the literal enum
+ * @generated
+ */
+ public static UnderlineStyle get(int value) {
+ for (UnderlineStyle enumInstance : VALUES_ARRAY) {
+ if (enumInstance.getValue() == value) {
+ return enumInstance;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final int value;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final String name;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private final String literal;
+
+ /**
+ * Only this class can construct instances. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private UnderlineStyle(int value, String name, String literal) {
+ this.value = value;
+ this.name = name;
+ this.literal = literal;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isUNDERLINE_SINGLE() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isUNDERLINE_DOUBLE() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isUNDERLINE_ERROR() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return false, is overridden by actual enum types.
+ * @generated
+ */
+ public boolean isUNDERLINE_SQUIGGLE() {
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the value
+ * @generated
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the name
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the literal of this enum instance
+ * @generated
+ */
+ public String getLiteral() {
+ return literal;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the literal value of the enumerator, which is its string representation.
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return literal;
+ }
+}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleDao.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleDao.java
new file mode 100644
index 00000000..1e5e6f9a
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleDao.java
@@ -0,0 +1,30 @@
+package org.eclipse.graphiti.mm.algorithms.styles.dao;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.texo.server.store.BaseDao;
+import org.eclipse.graphiti.mm.algorithms.styles.StylesModelPackage;
+import org.eclipse.graphiti.mm.algorithms.styles.TextStyle;
+
+/**
+ * The Dao implementation for the model object '<em><b>TextStyle</b></em>'.
+ *
+ * @generated
+ */
+public class TextStyleDao extends BaseDao<TextStyle> {
+
+ /**
+ * @generated
+ */
+ @Override
+ public Class<TextStyle> getEntityClass() {
+ return TextStyle.class;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public EClass getEClass() {
+ return StylesModelPackage.INSTANCE.getTextStyleEClass();
+ }
+}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleRegionDao.java b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleRegionDao.java
new file mode 100644
index 00000000..4a3a967b
--- /dev/null
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/algorithms/styles/dao/TextStyleRegionDao.java
@@ -0,0 +1,30 @@
+package org.eclipse.graphiti.mm.algorithms.styles.dao;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.texo.server.store.BaseDao;
+import org.eclipse.graphiti.mm.algorithms.styles.StylesModelPackage;
+import org.eclipse.graphiti.mm.algorithms.styles.TextStyleRegion;
+
+/**
+ * The Dao implementation for the model object '<em><b>TextStyleRegion</b></em>'.
+ *
+ * @generated
+ */
+public class TextStyleRegionDao extends BaseDao<TextStyleRegion> {
+
+ /**
+ * @generated
+ */
+ @Override
+ public Class<TextStyleRegion> getEntityClass() {
+ return TextStyleRegion.class;
+ }
+
+ /**
+ * @generated
+ */
+ @Override
+ public EClass getEClass() {
+ return StylesModelPackage.INSTANCE.getTextStyleRegionEClass();
+ }
+}
diff --git a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore
index 727545ab..e6e2c2b5 100644
--- a/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore
+++ b/tests/org.eclipse.emf.texo.test.model/src-test-gen/org/eclipse/graphiti/mm/mm.ecore
@@ -7,7 +7,7 @@
<details key="java.member" value="key"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="org.eclipse.emf.texo">
<details key="java.member" value="value"/>
</eAnnotations>
@@ -453,6 +453,12 @@
<details key="java.member" value="value"/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="styleRegions" upperBound="-1"
+ eType="#//algorithms/styles/TextStyleRegion" containment="true">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="styleRegions"/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MultiText" eSuperTypes="#//algorithms/AbstractText"/>
<eSubpackages name="styles" nsURI="http://eclipse.org/graphiti/mm/algorithms/styles"
@@ -747,6 +753,66 @@
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TextStyle" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="underline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="underline"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="underlineStyle" eType="#//algorithms/styles/UnderlineStyle">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="underlineStyle"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strikeout" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="strikeout"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="font" eType="#//algorithms/styles/Font">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="font"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="foreground" eType="#//algorithms/styles/Color">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="foreground"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="background" eType="#//algorithms/styles/Color">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="background"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="underlineColor" eType="#//algorithms/styles/Color">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="underlineColor"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="strikeoutColor" eType="#//algorithms/styles/Color">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="strikeoutColor"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TextStyleRegion" eSuperTypes="http://www.eclipse.org/emf/texo/test/model/base/identifiable#//Identifiable">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="start" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="start"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="end" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="end"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="style" eType="#//algorithms/styles/TextStyle"
+ containment="true">
+ <eAnnotations source="org.eclipse.emf.texo">
+ <details key="java.member" value="style"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="LineStyle">
<eLiterals name="SOLID"/>
<eLiterals name="DASH" value="1"/>
@@ -769,6 +835,12 @@
<eLiterals name="LOCATION_TYPE_ABSOLUTE_START" value="2"/>
<eLiterals name="LOCATION_TYPE_ABSOLUTE_END" value="3"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="UnderlineStyle">
+ <eLiterals name="UNDERLINE_SINGLE"/>
+ <eLiterals name="UNDERLINE_DOUBLE" value="1"/>
+ <eLiterals name="UNDERLINE_ERROR" value="2"/>
+ <eLiterals name="UNDERLINE_SQUIGGLE" value="3"/>
+ </eClassifiers>
</eSubpackages>
</eSubpackages>
</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF
index 275ef5e6..743d86b9 100644
--- a/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.test/META-INF/MANIFEST.MF
@@ -14,9 +14,7 @@ Require-Bundle: org.eclipse.emf.texo;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.datagenerator;bundle-version="[0.1.0,1.1.0)",
- org.eclipse.emf.compare.match;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.emf.compare.diff;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.emf.compare;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)",
org.junit;bundle-version="[4.0.0,5.1.0)",
org.eclipse.emf.texo.json;bundle-version="[0.1.0, 1.1.0)"
Export-Package: org.eclipse.emf.texo.test;version="0.1.0",
diff --git a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz363802.java b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz363802.java
index 8b0c8770..541a9fca 100644
--- a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz363802.java
+++ b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz363802.java
@@ -17,12 +17,12 @@
package org.eclipse.emf.texo.test;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.eclipse.emf.texo.test.model.samples.library.Library;
import org.eclipse.emf.texo.test.model.samples.library.Writer;
import org.eclipse.emf.texo.test.model.samples.librarymodelclasses.model.LibraryModelPackage;
+import org.junit.Assert;
/**
* Tests bugzilla 363802
diff --git a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz393240.java b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz393240.java
index 1cd4b18b..4aa78fe8 100644
--- a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz393240.java
+++ b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestBz393240.java
@@ -35,26 +35,26 @@ public class TestBz393240 {
{
final DocumentRoot dr = Bz393240ModelPackage.INSTANCE.getModelFactory().createDocumentRoot();
final Application appl = Bz393240ModelPackage.INSTANCE.getModelFactory().createApplication();
- appl.setName("test");
+ appl.setName("test"); //$NON-NLS-1$
dr.setApplicationResponse(appl);
final ModelXMLSaver xmlSaver = new ModelXMLSaver();
xmlSaver.setObjects(Collections.singletonList((Object) dr));
final StringWriter sw = new StringWriter();
xmlSaver.setWriter(sw);
xmlSaver.write();
- Assert.assertTrue(sw.toString().contains("applicationResponse"));
+ Assert.assertTrue(sw.toString().contains("applicationResponse")); //$NON-NLS-1$
}
{
final DocumentRoot dr = Bz393240ModelPackage.INSTANCE.getModelFactory().createDocumentRoot();
final Application appl = Bz393240ModelPackage.INSTANCE.getModelFactory().createApplication();
- appl.setName("test");
+ appl.setName("test"); //$NON-NLS-1$
dr.setApplicationRequest(appl);
final ModelXMLSaver xmlSaver = new ModelXMLSaver();
xmlSaver.setObjects(Collections.singletonList((Object) dr));
final StringWriter sw = new StringWriter();
xmlSaver.setWriter(sw);
xmlSaver.write();
- Assert.assertTrue(sw.toString().contains("applicationRequest"));
+ Assert.assertTrue(sw.toString().contains("applicationRequest")); //$NON-NLS-1$
}
// System.err.println(sw.toString());
diff --git a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestTemplateOverride.java b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestTemplateOverride.java
index e1e89e22..cefdf132 100755
--- a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestTemplateOverride.java
+++ b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestTemplateOverride.java
@@ -17,12 +17,12 @@
package org.eclipse.emf.texo.test;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.eclipse.emf.texo.test.model.samples.employee.Department;
import org.eclipse.emf.texo.test.model.samples.employee.Employee;
import org.eclipse.emf.texo.test.model.samples.employee.EmployeeOverrideTest;
+import org.junit.Assert;
/**
* Tests that the entity.xpt template is overridden.
diff --git a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestUtils.java b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestUtils.java
index 78b85fd0..203e33c9 100644
--- a/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestUtils.java
+++ b/tests/org.eclipse.emf.texo.test/src/org/eclipse/emf/texo/test/TestUtils.java
@@ -19,19 +19,23 @@ package org.eclipse.emf.texo.test;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.compare.diff.metamodel.DiffElement;
-import org.eclipse.emf.compare.diff.metamodel.DiffModel;
-import org.eclipse.emf.compare.diff.service.DiffService;
-import org.eclipse.emf.compare.match.MatchOptions;
-import org.eclipse.emf.compare.match.metamodel.MatchModel;
-import org.eclipse.emf.compare.match.service.MatchService;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.match.DefaultComparisonFactory;
+import org.eclipse.emf.compare.match.DefaultEqualityHelperFactory;
+import org.eclipse.emf.compare.match.DefaultMatchEngine;
+import org.eclipse.emf.compare.match.IComparisonFactory;
+import org.eclipse.emf.compare.match.IMatchEngine;
+import org.eclipse.emf.compare.match.eobject.IEObjectMatcher;
+import org.eclipse.emf.compare.match.impl.MatchEngineFactoryImpl;
+import org.eclipse.emf.compare.match.impl.MatchEngineFactoryRegistryImpl;
+import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.compare.utils.UseIdentifiers;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
@@ -43,6 +47,7 @@ import org.eclipse.emf.texo.converter.ModelEMFConverter;
import org.eclipse.emf.texo.datagenerator.ModelDataGenerator;
import org.eclipse.emf.texo.xml.ModelXMLLoader;
import org.eclipse.emf.texo.xml.ModelXMLSaver;
+import org.junit.Assert;
/**
* Utility methods for testcases.
@@ -149,25 +154,23 @@ public class TestUtils {
resource1.getContents().addAll(eObjects1);
resource2.getContents().addAll(eObjects2);
- try {
- final Map<String, Object> options = new HashMap<String, Object>();
- options.put(MatchOptions.OPTION_IGNORE_XMI_ID, Boolean.TRUE);
- options.put(MatchOptions.OPTION_IGNORE_ID, Boolean.TRUE);
- final MatchModel match = MatchService.doResourceMatch(resource1, resource2, options);
- // Computing differences
- final DiffModel diff = DiffService.doDiff(match, false);
- final List<DiffElement> differences = diff.getDifferences();
- final StringBuilder sb = new StringBuilder();
- for (DiffElement diffElement : differences) {
- sb.append(diffElement.toString() + "\n"); //$NON-NLS-1$
- }
- if (!differences.isEmpty()) {
- System.err.println("ads");
- }
- Assert.assertTrue(sb.toString(), differences.isEmpty());
- } catch (final InterruptedException e) {
- throw new IllegalStateException(e);
+ final IEObjectMatcher matcher = DefaultMatchEngine.createDefaultEObjectMatcher(UseIdentifiers.NEVER);
+ final IComparisonFactory comparisonFactory = new DefaultComparisonFactory(new DefaultEqualityHelperFactory());
+ final IMatchEngine.Factory matchEngineFactory = new MatchEngineFactoryImpl(matcher, comparisonFactory);
+ matchEngineFactory.setRanking(20);
+ IMatchEngine.Factory.Registry matchEngineRegistry = new MatchEngineFactoryRegistryImpl();
+ matchEngineRegistry.add(matchEngineFactory);
+ final EMFCompare comparator = EMFCompare.builder().setMatchEngineFactoryRegistry(matchEngineRegistry).build();
+
+ // Compare the two models
+ final IComparisonScope scope = EMFCompare.createDefaultScope(resource1, resource2);
+ final Comparison comparison = comparator.compare(scope);
+ final EList<Diff> differences = comparison.getDifferences();
+ final StringBuilder sb = new StringBuilder();
+ for (Diff diff : differences) {
+ sb.append(diff.toString() + "\n"); //$NON-NLS-1$
}
+ Assert.assertTrue(sb.toString(), differences.isEmpty());
}
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
index ad1251c6..e04f3210 100644
--- a/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.texo.xml.test/META-INF/MANIFEST.MF
@@ -13,9 +13,6 @@ Require-Bundle: org.eclipse.emf.texo.xml;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.texo.test.model;bundle-version="[0.1.0,1.1.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.texo.datagenerator;bundle-version="[0.1.0,1.1.0)",
- org.eclipse.emf.compare.match;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.emf.compare.diff;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.emf.compare;bundle-version="[1.0.1,2.0.0)",
org.junit;bundle-version="[4.0.0,5.1.0)",
com.google.guava;bundle-version="[10.0.0,11.0.0)"
Export-Package: org.eclipse.emf.texo.xml.test;version="0.1.0"

Back to the top