7 files changed, 23 insertions, 48 deletions

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);