[563046] Fold org.eclipse.ocl.examples.xtext.build into
org.eclipse.ocl.examples.build
diff --git a/archive/org.eclipse.ocl.examples.xtext.build/.project b/archive/org.eclipse.ocl.examples.xtext.build/.project
new file mode 100644
index 0000000..a433925
--- /dev/null
+++ b/archive/org.eclipse.ocl.examples.xtext.build/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.ocl.examples.xtext.build</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.launches/Generate OCL Idioms Editor.launch b/examples/org.eclipse.ocl.examples.build/.launches/Generate OCL Idioms Editor.launch
similarity index 72%
rename from examples/org.eclipse.ocl.examples.xtext.build/.launches/Generate OCL Idioms Editor.launch
rename to examples/org.eclipse.ocl.examples.build/.launches/Generate OCL Idioms Editor.launch
index fc0b8ec..b7e074d 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/.launches/Generate OCL Idioms Editor.launch
+++ b/examples/org.eclipse.ocl.examples.build/.launches/Generate OCL Idioms Editor.launch
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
+ <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
- <listEntry value="/org.eclipse.ocl.examples.xtext.build"/>
+ <listEntry value="/org.eclipse.ocl.examples.build"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
- <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.ocl.examples.build"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/ocl/examples/xtext/build/mwe2/GenerateIdiomsEditor.mwe2"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ocl.examples.xtext.build"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/ocl/examples/build/GenerateIdiomsEditor.mwe2"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ocl.examples.build"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
</launchConfiguration>
diff --git a/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF
index 156100b..08f3c68 100644
--- a/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.build/META-INF/MANIFEST.MF
@@ -35,11 +35,13 @@
org.eclipse.ocl.examples.emf.validation.validity;bundle-version="[2.9.0,3.0.0)",
org.eclipse.ocl.examples.xtext.tests;bundle-version="[3.12.0,4.0.0)",
org.eclipse.xtend.lib;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.ocl.examples.xtext.build
+ org.eclipse.ocl.examples.xtext.idioms;bundle-version="[1.19.0,2.0.0)"
Import-Package: org.apache.commons.logging,
org.apache.log4j;version="[1.2.15,2.0.0)"
Bundle-Vendor: %providerName
Export-Package: org.eclipse.ocl.examples.build,
+ org.eclipse.ocl.examples.build.analysis,
+ org.eclipse.ocl.examples.build.elements,
org.eclipse.ocl.examples.build.fragments,
org.eclipse.ocl.examples.build.genmodel,
org.eclipse.ocl.examples.build.latex;x-internal:=true,
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2
index 73dbd47..cb89994 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAll.mwe2
@@ -23,7 +23,6 @@
component = @GenerateAnnotationModel {}
component = @GenerateCSModels {}
component = @GenerateCGModels {}
- component = @GenerateIdiomsModel {}
component = @GenerateAllEditors {}
component = @GenerateValuesModels {}
component = @GenerateQueriesModels {}
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2
index f430110..1258e4b 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateAllEditors.mwe2
@@ -24,4 +24,5 @@
component = @GenerateOCLinEcoreEditor {}
component = @GenerateCompleteOCLEditor {}
component = @GenerateOCLstdlibEditor {}
+ component = @GenerateIdiomsEditor {}
}
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2
index 1261164..4797755 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateBaseEditor.mwe2
@@ -81,7 +81,7 @@
name = "${baseProjectName}.Base"
fileExtensions = "base"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -98,7 +98,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// *.xtextbin support on Xtext 2.3
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2
index 7ec8911..32987fb 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateCompleteOCLEditor.mwe2
@@ -81,7 +81,7 @@
name = "${completeOCLprojectName}.CompleteOCL"
fileExtensions = "ocl"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -98,7 +98,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// EssentialOCL bindings
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2
index b35d064..2615fde 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateEssentialOCLEditor.mwe2
@@ -82,7 +82,7 @@
name = "${essentialOCLprojectName}.EssentialOCL"
fileExtensions = "essentialocl"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -99,7 +99,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// EssentialOCL bindings
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/mwe2/GenerateIdiomsEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateIdiomsEditor.mwe2
similarity index 79%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/mwe2/GenerateIdiomsEditor.mwe2
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateIdiomsEditor.mwe2
index 68e26c1..7df2fc0 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/mwe2/GenerateIdiomsEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateIdiomsEditor.mwe2
@@ -42,8 +42,8 @@
standaloneSetup = XtextGeneratorStandaloneSetup {
scanClasspath = false
}
- configuration = org.eclipse.ocl.examples.xtext.build.clones.MyDefaultGeneratorModule {
- project = org.eclipse.ocl.examples.xtext.build.clones.MyStandardProjectConfig {
+ configuration = org.eclipse.ocl.examples.build.fragments.MyDefaultGeneratorModule {
+ project = org.eclipse.ocl.examples.build.fragments.MyStandardProjectConfig {
activatorName = "IdiomsActivator"
baseName = "${idiomsProjectName}"
rootPath = rootPath
@@ -85,7 +85,7 @@
name = "${idiomsProjectName}.Idioms"
fileExtensions = "idioms"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -102,7 +102,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// *.xtextbin support on Xtext 2.3
@@ -114,28 +114,28 @@
// javaPackageName = "${idiomsProjectName}"
// grammarFileStem = "Idioms"
// }
- component = org.eclipse.ocl.examples.xtext.build.clones.InjectCompatibilityAbstractInternalAntlrParser {
+ component = org.eclipse.ocl.examples.build.utilities.InjectCompatibilityAbstractInternalAntlrParser {
fileName = "${idiomsRuntimeProject}/src-gen/org/eclipse/ocl/examples/xtext/idioms/parser/antlr/internal/InternalIdiomsParser.java"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}/META-INF"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}/emf-gen"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}/src"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}/src-gen"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}.ui/META-INF"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}.ui/src"
}
- component = org.eclipse.ocl.examples.xtext.build.clones.ConvertToUnixLineEndings {
+ component = org.eclipse.ocl.examples.build.utilities.ConvertToUnixLineEndings {
directory = "${idiomsRuntimeProject}.ui/src-gen"
}
}
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2
index e80d43d..3922055 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateMarkupEditor.mwe2
@@ -81,7 +81,7 @@
name = "${markupProjectName}.Markup"
fileExtensions = "markupocl"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -98,7 +98,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// *.xtextbin support on Xtext 2.3
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2
index bba7bab..0f0ff4e 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLinEcoreEditor.mwe2
@@ -83,7 +83,7 @@
name = "${oclInEcoreProjectName}.OCLinEcore"
fileExtensions = "oclinecore"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -100,7 +100,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// EssentialOCL bindings
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2 b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2
index 768f54c..7c4b27d 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/GenerateOCLstdlibEditor.mwe2
@@ -84,7 +84,7 @@
name = "${oclstdlibProjectName}.OCLstdlib"
fileExtensions = "oclstdlib"
generator = null
- serializer = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragmentXtend {
+ serializer = org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragmentXtend {
generateStub = true
}
validator = {
@@ -101,7 +101,7 @@
classSplitting = true
}
}
- formatter = org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeFormatterFragmentXtend {
+ formatter = org.eclipse.ocl.examples.build.fragments.DeclarativeFormatterFragmentXtend {
generateStub = true
}
// EssentialOCL bindings
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AbstractAssignmentAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AbstractAssignmentAnalysis.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AbstractAssignmentAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AbstractAssignmentAnalysis.java
index 7a0e200..28e28d1 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AbstractAssignmentAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AbstractAssignmentAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.ArrayList;
import java.util.List;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AbstractRuleAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AbstractRuleAnalysis.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AbstractRuleAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AbstractRuleAnalysis.java
index defb3d8..3cdd378 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AbstractRuleAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AbstractRuleAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.Comparator;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/ActionAssignmentAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/ActionAssignmentAnalysis.java
similarity index 96%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/ActionAssignmentAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/ActionAssignmentAnalysis.java
index eae56ee..80c407b 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/ActionAssignmentAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/ActionAssignmentAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AnalysisUtils.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AnalysisUtils.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AnalysisUtils.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AnalysisUtils.java
index 93e8fc0..d2f69ac 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AnalysisUtils.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AnalysisUtils.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AssignmentAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AssignmentAnalysis.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AssignmentAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AssignmentAnalysis.java
index 4cf0d87..05ea153 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/AssignmentAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/AssignmentAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/CardinalityExpression.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/CardinalityExpression.java
similarity index 99%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/CardinalityExpression.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/CardinalityExpression.java
index 66a6eca..1aca005 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/CardinalityExpression.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/CardinalityExpression.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/CardinalityVariable.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/CardinalityVariable.java
similarity index 97%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/CardinalityVariable.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/CardinalityVariable.java
index 7f3078d..7af9517 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/CardinalityVariable.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/CardinalityVariable.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/DataTypeRuleAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/DataTypeRuleAnalysis.java
similarity index 96%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/DataTypeRuleAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/DataTypeRuleAnalysis.java
index cb6e098..95bc3f6 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/DataTypeRuleAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/DataTypeRuleAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/DirectAssignmentAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/DirectAssignmentAnalysis.java
similarity index 97%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/DirectAssignmentAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/DirectAssignmentAnalysis.java
index b1aafe8..f3f442b 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/DirectAssignmentAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/DirectAssignmentAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/GrammarAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/GrammarAnalysis.java
similarity index 99%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/GrammarAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/GrammarAnalysis.java
index 67641b4..8c64050 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/GrammarAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/GrammarAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.io.IOException;
import java.util.ArrayList;
@@ -34,8 +34,8 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedSerializationNode;
+import org.eclipse.ocl.examples.build.elements.SerializationNode;
import org.eclipse.ocl.examples.xtext.idioms.CustomSegment;
import org.eclipse.ocl.examples.xtext.idioms.HalfNewLineSegment;
import org.eclipse.ocl.examples.xtext.idioms.Idiom;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomGrammarMatch.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomGrammarMatch.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomGrammarMatch.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomGrammarMatch.java
index bf277fa..d4999f7 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomGrammarMatch.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomGrammarMatch.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.ArrayList;
import java.util.List;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomMatch.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomMatch.java
similarity index 93%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomMatch.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomMatch.java
index 4f9cd07..a5c1026 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomMatch.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomMatch.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
/**
* An IdiomMatch is created after a first successful match of an idiom. It accumulates
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomSerializationMatch.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomSerializationMatch.java
similarity index 97%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomSerializationMatch.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomSerializationMatch.java
index 48dff43..8848f10 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/IdiomSerializationMatch.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/IdiomSerializationMatch.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.ArrayList;
import java.util.List;
@@ -16,7 +16,7 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationNode;
+import org.eclipse.ocl.examples.build.elements.SerializationNode;
import org.eclipse.ocl.examples.xtext.idioms.Idiom;
import org.eclipse.ocl.examples.xtext.idioms.IdiomsUtils;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/LocatorHelper.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/LocatorHelper.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/LocatorHelper.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/LocatorHelper.java
index f0bd84c..aca005c 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/LocatorHelper.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/LocatorHelper.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -16,11 +16,11 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedCrossReferenceSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedKeywordSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.UnassignedKeywordSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedCrossReferenceSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedKeywordSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedSerializationNode;
+import org.eclipse.ocl.examples.build.elements.SerializationNode;
+import org.eclipse.ocl.examples.build.elements.UnassignedKeywordSerializationNode;
import org.eclipse.ocl.examples.xtext.idioms.AnyAssignmentLocator;
import org.eclipse.ocl.examples.xtext.idioms.AnyElementLocator;
import org.eclipse.ocl.examples.xtext.idioms.AssignmentLocator;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/ParserRuleAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/ParserRuleAnalysis.java
similarity index 96%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/ParserRuleAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/ParserRuleAnalysis.java
index 287d22c..1173f74 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/ParserRuleAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/ParserRuleAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.ArrayList;
import java.util.Collection;
@@ -27,27 +27,27 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.LocatorHelper.LocatorSwitch;
-import org.eclipse.ocl.examples.xtext.build.elements.AbstractAssignedSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AbstractSerializationElement;
-import org.eclipse.ocl.examples.xtext.build.elements.AlternativeAssignedKeywordsSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AlternativeAssignsSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AlternativeUnassignedKeywordsSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedCrossReferenceSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedCurrentSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedKeywordSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedRuleCallSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.ListOfListOfSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.ListOfSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.NullSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SequenceSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationElement;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationRuleAnalysisComparator;
-import org.eclipse.ocl.examples.xtext.build.elements.UnassignedGrammarRuleCallSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.UnassignedKeywordSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.UnassignedSerializationRuleCallSerializationNode;
+import org.eclipse.ocl.examples.build.analysis.LocatorHelper.LocatorSwitch;
+import org.eclipse.ocl.examples.build.elements.AbstractAssignedSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AbstractSerializationElement;
+import org.eclipse.ocl.examples.build.elements.AlternativeAssignedKeywordsSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AlternativeAssignsSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AlternativeUnassignedKeywordsSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedCrossReferenceSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedCurrentSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedKeywordSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedRuleCallSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedSerializationNode;
+import org.eclipse.ocl.examples.build.elements.ListOfListOfSerializationNode;
+import org.eclipse.ocl.examples.build.elements.ListOfSerializationNode;
+import org.eclipse.ocl.examples.build.elements.NullSerializationNode;
+import org.eclipse.ocl.examples.build.elements.SequenceSerializationNode;
+import org.eclipse.ocl.examples.build.elements.SerializationElement;
+import org.eclipse.ocl.examples.build.elements.SerializationNode;
+import org.eclipse.ocl.examples.build.elements.SerializationRuleAnalysisComparator;
+import org.eclipse.ocl.examples.build.elements.UnassignedGrammarRuleCallSerializationNode;
+import org.eclipse.ocl.examples.build.elements.UnassignedKeywordSerializationNode;
+import org.eclipse.ocl.examples.build.elements.UnassignedSerializationRuleCallSerializationNode;
import org.eclipse.ocl.examples.xtext.idioms.Idiom;
import org.eclipse.ocl.examples.xtext.idioms.IdiomsUtils;
import org.eclipse.ocl.examples.xtext.idioms.Locator;
@@ -61,6 +61,7 @@
import org.eclipse.ocl.examples.xtext.serializer.SerializationRule;
import org.eclipse.ocl.examples.xtext.serializer.SerializationSegment;
import org.eclipse.ocl.examples.xtext.serializer.SerializationUtils;
+import org.eclipse.ocl.pivot.utilities.UniqueList;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.Action;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/SerializationMatchTermRuntime.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/SerializationMatchTermRuntime.java
similarity index 97%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/SerializationMatchTermRuntime.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/SerializationMatchTermRuntime.java
index fbc9a2e..ef302b1 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/SerializationMatchTermRuntime.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/SerializationMatchTermRuntime.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/SerializationRuleAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/SerializationRuleAnalysis.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/SerializationRuleAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/SerializationRuleAnalysis.java
index 04b69a6..b65dacd 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/SerializationRuleAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/SerializationRuleAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import java.util.ArrayList;
import java.util.Arrays;
@@ -28,16 +28,16 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.LocatorHelper.LocatorSwitch;
-import org.eclipse.ocl.examples.xtext.build.elements.AbstractUnassignedSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AlternativeAssignedKeywordsSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AlternativeAssignsSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedKeywordSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedRuleCallSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.AssignedSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.CompositeSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SequenceSerializationNode;
-import org.eclipse.ocl.examples.xtext.build.elements.SerializationNode;
+import org.eclipse.ocl.examples.build.analysis.LocatorHelper.LocatorSwitch;
+import org.eclipse.ocl.examples.build.elements.AbstractUnassignedSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AlternativeAssignedKeywordsSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AlternativeAssignsSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedKeywordSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedRuleCallSerializationNode;
+import org.eclipse.ocl.examples.build.elements.AssignedSerializationNode;
+import org.eclipse.ocl.examples.build.elements.CompositeSerializationNode;
+import org.eclipse.ocl.examples.build.elements.SequenceSerializationNode;
+import org.eclipse.ocl.examples.build.elements.SerializationNode;
import org.eclipse.ocl.examples.xtext.idioms.Idiom;
import org.eclipse.ocl.examples.xtext.idioms.IdiomsUtils;
import org.eclipse.ocl.examples.xtext.idioms.Locator;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/TerminalRuleAnalysis.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/TerminalRuleAnalysis.java
similarity index 96%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/TerminalRuleAnalysis.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/TerminalRuleAnalysis.java
index 90256f1..9db6f51 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/TerminalRuleAnalysis.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/analysis/TerminalRuleAnalysis.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
+package org.eclipse.ocl.examples.build.analysis;
import org.eclipse.emf.ecore.EDataType;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractAssignedSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractAssignedSerializationNode.java
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractAssignedSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractAssignedSerializationNode.java
index d357694..596e2d7 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractAssignedSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractAssignedSerializationNode.java
@@ -8,13 +8,13 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
import org.eclipse.ocl.examples.xtext.serializer.EnumerationValue;
import org.eclipse.ocl.examples.xtext.serializer.EnumerationValue.EnumerationValueNull;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractSerializationElement.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractSerializationElement.java
similarity index 97%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractSerializationElement.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractSerializationElement.java
index bdb83d0..6abf46f 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractSerializationElement.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractSerializationElement.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.ArrayList;
import java.util.List;
@@ -16,9 +16,9 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.ParserRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.ParserRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
import org.eclipse.ocl.examples.xtext.serializer.ToDebugString;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractSerializationNode.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractSerializationNode.java
index 77522c1..09ec9d7 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.ArrayList;
import java.util.Collections;
@@ -17,8 +17,8 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractUnassignedSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractUnassignedSerializationNode.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractUnassignedSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractUnassignedSerializationNode.java
index 95ad010..72e3f96 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AbstractUnassignedSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AbstractUnassignedSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeAssignedKeywordsSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeAssignedKeywordsSerializationNode.java
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeAssignedKeywordsSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeAssignedKeywordsSerializationNode.java
index b82207b..0b75444 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeAssignedKeywordsSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeAssignedKeywordsSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -17,10 +17,10 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.DirectAssignmentAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.DirectAssignmentAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.EnumerationValue;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeAssignsSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeAssignsSerializationNode.java
similarity index 93%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeAssignsSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeAssignsSerializationNode.java
index 7d7a536..9648969 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeAssignsSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeAssignsSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -17,10 +17,10 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.DirectAssignmentAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.DirectAssignmentAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.EnumerationValue;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeUnassignedKeywordsSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeUnassignedKeywordsSerializationNode.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeUnassignedKeywordsSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeUnassignedKeywordsSerializationNode.java
index 2ffa3ca..54c8f91 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativeUnassignedKeywordsSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativeUnassignedKeywordsSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.ArrayList;
import java.util.List;
@@ -16,7 +16,7 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativesSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativesSerializationNode.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativesSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativesSerializationNode.java
index 1567f65..ced116c 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AlternativesSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AlternativesSerializationNode.java
@@ -8,14 +8,14 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedCrossReferenceSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedCrossReferenceSerializationNode.java
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedCrossReferenceSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedCrossReferenceSerializationNode.java
index 1eb0d46..f39daec 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedCrossReferenceSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedCrossReferenceSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -18,10 +18,10 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.DirectAssignmentAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.DirectAssignmentAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedCurrentSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedCurrentSerializationNode.java
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedCurrentSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedCurrentSerializationNode.java
index 0003002..c84f9bb 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedCurrentSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedCurrentSerializationNode.java
@@ -8,15 +8,15 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.ActionAssignmentAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.ActionAssignmentAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedKeywordSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedKeywordSerializationNode.java
similarity index 91%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedKeywordSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedKeywordSerializationNode.java
index 7328071..c6dc48d 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedKeywordSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedKeywordSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -17,10 +17,10 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.DirectAssignmentAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.DirectAssignmentAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.EnumerationValue;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedRuleCallSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedRuleCallSerializationNode.java
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedRuleCallSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedRuleCallSerializationNode.java
index 3d46ce4..a531803 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedRuleCallSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedRuleCallSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -17,10 +17,10 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.DirectAssignmentAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.DirectAssignmentAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedSerializationNode.java
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedSerializationNode.java
index 0ed257c..6fc3d20 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/AssignedSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/AssignedSerializationNode.java
@@ -8,12 +8,12 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
import org.eclipse.ocl.examples.xtext.serializer.EnumerationValue;
import org.eclipse.ocl.examples.xtext.serializer.GrammarRuleVector;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/CompositeSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/CompositeSerializationNode.java
similarity index 94%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/CompositeSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/CompositeSerializationNode.java
index da95e81..2d906c3 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/CompositeSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/CompositeSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/ListOfListOfSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/ListOfListOfSerializationNode.java
similarity index 99%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/ListOfListOfSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/ListOfListOfSerializationNode.java
index b028a9c..c54e317 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/ListOfListOfSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/ListOfListOfSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.ArrayList;
import java.util.List;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/ListOfSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/ListOfSerializationNode.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/ListOfSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/ListOfSerializationNode.java
index 22e5244..4b5b67a 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/ListOfSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/ListOfSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.ArrayList;
import java.util.List;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/NullSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/NullSerializationNode.java
similarity index 97%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/NullSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/NullSerializationNode.java
index c3699df..530f945 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/NullSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/NullSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SequenceSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SequenceSerializationNode.java
similarity index 96%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SequenceSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SequenceSerializationNode.java
index a990d9a..92fc618 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SequenceSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SequenceSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.ArrayList;
import java.util.HashSet;
@@ -17,8 +17,8 @@
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationElement.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationElement.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationElement.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationElement.java
index fc3ccec..ed2eaaf 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationElement.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationElement.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationNode.java
similarity index 93%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationNode.java
index 8eb064e..1d8cdcd 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationNode.java
@@ -8,14 +8,14 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
import org.eclipse.ocl.examples.xtext.serializer.SerializationStep;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationRuleAnalysisComparator.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationRuleAnalysisComparator.java
similarity index 94%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationRuleAnalysisComparator.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationRuleAnalysisComparator.java
index 6dcaae7..5162794 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/SerializationRuleAnalysisComparator.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/SerializationRuleAnalysisComparator.java
@@ -8,14 +8,14 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.serializer.SerializationUtils;
/**
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedGrammarRuleCallSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedGrammarRuleCallSerializationNode.java
similarity index 93%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedGrammarRuleCallSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedGrammarRuleCallSerializationNode.java
index a4d5fec..0f54f92 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedGrammarRuleCallSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedGrammarRuleCallSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -16,8 +16,8 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedKeywordSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedKeywordSerializationNode.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedKeywordSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedKeywordSerializationNode.java
index e59fd51..4cafe0f 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedKeywordSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedKeywordSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedSerializationRuleCallSerializationNode.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedSerializationRuleCallSerializationNode.java
similarity index 95%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedSerializationRuleCallSerializationNode.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedSerializationRuleCallSerializationNode.java
index 8dcdf52..92c7e05 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/elements/UnassignedSerializationRuleCallSerializationNode.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/elements/UnassignedSerializationRuleCallSerializationNode.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.elements;
+package org.eclipse.ocl.examples.build.elements;
import java.util.List;
import java.util.Map;
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.SubIdiom;
import org.eclipse.ocl.examples.xtext.serializer.DiagnosticStringBuilder;
import org.eclipse.ocl.examples.xtext.serializer.GrammarCardinality;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeFormatterFragment.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeFormatterFragment.java
similarity index 96%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeFormatterFragment.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeFormatterFragment.java
index 23eef8c..ecfe964 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeFormatterFragment.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeFormatterFragment.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.fragments;
+package org.eclipse.ocl.examples.build.fragments;
import org.eclipse.xtext.Grammar;
import org.eclipse.xtext.xtext.generator.formatting.Formatter2Fragment2;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeFormatterFragmentXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeFormatterFragmentXtend.xtend
similarity index 92%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeFormatterFragmentXtend.xtend
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeFormatterFragmentXtend.xtend
index 9b532e2..c05db92 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeFormatterFragmentXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeFormatterFragmentXtend.xtend
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.fragments;
+package org.eclipse.ocl.examples.build.fragments;
/**
* DeclarativeFormatterFragmentXtend augments DeclarativeFormatterFragment with M2T functionality
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeSerializerFragment.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeSerializerFragment.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeSerializerFragment.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeSerializerFragment.java
index d0c6352..e6cc36a 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeSerializerFragment.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeSerializerFragment.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.fragments;
+package org.eclipse.ocl.examples.build.fragments;
import java.io.IOException;
import java.io.OutputStream;
@@ -32,11 +32,10 @@
import org.eclipse.emf.ecore.resource.URIConverter;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.ocl.examples.xtext.build.analysis.AbstractRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.ParserRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis;
-import org.eclipse.ocl.examples.xtext.build.clones.DebugTimestamp;
+import org.eclipse.ocl.examples.build.analysis.AbstractRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis;
+import org.eclipse.ocl.examples.build.analysis.ParserRuleAnalysis;
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis;
import org.eclipse.ocl.examples.xtext.idioms.IdiomsStandaloneSetup;
import org.eclipse.ocl.examples.xtext.serializer.AbstractSerializationMetaData;
import org.eclipse.ocl.examples.xtext.serializer.DeclarativeFormatter;
@@ -65,6 +64,7 @@
import org.eclipse.ocl.examples.xtext.serializer.SerializationStep.SerializationStepAssigns;
import org.eclipse.ocl.examples.xtext.serializer.SerializationStep.SerializationStepKeyword;
import org.eclipse.ocl.examples.xtext.serializer.SerializationStep.SerializationStepSequence;
+import org.eclipse.ocl.pivot.utilities.DebugTimestamp;
import org.eclipse.ocl.examples.xtext.serializer.SerializationUtils;
import org.eclipse.xtend2.lib.StringConcatenationClient;
import org.eclipse.xtext.AbstractElement;
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeSerializerFragmentXtend.xtend b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeSerializerFragmentXtend.xtend
similarity index 99%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeSerializerFragmentXtend.xtend
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeSerializerFragmentXtend.xtend
index 175d5f6..89f0a32 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/DeclarativeSerializerFragmentXtend.xtend
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/DeclarativeSerializerFragmentXtend.xtend
@@ -8,15 +8,15 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.fragments;
+package org.eclipse.ocl.examples.build.fragments;
import com.google.inject.Inject
import org.eclipse.emf.ecore.EClass
import org.eclipse.jdt.annotation.NonNull
import org.eclipse.jdt.annotation.Nullable
-import org.eclipse.ocl.examples.xtext.build.analysis.GrammarAnalysis
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationMatchTermRuntime
-import org.eclipse.ocl.examples.xtext.build.analysis.SerializationRuleAnalysis
+import org.eclipse.ocl.examples.build.analysis.GrammarAnalysis
+import org.eclipse.ocl.examples.build.analysis.SerializationMatchTermRuntime
+import org.eclipse.ocl.examples.build.analysis.SerializationRuleAnalysis
import org.eclipse.ocl.examples.xtext.serializer.DataTypeRuleValue
import org.eclipse.ocl.examples.xtext.serializer.EClassValue
import org.eclipse.ocl.examples.xtext.serializer.EClassValue.EReference_TargetGrammarRuleVector
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/GenModelHelper.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/GenModelHelper.java
similarity index 98%
rename from examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/GenModelHelper.java
rename to examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/GenModelHelper.java
index 9e086d5..733d9c4 100644
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/fragments/GenModelHelper.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/GenModelHelper.java
@@ -8,7 +8,7 @@
* Contributors:
* E.D.Willink - initial API and implementation
*******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.fragments;
+package org.eclipse.ocl.examples.build.fragments;
import java.io.IOException;
import java.util.HashMap;
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MyDefaultGeneratorModule.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MyDefaultGeneratorModule.java
index 9c4d0ba..6b473d5 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MyDefaultGeneratorModule.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/fragments/MyDefaultGeneratorModule.java
@@ -14,7 +14,7 @@
import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
/**
- * This override supports the specifocation of an activatorName to fix Bug 564238
+ * This override supports the specification of an activatorName to fix Bug 564238
*/
public class MyDefaultGeneratorModule extends DefaultGeneratorModule
{
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.classpath b/examples/org.eclipse.ocl.examples.xtext.build/.classpath
deleted file mode 100644
index 06d2290..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="src" path="xtend-gen"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.gitignore b/examples/org.eclipse.ocl.examples.xtext.build/.gitignore
deleted file mode 100644
index 746c7f0..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/target/
-/.polyglot.build.properties
-/.antlr-generator-3.2.0-patch.jar
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.project b/examples/org.eclipse.ocl.examples.xtext.build/.project
deleted file mode 100644
index c5a133b..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ocl.examples.xtext.build</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.core.resources.prefs b/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e0c432e..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Oct 08 09:44:32 CEST 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.core.runtime.prefs b/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 959e25b..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,376 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_additive_operator=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=20
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=20
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=53
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=53
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=20
-org.eclipse.jdt.core.formatter.alignment_for_logical_operator=20
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=20
-org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=20
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=33
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=17
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=33
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=17
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=33
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=0
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.xtext.Xtext.prefs b/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.xtext.Xtext.prefs
deleted file mode 100644
index 136a3b5..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/.settings/org.eclipse.xtext.Xtext.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-ValidatorConfiguration.is_project_specific=true
-eclipse.preferences.version=1
-org.eclipse.xtext.grammar.BidirectionalReference=warning
-org.eclipse.xtext.grammar.DuplicateEnumLiteral=warning
-org.eclipse.xtext.grammar.InvalidMetaModelName=warning
-org.eclipse.xtext.grammar.InvalidPackageReference.external=ignore
-org.eclipse.xtext.grammar.InvalidPackageReference.notOnClasspath=ignore
-org.eclipse.xtext.grammar.InvalidTerminalRuleName=warning
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/META-INF/.gitignore b/examples/org.eclipse.ocl.examples.xtext.build/META-INF/.gitignore
deleted file mode 100644
index feca270..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/META-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF_gen
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.build/META-INF/MANIFEST.MF
deleted file mode 100644
index 06aa7cd..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ocl.examples.xtext.build;singleton:=true
-Bundle-Version: 1.19.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.apache.commons.logging;version="[1.2.0,2.0.0)",
- org.apache.log4j;version="[1.2.15,2.0.0)"
-Export-Package: org.eclipse.ocl.examples.xtext.build.analysis,
- org.eclipse.ocl.examples.xtext.build.elements,
- org.eclipse.ocl.examples.xtext.build.fragments
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.mwe2.launch;bundle-version="[2.9.1,3.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.xtend.lib;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.xtext.xtext.generator;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.ocl.examples.xtext.idioms;visibility:=reexport,
- org.eclipse.ocl.examples.xtext.serializer;visibility:=reexport,
- org.objectweb.asm;bundle-version="5.0.0"
-Bundle-ActivationPolicy: lazy
-Automatic-Module-Name: org.eclipse.ocl.examples.xtext.build
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/about.html b/examples/org.eclipse.ocl.examples.xtext.build/about.html
deleted file mode 100644
index e9d1dac..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>January 27, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/build.properties b/examples/org.eclipse.ocl.examples.xtext.build/build.properties
deleted file mode 100644
index 7ba3ec9..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2010, 2014 Willink Transformations and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-# E.D.Willink - initial API and implementation
-###############################################################################
-
-bin.includes = .,\
- META-INF/,\
- plugin.properties,\
- about.html,\
- build.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
-
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/plugin.properties b/examples/org.eclipse.ocl.examples.xtext.build/plugin.properties
deleted file mode 100644
index 975e2cb..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2010, 2015 Willink Transformations and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-# E.D.Willink - initial API and implementation
-###############################################################################
-
-pluginName = OCL build support for the Xtext Declarative Serializer
-providerName = Eclipse OCL
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/UniqueList.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/UniqueList.java
deleted file mode 100644
index 0578ee8..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/analysis/UniqueList.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.analysis;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
-
-/**
- * A UniqueList is an ArrayList that enforces uniqueness of its contents. For small lists the enforcement
- * is by content iteration. For large lists a HashSet accelerates is-present testing.
- *
- * @since 1.8
- */
-public class UniqueList<E> extends ArrayList<E> implements Set<E>
-{
- private static final long serialVersionUID = 1L;
- private static int SMALL_TO_LARGE_THRESHOLD = 5;
-
- private @Nullable Set<E> set = null;
-
- /**
- * Constructs a new empty list.
- */
- public UniqueList() {}
-
- /**
- * Constructs a new set containing the elements in the specified collection.
- */
- public UniqueList(Collection<? extends E> c) {
- if (c.size() >= SMALL_TO_LARGE_THRESHOLD) {
- set = new HashSet<>(c.size());
- }
- for (E aT : c) {
- add(aT);
- }
- }
-
- /**
- * Constructs a new, empty set with the specified initial capacity.
- */
- public UniqueList(int initialCapacity) {
- if (initialCapacity >= SMALL_TO_LARGE_THRESHOLD) {
- set = new HashSet<>(initialCapacity);
- }
- }
-
- @Override
- public boolean add(E e) {
- Set<E> set2 = set;
- if (set2 == null) {
- if (size() < SMALL_TO_LARGE_THRESHOLD) {
- if (contains(e)) {
- return false;
- }
- return super.add(e);
- }
- else {
- set = set2 = new HashSet<>(this);
- }
- }
- if (!set2.add(e)) {
- return false;
- }
- return super.add(e);
- }
-
- @Override
- public boolean addAll(Collection<? extends E> c) {
- Set<E> set2 = set;
- if ((set2 == null) && ((size() + c.size()) >= SMALL_TO_LARGE_THRESHOLD)) {
- set = set2 = new HashSet<>(this);
- }
- boolean isChanged = false;
- if (set2 == null) {
- for (E aT : c) {
- if (!contains(aT)) {
- isChanged = true;
- super.add(aT);
- }
- }
- }
- else {
- for (E aT : c) {
- if (set2.add(aT)) {
- isChanged = true;
- super.add(aT);
- }
- }
- }
- return isChanged;
- }
-
- @Override
- public void clear() {
- super.clear();
- set = null;
- }
-
- @Override
- public boolean contains(Object o) {
- return set != null ? set.contains(o) : super.contains(o);
- }
-
- @Override
- public boolean containsAll(Collection<?> c) {
- return set != null ? set.containsAll(c) : super.containsAll(c);
- }
-
-
- @Override
- public boolean remove(Object o) {
- if ((set != null) && !set.remove(o)) {
- return false;
- }
- return super.remove(o);
- }
-
- @Override
- public boolean removeAll(Collection<?> c) {
- boolean isChanged = false;
- for (Object aT : c) {
- if (remove(aT)) {
- isChanged = true;
- }
- }
- return isChanged;
- }
-
- @Override
- public boolean retainAll(Collection<?> c) {
- if (set != null) {
- set.retainAll(c);
- return super.retainAll(set);
- }
- else {
- return super.retainAll(c);
- }
- }
-
- @SuppressWarnings("null")
- @Override
- public <T> T @NonNull [] toArray(T[] a) {
- return super.toArray(a);
- }
-}
\ No newline at end of file
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/ConvertToUnixLineEndings.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/ConvertToUnixLineEndings.java
deleted file mode 100644
index 16cdf38..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/ConvertToUnixLineEndings.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * <copyright>
- *
- * Copyright (c) 2015, 2020 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - Initial API and implementation
- *
- * </copyright>
- */
-// FIXME this is a clone of org.eclipse.ocl.examples.build.utilities in support of
-package org.eclipse.ocl.examples.xtext.build.clones;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.emf.mwe.core.WorkflowContext;
-import org.eclipse.emf.mwe.core.issues.Issues;
-import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2;
-import org.eclipse.emf.mwe.core.monitor.ProgressMonitor;
-
-/**
- * Convert the line endings of all files in a directory tree to use Unix line endings.
- * Trailing whitespace is also removed.
- * Binary file extensions may be excluded from conversion.
- */
-public class ConvertToUnixLineEndings extends AbstractWorkflowComponent2 {
-
- private static final String COMPONENT_NAME = "Convert to Unix Line Endings";
-
- private static final Log LOG = LogFactory.getLog(ConvertToUnixLineEndings.class);
-
- private String directory;
-
- private final Collection<String> binaryExtensions = new HashSet<String>();
-
- private final Collection<String> defaultBinaryExtensions = Arrays.asList(new String[] { "xtextbin" });
-
- private boolean useDefaultBinaryExtensions = true;
-
- /**
- * Sets the directory.
- *
- * @param directory
- * name of directory
- */
- public void setDirectory(final String directory) {
- this.directory = directory;
- }
-
- /**
- * @see org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent#getLogMessage()
- */
- @Override
- public String getLogMessage() {
- return "converting directory '" + directory + "'";
- }
-
- @Override
- protected void invokeInternal(final WorkflowContext model, final ProgressMonitor monitor, final Issues issues) {
- if (directory != null) {
- final StringTokenizer st = new StringTokenizer(directory, ",");
- while (st.hasMoreElements()) {
- final String dir = st.nextToken().trim();
- final File f = new File(dir);
- if (f.exists() && f.isDirectory()) {
- LOG.info("Converting " + f.getAbsolutePath());
- try {
- cleanFolder(f.getAbsolutePath());
- }
- catch (FileNotFoundException e) {
- issues.addError(e.getMessage());
- }
- }
- }
- }
- }
-
- @Override
- protected void checkConfigurationInternal(final Issues issues) {
- if (directory == null) {
- issues.addWarning("No directories specified!");
- }
- }
-
- /**
- * Deletes all files and subdirectories under dir. Returns true if all
- * deletions were successful. If a deletion fails, the method stops
- * attempting to delete and returns false.
- */
- public void cleanFolder(String srcGenPath) throws FileNotFoundException {
- File f = new File(srcGenPath);
- if (!f.exists())
- throw new FileNotFoundException(srcGenPath + " " + f.getAbsolutePath());
- LOG.debug("Converting folder " + f.getPath());
- convertFolder(f, new FileFilter() {
- @Override
- public boolean accept(File path) {
- return !isBinaryExtension(path);
- }
- }, false);
- }
-
- public boolean isBinaryExtension(File path) {
- String name = path.getName();
- int index = name.lastIndexOf('.');
- String extension = index >= 0 ? name.substring(index+1) : "";
- if (useDefaultBinaryExtensions && defaultBinaryExtensions.contains(extension))
- return true;
- return binaryExtensions.contains(extension);
- }
-
- public boolean convertFolder(File parentFolder, final FileFilter filter, boolean continueOnError) throws FileNotFoundException {
- if (!parentFolder.exists())
- throw new FileNotFoundException(parentFolder.getAbsolutePath());
- FileFilter myFilter = filter;
- if (myFilter == null) {
- myFilter = new FileFilter() {
- @Override
- public boolean accept(File pathname) {
- return true;
- }
- };
- }
- LOG.debug("Converting folder " + parentFolder.toString());
- final File[] contents = parentFolder.listFiles(myFilter);
- for (int j = 0; contents!=null && j < contents.length; j++) {
- final File file = contents[j];
- if (file.isDirectory()) {
- if (!convertFolder(file, myFilter, continueOnError) && !continueOnError)
- return false;
- }
- else {
- convertFile(file);
- }
- }
- return true;
- }
-
- private void convertFile(File file) {
- try {
- Reader reader = new FileReader(file);
- StringBuilder s = new StringBuilder();
- boolean changed = false;
- boolean trimmed = false;
- try {
- for (int c; (c = reader.read()) >= 0; ) {
- if (c == '\r') {
- changed = true;
- }
- else if (c == '\n') {
- for (int len = s.length(); --len >= 0; ) {
- char ch = s.charAt(len);
- if ((ch != '\n') && Character.isWhitespace(ch)) {
- s.setLength(len);
- trimmed = true;
- }
- else {
- break;
- }
- }
- s.append((char)c);
- }
- else {
- s.append((char)c);
- }
- }
- } catch (IOException e) {
- LOG.error("Failed to read '" + file + "'", e);
- return;
- }
- try {
- reader.close();
- } catch (IOException e) {
- LOG.error("Failed to close '" + file + "'", e);
- return;
- }
- if (changed || trimmed) {
- try {
- Writer writer = new FileWriter(file);
- try {
- writer.write(s.toString());
- writer.flush();
- } catch (IOException e) {
- LOG.error("Failed to write '" + file + "'", e);
- return;
- } finally {
- writer.close();
- }
- } catch (IOException e) {
- LOG.error("Failed to re-open '" + file + "'", e);
- return;
- }
- LOG.info((changed ? "Converted " : "Trimmed ") + file);
- }
- } catch (FileNotFoundException e) {
- LOG.error("Failed to open '" + file + "'", e);
- return;
- }
- }
-
- /**
- * Returns if the default binary extensions are used.
- */
- public boolean isUseDefaultBinaryExtensions() {
- return useDefaultBinaryExtensions;
- }
-
- /**
- * Sets if the default binary extensions are used.
- */
- public void setUseDefaultBinaryExtensions(final boolean useDefaultBinaryExtensions) {
- this.useDefaultBinaryExtensions = useDefaultBinaryExtensions;
- }
-
- /**
- * Adds a binary extension.
- */
- public void addBinaryExtension(final String binaryExtension) {
- binaryExtensions.add(binaryExtension);
- }
-
- /**
- * @see org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent#getComponentName()
- */
- @Override
- public String getComponentName() {
- return COMPONENT_NAME;
- }
-
-}
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/DebugTimestamp.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/DebugTimestamp.java
deleted file mode 100644
index 3633d8b..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/DebugTimestamp.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2021 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.clones;
-
-import org.eclipse.jdt.annotation.NonNull;
-
-/**
- * @since 1.13
- */
-public class DebugTimestamp
-{
- protected static final long originTime = System.nanoTime();
-
- protected final @NonNull String name;
- protected final long startTime;
-
- public DebugTimestamp(@NonNull String name) {
- this.name = name;
- this.startTime = System.nanoTime();
- String message = String.format("%12.6f %s Starting", 0.000000001 * (startTime- originTime), name);
- doLog(message);
- }
-
- protected void doLog(String message) { // Override for a logger
- System.out.println(message);
- }
-
- public void log(@NonNull String event) {
- long nowTime = System.nanoTime();
- String message = String.format("%12.6f %s %s", 0.000000001 * (nowTime - startTime), name, event);
- doLog(message);
- }
-}
\ No newline at end of file
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/InjectCompatibilityAbstractInternalAntlrParser.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/InjectCompatibilityAbstractInternalAntlrParser.java
deleted file mode 100644
index 60ecd07..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/InjectCompatibilityAbstractInternalAntlrParser.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * <copyright>
- *
- * Copyright (c) 2015, 2020 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - Initial API and implementation
- *
- * </copyright>
- */
-package org.eclipse.ocl.examples.xtext.build.clones;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.Writer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.emf.mwe.core.WorkflowContext;
-import org.eclipse.emf.mwe.core.issues.Issues;
-import org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent2;
-import org.eclipse.emf.mwe.core.monitor.ProgressMonitor;
-import org.eclipse.ocl.examples.xtext.idioms.CompatibilityAbstractInternalAntlrParser;
-import org.eclipse.xtext.parser.antlr.AbstractInternalAntlrParser;
-
-/**
- * Convert the line endings of all files in a directory tree to use Unix line endings.
- * Trailing whitespace is also removed.
- * Binary file extensions may be excluded from conversion.
- */
-public class InjectCompatibilityAbstractInternalAntlrParser extends AbstractWorkflowComponent2 {
-
- private static final String COMPONENT_NAME = "Inject CompatibilityAbstractInternalAntlrParser";
-
- private static final Log LOG = LogFactory.getLog(InjectCompatibilityAbstractInternalAntlrParser.class);
-
- private String fileName;
-
- /**
- * Sets the directory.
- *
- * @param directory
- * file name of parser
- */
- public void setFileName(final String fileName) {
- this.fileName = fileName;
- }
-
- /**
- * @see org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent#getLogMessage()
- */
- @Override
- public String getLogMessage() {
- return "converting '" + fileName + "'";
- }
-
- @Override
- protected void invokeInternal(final WorkflowContext model, final ProgressMonitor monitor, final Issues issues) {
- if (fileName != null) {
- final File f = new File(fileName);
- LOG.info("Converting " + f.getAbsolutePath());
- convertFile(f);
- }
- }
-
- @Override
- protected void checkConfigurationInternal(final Issues issues) {
- if (fileName == null) {
- issues.addWarning("No fileName specified!");
- }
- }
- private void convertFile(File file) {
- try {
- StringBuilder s = new StringBuilder();
- // boolean changed = false;
- // boolean trimmed = false;
- LineNumberReader reader = new LineNumberReader(new FileReader(file));
- try {
- String oldText = "extends " + AbstractInternalAntlrParser.class.getSimpleName();
- String newText = "extends " + CompatibilityAbstractInternalAntlrParser.class.getName();
- for (String line; (line = reader.readLine()) != null; ) {
- s.append(line.replace(oldText, newText));
- s.append("\n");
- }
- } catch (IOException e) {
- LOG.error("Failed to read '" + file + "'", e);
- return;
- }
- try {
- reader.close();
- } catch (IOException e) {
- LOG.error("Failed to close '" + file + "'", e);
- return;
- }
- // if (changed || trimmed) {
- try {
- Writer writer = new FileWriter(file);
- try {
- writer.write(s.toString());
- writer.flush();
- } catch (IOException e) {
- LOG.error("Failed to write '" + file + "'", e);
- return;
- } finally {
- writer.close();
- }
- } catch (IOException e) {
- LOG.error("Failed to re-open '" + file + "'", e);
- return;
- }
- LOG.info("Updated " + file);
- // }
- } catch (FileNotFoundException e) {
- LOG.error("Failed to open '" + file + "'", e);
- return;
- }
- }
-
- /**
- * @see org.eclipse.emf.mwe.core.lib.AbstractWorkflowComponent#getComponentName()
- */
- @Override
- public String getComponentName() {
- return COMPONENT_NAME;
- }
-
-}
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyDefaultGeneratorModule.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyDefaultGeneratorModule.java
deleted file mode 100644
index 9f8c85f..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyDefaultGeneratorModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.clones;
-
-import org.eclipse.xtext.xtext.generator.DefaultGeneratorModule;
-import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
-
-/**
- * This override supports the specifocation of an activatorName to fix Bug 564238
- */
-public class MyDefaultGeneratorModule extends DefaultGeneratorModule
-{
- public Class<? extends XtextGeneratorNaming> bindXtextGeneratorNaming() {
- return MyXtextGeneratorNaming.class;
- }
-}
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyStandardProjectConfig.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyStandardProjectConfig.java
deleted file mode 100644
index ee857b3..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyStandardProjectConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ocl.examples.xtext.build.clones;
-
-import org.eclipse.xtext.xtext.generator.model.project.StandardProjectConfig;
-
-/**
- * This override supports the specifocation of an activatorName to fix Bug 564238
- */
-public class MyStandardProjectConfig extends StandardProjectConfig
-{
- private String activatorName;
-
- public String getActivatorName() {
- return activatorName;
- }
-
- /**
- * Specify the spelling of the UI activator class name.
- * @param activatorName
- */
- public void setActivatorName(String activatorName) {
- this.activatorName = activatorName;
- }
-
-}
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyXtextGeneratorNaming.java b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyXtextGeneratorNaming.java
deleted file mode 100644
index 51a7d90..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/MyXtextGeneratorNaming.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.ocl.examples.xtext.build.clones;
-/*******************************************************************************
- * Copyright (c) 2020 Willink Transformations and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * Contributors:
- * E.D.Willink - initial API and implementation
- *******************************************************************************/
-
-import org.eclipse.xtext.xtext.generator.XtextGeneratorNaming;
-import org.eclipse.xtext.xtext.generator.model.TypeReference;
-import org.eclipse.xtext.xtext.generator.model.project.IXtextProjectConfig;
-
-import com.google.inject.Inject;
-
-/**
- * This override supports the specifocation of an activatorName to fix Bug 564238
- */
-@SuppressWarnings("restriction")
-public class MyXtextGeneratorNaming extends XtextGeneratorNaming
-{
- @Inject
- private IXtextProjectConfig projectConfig;
-
- public MyXtextGeneratorNaming() {
- super();
- }
-
- @Override
- public TypeReference getEclipsePluginActivator() {
- String pluginName = projectConfig.getEclipsePlugin().getName();
- if (pluginName == null) {
- return null;
- }
- String activatorName = pluginName.replaceAll("\\.ui$", "");
-// activatorName = StringExtensions.toFirstUpper(activatorName.substring(activatorName.lastIndexOf('.') + 1))
-// + "Activator";
- activatorName = ((MyStandardProjectConfig)projectConfig).getActivatorName();
- return new TypeReference(pluginName + ".internal", activatorName);
- }
-
-}
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/readme.txt b/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/readme.txt
deleted file mode 100644
index b87284a..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/src/org/eclipse/ocl/examples/xtext/build/clones/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Files in the package are cloned from mainstream OCL plugins to support isolation for the Bug 567383 contribution to Xtext.
\ No newline at end of file
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/xtend-gen/.gitignore b/examples/org.eclipse.ocl.examples.xtext.build/xtend-gen/.gitignore
deleted file mode 100644
index de0c4eb..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/xtend-gen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.xtendbin
diff --git a/examples/org.eclipse.ocl.examples.xtext.build/xtend-gen/org/eclipse/ocl/examples/xtext/build/fragments/.gitignore b/examples/org.eclipse.ocl.examples.xtext.build/xtend-gen/org/eclipse/ocl/examples/xtext/build/fragments/.gitignore
deleted file mode 100644
index 270380d..0000000
--- a/examples/org.eclipse.ocl.examples.xtext.build/xtend-gen/org/eclipse/ocl/examples/xtext/build/fragments/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/*.java._trace
-/DeclarativeFormatterFragmentXtend.java
-/DeclarativeSerializerFragmentXtend.java
-/.DeclarativeFormatterFragmentXtend.xtendbin
-/.DeclarativeSerializerFragmentXtend.xtendbin
diff --git a/examples/org.eclipse.ocl.examples.xtext.idioms/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.idioms/META-INF/MANIFEST.MF
index 8f03d0e..f439af1 100644
--- a/examples/org.eclipse.ocl.examples.xtext.idioms/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.idioms/META-INF/MANIFEST.MF
@@ -25,6 +25,7 @@
org.eclipse.xtext.util;bundle-version="[2.9.0,3.0.0)",
org.eclipse.ocl.examples.xtext.serializer,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.ocl.xtext.base
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.ocl.examples.xtext.idioms
diff --git a/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/AbstractIdiomsRuntimeModule.java b/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/AbstractIdiomsRuntimeModule.java
index d4932e6..f002e58 100644
--- a/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/AbstractIdiomsRuntimeModule.java
+++ b/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/AbstractIdiomsRuntimeModule.java
@@ -90,17 +90,17 @@
return IdiomsGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return IdiomsSerializationMetaData.Provider.class;
}
diff --git a/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/parser/antlr/internal/InternalIdiomsParser.java b/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/parser/antlr/internal/InternalIdiomsParser.java
index 4f67691..c0ca372 100644
--- a/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/parser/antlr/internal/InternalIdiomsParser.java
+++ b/examples/org.eclipse.ocl.examples.xtext.idioms/src-gen/org/eclipse/ocl/examples/xtext/idioms/parser/antlr/internal/InternalIdiomsParser.java
@@ -32,7 +32,7 @@
* E.D.Willink - initial API and implementation
*******************************************************************************/
@SuppressWarnings("all")
-public class InternalIdiomsParser extends org.eclipse.ocl.examples.xtext.idioms.CompatibilityAbstractInternalAntlrParser {
+public class InternalIdiomsParser extends org.eclipse.ocl.xtext.base.utilities.CompatibilityAbstractInternalAntlrParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'model'", "'.'", "'import'", "'as'", "';'", "'with'", "'locator'", "'any-assignment'", "'any-element'", "'assignment'", "'::'", "'final'", "'returns'", "'segment'", "'custom'", "'half-new-line'", "'new-line'", "'no-space'", "'pop'", "'post-comment'", "'pre-comment'", "'push'", "'soft-new-line'", "'soft-space'", "'string'", "'printable'", "'value'", "'wrap-anchor'", "'wrap-begin-all'", "'wrap-begin-some'", "'wrap-end'", "'wrap-here'", "'mixin'", "'idiom'", "'for'", "'in'", "'{'", "'}'", "'at'", "'all'", "'each'", "'do'"
};
diff --git a/examples/pom.xml b/examples/pom.xml
index 9671a6c..956798a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -38,7 +38,6 @@
<module>org.eclipse.ocl.examples.unified</module>
<module>org.eclipse.ocl.examples.validity</module>
<module>org.eclipse.ocl.examples.xtext.console</module>
- <module>org.eclipse.ocl.examples.xtext.build</module>
<module>org.eclipse.ocl.examples.xtext.idioms</module>
<module>org.eclipse.ocl.examples.xtext.idioms.ui</module>
<module>org.eclipse.ocl.examples.xtext.serializer</module>
diff --git a/features/org.eclipse.ocl.build-feature/feature.xml b/features/org.eclipse.ocl.build-feature/feature.xml
index 489aea4..7ecbea0 100644
--- a/features/org.eclipse.ocl.build-feature/feature.xml
+++ b/features/org.eclipse.ocl.build-feature/feature.xml
@@ -27,11 +27,4 @@
version="0.0.0"
unpack="false"/-->
- <plugin
- id="org.eclipse.ocl.examples.xtext.build"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
diff --git a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java
index 51af670..398a653 100644
--- a/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.base/src-gen/org/eclipse/ocl/xtext/base/AbstractBaseRuntimeModule.java
@@ -91,17 +91,17 @@
return BaseGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return BaseSerializationMetaData.Provider.class;
}
diff --git a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java
index 53b9b73..aaf17c6 100644
--- a/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.completeocl/src-gen/org/eclipse/ocl/xtext/completeocl/AbstractCompleteOCLRuntimeModule.java
@@ -115,17 +115,17 @@
return CompleteOCLGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return CompleteOCLSerializationMetaData.Provider.class;
}
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java
index f6f52df..2f8c479 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src-gen/org/eclipse/ocl/xtext/essentialocl/AbstractEssentialOCLRuntimeModule.java
@@ -115,17 +115,17 @@
return EssentialOCLGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return EssentialOCLSerializationMetaData.Provider.class;
}
diff --git a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java
index dd4da5a..8976240 100644
--- a/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.markup/src-gen/org/eclipse/ocl/xtext/markup/AbstractMarkupRuntimeModule.java
@@ -91,17 +91,17 @@
return MarkupGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return MarkupSerializationMetaData.Provider.class;
}
diff --git a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java
index 41c8f2a..0b465bc 100644
--- a/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclinecore/src-gen/org/eclipse/ocl/xtext/oclinecore/AbstractOCLinEcoreRuntimeModule.java
@@ -115,17 +115,17 @@
return OCLinEcoreGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return OCLinEcoreSerializationMetaData.Provider.class;
}
diff --git a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java
index 38c2414..14b32fa 100644
--- a/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java
+++ b/plugins/org.eclipse.ocl.xtext.oclstdlib/src-gen/org/eclipse/ocl/xtext/oclstdlib/AbstractOCLstdlibRuntimeModule.java
@@ -115,17 +115,17 @@
return OCLstdlibGrammarAccess.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends INodeModelFormatter> bindINodeModelFormatter() {
return DeclarativeFormatter.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends ISerializer> bindISerializer() {
return DeclarativeSerializer.class;
}
- // contributed by org.eclipse.ocl.examples.xtext.build.fragments.DeclarativeSerializerFragment
+ // contributed by org.eclipse.ocl.examples.build.fragments.DeclarativeSerializerFragment
public Class<? extends SerializationMetaData.Provider> bindSerializationMetaData$Provider() {
return OCLstdlibSerializationMetaData.Provider.class;
}
