19 files changed, 112 insertions, 143 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath
index 7f459bda..3b808ec0 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath
@@ -1,13 +1,10 @@
-<?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">
-                <attributes>
-                        <attribute name="module" value="true"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-        <classpathentry kind="src" path="src"/>
-        <classpathentry kind="src" path="patterns"/>
-        <classpathentry kind="src" path="src-gen"/>
-        <classpathentry kind="output" path="bin"/>
-</classpath>
+<?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="src" path="patterns"/>

+        <classpathentry kind="src" path="src-gen/"/>

+        <classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
index d5f7db65..5fb85170 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.domains.alloyexamples,
  hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem,
  hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.impl,
- hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.util
+ hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.util,
+ hu.bme.mit.inf.dslreasoner.domains.alloyexamples.util
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
  org.eclipse.viatra.query.runtime,
  org.eclipse.core.runtime,
@@ -19,7 +20,6 @@ Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro
-Import-Package: org.apache.log4j
-Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.domains.alloyexamples
-Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Import-Package: org.apache.log4j
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties
index 418a7a43..a9ab8b56 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties
@@ -5,6 +5,5 @@ bin.includes = .,\
                plugin.properties

 jars.compile.order = .

 source.. = src/,\

-           src-gen/,\

-           patterns/

+           src-gen/

 output.. = bin/

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore
index 32874953..87ba7135 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore
@@ -5,7 +5,7 @@
     <details key="settingDelegates" value="org.eclipse.viatra.query.querybasedfeature"/>
   </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="FileSystem">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//FSObject"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//Dir"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="live" upperBound="-1" eType="#//FSObject"
         changeable="false" volatile="true" transient="true" derived="true">
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel
index daa44727..355ac109 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel
@@ -11,13 +11,13 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//FileSystem/root"/>

       <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference FileSytem.ecore#//FileSystem/live"/>

     </genClasses>

-    <genClasses image="false" ecoreClass="FileSytem.ecore#//FSObject">

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FileSytem.ecore#//FSObject/parent"/>

-    </genClasses>

+    <genClasses image="false" ecoreClass="FileSytem.ecore#//FSObject"/>

     <genClasses ecoreClass="FileSytem.ecore#//Dir">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//Dir/contents"/>

     </genClasses>

-    <genClasses ecoreClass="FileSytem.ecore#//File"/>

+    <genClasses ecoreClass="FileSytem.ecore#//File">

+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FileSytem.ecore#//File/parent"/>

+    </genClasses>

     <genClasses ecoreClass="FileSytem.ecore#//Model">

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//Model/filesystems"/>

       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//Model/otherFSObjects"/>

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
index 16c24d05..78525a35 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
@@ -11,16 +11,6 @@ pattern loopInInheritence(a: EClass) {
         find directSupertype+(a,a);

 }

 

-pattern unsat_subpackage(a: EPackage, b: EPackage) {

-        EPackage.eSubpackages(a, b);

-}

-

-@Constraint(key={p}, severity="error", message="error")

-pattern unsat_loopInInheritance(p: EPackage) {

-        neg find unsat_subpackage(_, p);

-        neg find loopInInheritence(_);

-}

-

 pattern opposite(a:EReference, b: EReference) {

         EReference.eOpposite(a,b);

 }

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
index c785c2fc..719a9d96 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
@@ -2,7 +2,7 @@ package hu.bme.mit.inf.dslreasoner.domains.alloyexamples
 

 import epackage "FS"

 

-pattern patternContent(o1: Dir, o2: FSObject) {

+pattern patternContent(o1: FSObject, o2: FSObject) {

         Dir.contents(o1,o2);

 }

 

@@ -22,13 +22,3 @@ pattern contentInNotLive(parent : Dir, child: FSObject) {
         Dir.contents(parent,child);

         neg find live(_,child);

 }

-

-pattern dir(d: Dir) {

-        Dir(d);

-}

-

-@Constraint(key={fs}, severity="error", message="error")

-pattern rootIsNotDir(fs: FileSystem) {

-        FileSystem.root(fs, root);

-        neg find dir(root);

-}

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
index eddd482c..d7fd112a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
@@ -11,8 +11,6 @@
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Ecore" id="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Ecore">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.directSupertype"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.loopInInheritence"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.opposite"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.oppositeDifferentClass"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.nonSymmetricOpposite"/>
@@ -23,8 +21,6 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.patternContent"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.contentInNotLive"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir"/>
     </group>
   </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index 70eab455..1e7d444f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -50,12 +50,3 @@
 /Opposite.java
 /OppositeDifferentClass.java
 /PatternContent.java
-/.Dir.java._trace
-/.RootIsNotDir.java._trace
-/Dir.java
-/RootIsNotDir.java
-/.Unsat_loopInInheritance.java._trace
-/.Subpackage.java._trace
-/.Unsat_subpackage.java._trace
-/.Unsat_subpackageOrSelf.java._trace
-/.Unsat_topLevelPackageWithLoop.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
index 178ec37d..3f2448aa 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
@@ -706,7 +706,7 @@ public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher>
           new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
           PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
           new TypeConstraint(body, Tuples.flatTupleOf(var_this, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
           new Equality(body, var__virtual_0_, var_l);
           bodies.add(body);
       }
@@ -725,7 +725,7 @@ public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher>
           new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
           PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
           new TypeConstraint(body, Tuples.flatTupleOf(var_this, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
           new Equality(body, var__virtual_0_, var_root);
           //    find patternContent+(root,l)
           new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_root, var_l), PatternContent.instance().getInternalQueryRepresentation());
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
index bd02fa5b..7c48b978 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
@@ -3,7 +3,6 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
 
-import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir;
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;
 import java.util.Arrays;
 import java.util.Collection;
@@ -44,7 +43,7 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         pattern patternContent(o1: Dir, o2: FSObject) {
+ *         pattern patternContent(o1: FSObject, o2: FSObject) {
  *              Dir.contents(o1,o2);
  *         }
  * </pre></code>
@@ -68,13 +67,13 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private Dir fO1;
+    private FSObject fO1;
     
     private FSObject fO2;
     
     private static List<String> parameterNames = makeImmutableList("o1", "o2");
     
-    private Match(final Dir pO1, final FSObject pO2) {
+    private Match(final FSObject pO1, final FSObject pO2) {
       this.fO1 = pO1;
       this.fO2 = pO2;
     }
@@ -97,7 +96,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
       }
     }
     
-    public Dir getO1() {
+    public FSObject getO1() {
       return this.fO1;
     }
     
@@ -109,7 +108,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       if ("o1".equals(parameterName) ) {
-          this.fO1 = (Dir) newValue;
+          this.fO1 = (FSObject) newValue;
           return true;
       }
       if ("o2".equals(parameterName) ) {
@@ -119,7 +118,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
       return false;
     }
     
-    public void setO1(final Dir pO1) {
+    public void setO1(final FSObject pO1) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fO1 = pO1;
     }
@@ -207,7 +206,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static PatternContent.Match newMutableMatch(final Dir pO1, final FSObject pO2) {
+    public static PatternContent.Match newMutableMatch(final FSObject pO1, final FSObject pO2) {
       return new Mutable(pO1, pO2);
     }
     
@@ -220,12 +219,12 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the (partial) match object.
      * 
      */
-    public static PatternContent.Match newMatch(final Dir pO1, final FSObject pO2) {
+    public static PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
       return new Immutable(pO1, pO2);
     }
     
     private static final class Mutable extends PatternContent.Match {
-      Mutable(final Dir pO1, final FSObject pO2) {
+      Mutable(final FSObject pO1, final FSObject pO2) {
         super(pO1, pO2);
       }
       
@@ -236,7 +235,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     }
     
     private static final class Immutable extends PatternContent.Match {
-      Immutable(final Dir pO1, final FSObject pO2) {
+      Immutable(final FSObject pO1, final FSObject pO2) {
         super(pO1, pO2);
       }
       
@@ -258,7 +257,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
    * 
    * <p>Original source:
    * <code><pre>
-   * pattern patternContent(o1: Dir, o2: FSObject) {
+   * pattern patternContent(o1: FSObject, o2: FSObject) {
    *    Dir.contents(o1,o2);
    * }
    * </pre></code>
@@ -320,7 +319,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<PatternContent.Match> getAllMatches(final Dir pO1, final FSObject pO2) {
+    public Collection<PatternContent.Match> getAllMatches(final FSObject pO1, final FSObject pO2) {
       return rawStreamAllMatches(new Object[]{pO1, pO2}).collect(Collectors.toSet());
     }
     
@@ -335,7 +334,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<PatternContent.Match> streamAllMatches(final Dir pO1, final FSObject pO2) {
+    public Stream<PatternContent.Match> streamAllMatches(final FSObject pO1, final FSObject pO2) {
       return rawStreamAllMatches(new Object[]{pO1, pO2});
     }
     
@@ -347,7 +346,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<PatternContent.Match> getOneArbitraryMatch(final Dir pO1, final FSObject pO2) {
+    public Optional<PatternContent.Match> getOneArbitraryMatch(final FSObject pO1, final FSObject pO2) {
       return rawGetOneArbitraryMatch(new Object[]{pO1, pO2});
     }
     
@@ -359,7 +358,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final Dir pO1, final FSObject pO2) {
+    public boolean hasMatch(final FSObject pO1, final FSObject pO2) {
       return rawHasMatch(new Object[]{pO1, pO2});
     }
     
@@ -370,7 +369,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final Dir pO1, final FSObject pO2) {
+    public int countMatches(final FSObject pO1, final FSObject pO2) {
       return rawCountMatches(new Object[]{pO1, pO2});
     }
     
@@ -383,7 +382,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final Dir pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
+    public boolean forOneArbitraryMatch(final FSObject pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pO1, pO2}, processor);
     }
     
@@ -396,7 +395,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the (partial) match object.
      * 
      */
-    public PatternContent.Match newMatch(final Dir pO1, final FSObject pO2) {
+    public PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
       return PatternContent.Match.newMatch(pO1, pO2);
     }
     
@@ -405,8 +404,8 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<Dir> rawStreamAllValuesOfo1(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_O1, parameters).map(Dir.class::cast);
+    protected Stream<FSObject> rawStreamAllValuesOfo1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_O1, parameters).map(FSObject.class::cast);
     }
     
     /**
@@ -414,7 +413,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Dir> getAllValuesOfo1() {
+    public Set<FSObject> getAllValuesOfo1() {
       return rawStreamAllValuesOfo1(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -423,7 +422,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<Dir> streamAllValuesOfo1() {
+    public Stream<FSObject> streamAllValuesOfo1() {
       return rawStreamAllValuesOfo1(emptyArray());
     }
     
@@ -437,7 +436,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<Dir> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
+    public Stream<FSObject> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
       return rawStreamAllValuesOfo1(partialMatch.toArray());
     }
     
@@ -451,7 +450,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<Dir> streamAllValuesOfo1(final FSObject pO2) {
+    public Stream<FSObject> streamAllValuesOfo1(final FSObject pO2) {
       return rawStreamAllValuesOfo1(new Object[]{null, pO2});
     }
     
@@ -460,7 +459,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Dir> getAllValuesOfo1(final PatternContent.Match partialMatch) {
+    public Set<FSObject> getAllValuesOfo1(final PatternContent.Match partialMatch) {
       return rawStreamAllValuesOfo1(partialMatch.toArray()).collect(Collectors.toSet());
     }
     
@@ -469,7 +468,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Dir> getAllValuesOfo1(final FSObject pO2) {
+    public Set<FSObject> getAllValuesOfo1(final FSObject pO2) {
       return rawStreamAllValuesOfo1(new Object[]{null, pO2}).collect(Collectors.toSet());
     }
     
@@ -524,7 +523,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<FSObject> streamAllValuesOfo2(final Dir pO1) {
+    public Stream<FSObject> streamAllValuesOfo2(final FSObject pO1) {
       return rawStreamAllValuesOfo2(new Object[]{pO1, null});
     }
     
@@ -542,14 +541,14 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<FSObject> getAllValuesOfo2(final Dir pO1) {
+    public Set<FSObject> getAllValuesOfo2(final FSObject pO1) {
       return rawStreamAllValuesOfo2(new Object[]{pO1, null}).collect(Collectors.toSet());
     }
     
     @Override
     protected PatternContent.Match tupleToMatch(final Tuple t) {
       try {
-          return PatternContent.Match.newMatch((Dir) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
+          return PatternContent.Match.newMatch((FSObject) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -559,7 +558,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     @Override
     protected PatternContent.Match arrayToMatch(final Object[] match) {
       try {
-          return PatternContent.Match.newMatch((Dir) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+          return PatternContent.Match.newMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -569,7 +568,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     @Override
     protected PatternContent.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return PatternContent.Match.newMutableMatch((Dir) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+          return PatternContent.Match.newMutableMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -620,7 +619,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
   
   @Override
   public PatternContent.Match newMatch(final Object... parameters) {
-    return PatternContent.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
+    return PatternContent.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
   }
   
   /**
@@ -652,7 +651,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final PatternContent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_o1 = new PParameter("o1", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "Dir")), PParameterDirection.INOUT);
+    private final PParameter parameter_o1 = new PParameter("o1", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
     
     private final PParameter parameter_o2 = new PParameter("o2", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
     
@@ -685,7 +684,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
           PBody body = new PBody(this);
           PVariable var_o1 = body.getOrCreateVariableByName("o1");
           PVariable var_o2 = body.getOrCreateVariableByName("o2");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           new TypeConstraint(body, Tuples.flatTupleOf(var_o2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_o1, parameter_o1),
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore
new file mode 100644
index 00000000..4b17cd82
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore
@@ -0,0 +1,32 @@
+/.ContentInNotLiveProcessor.java._trace
+/.ContentInNotLiveQuerySpecification.java._trace
+/.DirectSupertypeProcessor.java._trace
+/.DirectSupertypeQuerySpecification.java._trace
+/.LiveProcessor.java._trace
+/.LiveQuerySpecification.java._trace
+/.LoopInInheritenceProcessor.java._trace
+/.LoopInInheritenceQuerySpecification.java._trace
+/.NonSymmetricOppositeProcessor.java._trace
+/.NonSymmetricOppositeQuerySpecification.java._trace
+/.OppositeDifferentClassProcessor.java._trace
+/.OppositeDifferentClassQuerySpecification.java._trace
+/.OppositeProcessor.java._trace
+/.OppositeQuerySpecification.java._trace
+/.PatternContentProcessor.java._trace
+/.PatternContentQuerySpecification.java._trace
+/ContentInNotLiveProcessor.java
+/ContentInNotLiveQuerySpecification.java
+/DirectSupertypeProcessor.java
+/DirectSupertypeQuerySpecification.java
+/LiveProcessor.java
+/LiveQuerySpecification.java
+/LoopInInheritenceProcessor.java
+/LoopInInheritenceQuerySpecification.java
+/NonSymmetricOppositeProcessor.java
+/NonSymmetricOppositeQuerySpecification.java
+/OppositeDifferentClassProcessor.java
+/OppositeDifferentClassQuerySpecification.java
+/OppositeProcessor.java
+/OppositeQuerySpecification.java
+/PatternContentProcessor.java
+/PatternContentQuerySpecification.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java
index f0066955..1896e31e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java
@@ -33,12 +33,12 @@ public interface FileSystem extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Root</em>' containment reference.

-         * @see #setRoot(FSObject)

+         * @see #setRoot(Dir)

          * @see hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FilesystemPackage#getFileSystem_Root()

          * @model containment="true" required="true"

          * @generated

          */

-        FSObject getRoot();

+        Dir getRoot();

 

         /**

          * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem#getRoot <em>Root</em>}' containment reference.

@@ -48,7 +48,7 @@ public interface FileSystem extends EObject {
          * @see #getRoot()

          * @generated

          */

-        void setRoot(FSObject value);

+        void setRoot(Dir value);

 

         /**

          * Returns the value of the '<em><b>Live</b></em>' reference list.

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java
index c2d417d2..62df04af 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java
@@ -66,7 +66,6 @@ public class DirImpl extends FSObjectImpl implements Dir {
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EList<FSObject> getContents() {

                 if (contents == null) {

                         contents = new EObjectContainmentWithInverseEList<FSObject>(FSObject.class, this, FilesystemPackage.DIR__CONTENTS, FilesystemPackage.FS_OBJECT__PARENT);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java
index d87935d6..c8e73b4e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java
@@ -53,7 +53,6 @@ public abstract class FSObjectImpl extends MinimalEObjectImpl.Container implemen
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public Dir getParent() {

                 if (eContainerFeatureID() != FilesystemPackage.FS_OBJECT__PARENT) return null;

                 return (Dir)eInternalContainer();

@@ -74,7 +73,6 @@ public abstract class FSObjectImpl extends MinimalEObjectImpl.Container implemen
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public void setParent(Dir newParent) {

                 if (newParent != eInternalContainer() || (eContainerFeatureID() != FilesystemPackage.FS_OBJECT__PARENT && newParent != null)) {

                         if (EcoreUtil.isAncestor(this, newParent))

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java
index e6859cab..adf30f3a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java
@@ -2,6 +2,7 @@
  */

 package hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.impl;

 

+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir;

 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;

 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem;

 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FilesystemPackage;

@@ -41,7 +42,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
          * @generated

          * @ordered

          */

-        protected FSObject root;

+        protected Dir root;

 

         /**

          * The cached setting delegate for the '{@link #getLive() <em>Live</em>}' reference list.

@@ -77,8 +78,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

-        public FSObject getRoot() {

+        public Dir getRoot() {

                 return root;

         }

 

@@ -87,8 +87,8 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetRoot(FSObject newRoot, NotificationChain msgs) {

-                FSObject oldRoot = root;

+        public NotificationChain basicSetRoot(Dir newRoot, NotificationChain msgs) {

+                Dir oldRoot = root;

                 root = newRoot;

                 if (eNotificationRequired()) {

                         ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FilesystemPackage.FILE_SYSTEM__ROOT, oldRoot, newRoot);

@@ -102,8 +102,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

-        public void setRoot(FSObject newRoot) {

+        public void setRoot(Dir newRoot) {

                 if (newRoot != root) {

                         NotificationChain msgs = null;

                         if (root != null)

@@ -123,7 +122,6 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
          * @generated

          */

         @SuppressWarnings("unchecked")

-        @Override

         public EList<FSObject> getLive() {

                 return (EList<FSObject>)LIVE__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);

         }

@@ -167,7 +165,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

                         case FilesystemPackage.FILE_SYSTEM__ROOT:

-                                setRoot((FSObject)newValue);

+                                setRoot((Dir)newValue);

                                 return;

                 }

                 super.eSet(featureID, newValue);

@@ -182,7 +180,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
         public void eUnset(int featureID) {

                 switch (featureID) {

                         case FilesystemPackage.FILE_SYSTEM__ROOT:

-                                setRoot((FSObject)null);

+                                setRoot((Dir)null);

                                 return;

                 }

                 super.eUnset(featureID);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java
index b4b09e15..e40b0bd1 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java
@@ -70,7 +70,6 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public FileSystem createFileSystem() {

                 FileSystemImpl fileSystem = new FileSystemImpl();

                 return fileSystem;

@@ -81,7 +80,6 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public Dir createDir() {

                 DirImpl dir = new DirImpl();

                 return dir;

@@ -92,7 +90,6 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public File createFile() {

                 FileImpl file = new FileImpl();

                 return file;

@@ -103,7 +100,6 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public Model createModel() {

                 ModelImpl model = new ModelImpl();

                 return model;

@@ -114,7 +110,6 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public FilesystemPackage getFilesystemPackage() {

                 return (FilesystemPackage)getEPackage();

         }

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java
index 4c0ca4c5..87390fee 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java
@@ -86,7 +86,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 

         /**

          * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-         *

+         * 

          * <p>This method is used to initialize {@link FilesystemPackage#eINSTANCE} when that field is accessed.

          * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

          * <!-- begin-user-doc -->

@@ -100,8 +100,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
                 if (isInited) return (FilesystemPackage)EPackage.Registry.INSTANCE.getEPackage(FilesystemPackage.eNS_URI);

 

                 // Obtain or create and register package

-                Object registeredFilesystemPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

-                FilesystemPackageImpl theFilesystemPackage = registeredFilesystemPackage instanceof FilesystemPackageImpl ? (FilesystemPackageImpl)registeredFilesystemPackage : new FilesystemPackageImpl();

+                FilesystemPackageImpl theFilesystemPackage = (FilesystemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FilesystemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FilesystemPackageImpl());

 

                 isInited = true;

 

@@ -114,6 +113,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
                 // Mark meta-data to indicate it can't be changed

                 theFilesystemPackage.freeze();

 

+  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(FilesystemPackage.eNS_URI, theFilesystemPackage);

                 return theFilesystemPackage;

@@ -124,7 +124,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EClass getFileSystem() {

                 return fileSystemEClass;

         }

@@ -134,7 +133,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EReference getFileSystem_Root() {

                 return (EReference)fileSystemEClass.getEStructuralFeatures().get(0);

         }

@@ -144,7 +142,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EReference getFileSystem_Live() {

                 return (EReference)fileSystemEClass.getEStructuralFeatures().get(1);

         }

@@ -154,7 +151,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EClass getFSObject() {

                 return fsObjectEClass;

         }

@@ -164,7 +160,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EReference getFSObject_Parent() {

                 return (EReference)fsObjectEClass.getEStructuralFeatures().get(0);

         }

@@ -174,7 +169,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EClass getDir() {

                 return dirEClass;

         }

@@ -184,7 +178,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EReference getDir_Contents() {

                 return (EReference)dirEClass.getEStructuralFeatures().get(0);

         }

@@ -194,7 +187,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EClass getFile() {

                 return fileEClass;

         }

@@ -204,7 +196,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EClass getModel() {

                 return modelEClass;

         }

@@ -214,7 +205,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EReference getModel_Filesystems() {

                 return (EReference)modelEClass.getEStructuralFeatures().get(0);

         }

@@ -224,7 +214,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EReference getModel_OtherFSObjects() {

                 return (EReference)modelEClass.getEStructuralFeatures().get(1);

         }

@@ -234,7 +223,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public FilesystemFactory getFilesystemFactory() {

                 return (FilesystemFactory)getEFactoryInstance();

         }

@@ -308,7 +296,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 

                 // Initialize classes, features, and operations; add parameters

                 initEClass(fileSystemEClass, FileSystem.class, "FileSystem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEReference(getFileSystem_Root(), this.getFSObject(), null, "root", null, 1, 1, FileSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getFileSystem_Root(), this.getDir(), null, "root", null, 1, 1, FileSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEReference(getFileSystem_Live(), this.getFSObject(), null, "live", null, 0, -1, FileSystem.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);

 

                 initEClass(fsObjectEClass, FSObject.class, "FSObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -340,12 +328,12 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * @generated

          */

         protected void createEcoreAnnotations() {

-                String source = "http://www.eclipse.org/emf/2002/Ecore";

+                String source = "http://www.eclipse.org/emf/2002/Ecore";        

                 addAnnotation

-                  (this,

-                   source,

+                  (this, 

+                   source, 

                    new String[] {

-                           "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"

+                         "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"

                    });

         }

 

@@ -356,12 +344,12 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
          * @generated

          */

         protected void createOrgAnnotations() {

-                String source = "org.eclipse.viatra.query.querybasedfeature";

+                String source = "org.eclipse.viatra.query.querybasedfeature";   

                 addAnnotation

-                  (getFileSystem_Live(),

-                   source,

+                  (getFileSystem_Live(), 

+                   source, 

                    new String[] {

-                           "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live"

+                         "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live"

                    });

         }

 

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java
index 093b9972..4c236e8e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java
@@ -82,7 +82,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public FileSystem getFilesystems() {

                 return filesystems;

         }

@@ -107,7 +106,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public void setFilesystems(FileSystem newFilesystems) {

                 if (newFilesystems != filesystems) {

                         NotificationChain msgs = null;

@@ -127,7 +125,6 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
          * <!-- end-user-doc -->

          * @generated

          */

-        @Override

         public EList<FSObject> getOtherFSObjects() {

                 if (otherFSObjects == null) {

                         otherFSObjects = new EObjectContainmentEList<FSObject>(FSObject.class, this, FilesystemPackage.MODEL__OTHER_FS_OBJECTS);