From 1942180d760110c2b9664715bf8e30efec256954 Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Sun, 17 Feb 2019 15:11:07 -0500 Subject: Commit before merge --- .../standalone/test/TestExecutionICSE.xtend | 22 ++++++++++++++++++++++ .../standalone/test/filesystem/FileSystem.java | 1 - .../test/filesystem/impl/FileSystemImpl.java | 19 ++++++------------- .../filesystem/impl/filesystemPackageImpl.java | 18 ------------------ 4 files changed, 28 insertions(+), 32 deletions(-) create mode 100644 Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/TestExecutionICSE.xtend (limited to 'Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill') diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/TestExecutionICSE.xtend b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/TestExecutionICSE.xtend new file mode 100644 index 00000000..41bb763d --- /dev/null +++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/TestExecutionICSE.xtend @@ -0,0 +1,22 @@ +package ca.mcgill.ecse.dslreasoner.standalone.test + +import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor + +class TestExecutionICSE { + def static void main(String[] args) { + val fileSystemPath = "configs/fileSystem.vsconfig"; + val ecorePath = "configs/ecore.vsconfig"; + val yakinduPath = "configs/yakindu.vsconfig"; + val famPath = "configs/fam.vsconfig"; +// val yakinduWithWFPath = "configs/yakinduWF.vsconfig"; +// val famWithWFPath = "configs/famWF.vsconfig"; + val exp1 = StandaloneScriptExecutor.executeScript(fileSystemPath); + println(exp1) +// val exp2 = StandaloneScriptExecutor.executeScript(ecorePath); +// println(exp2) + val exp3 = StandaloneScriptExecutor.executeScript(yakinduPath); + println(exp3) + val exp4 = StandaloneScriptExecutor.executeScript(famPath); + println(exp4) + } +} \ No newline at end of file diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/FileSystem.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/FileSystem.java index c1c75043..d8ca61ea 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/FileSystem.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/FileSystem.java @@ -62,7 +62,6 @@ public interface FileSystem extends EObject { * @return the value of the 'Live' reference list. * @see ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage#getFileSystem_Live() * @model transient="true" changeable="false" volatile="true" derived="true" - * annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live'" * @generated */ EList getLive(); diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/FileSystemImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/FileSystemImpl.java index 8bbc6a74..b5ef2b66 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/FileSystemImpl.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/FileSystemImpl.java @@ -13,7 +13,6 @@ import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; @@ -44,16 +43,6 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File */ protected Dir root; - /** - * The cached setting delegate for the '{@link #getLive() Live}' reference list. - * - * - * @see #getLive() - * @generated - * @ordered - */ - protected EStructuralFeature.Internal.SettingDelegate LIVE__ESETTING_DELEGATE = ((EStructuralFeature.Internal)filesystemPackage.Literals.FILE_SYSTEM__LIVE).getSettingDelegate(); - /** * * @@ -123,7 +112,11 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File */ @SuppressWarnings("unchecked") public EList getLive() { - return (EList)LIVE__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false); + // TODO: implement this method to return the 'Live' reference list + // Ensure that you remove @generated or mark it @generated NOT + // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting + // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. + throw new UnsupportedOperationException(); } /** @@ -197,7 +190,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File case filesystemPackage.FILE_SYSTEM__ROOT: return root != null; case filesystemPackage.FILE_SYSTEM__LIVE: - return LIVE__ESETTING_DELEGATE.dynamicIsSet(this, null, 0); + return !getLive().isEmpty(); } return super.eIsSet(featureID); } diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/filesystemPackageImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/filesystemPackageImpl.java index 5c6dd21e..5bd41020 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/filesystemPackageImpl.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/filesystem/impl/filesystemPackageImpl.java @@ -317,8 +317,6 @@ public class filesystemPackageImpl extends EPackageImpl implements filesystemPac // Create annotations // http://www.eclipse.org/emf/2002/Ecore createEcoreAnnotations(); - // org.eclipse.viatra.query.querybasedfeature - createOrgAnnotations(); } /** @@ -337,20 +335,4 @@ public class filesystemPackageImpl extends EPackageImpl implements filesystemPac }); } - /** - * Initializes the annotations for org.eclipse.viatra.query.querybasedfeature. - * - * - * @generated - */ - protected void createOrgAnnotations() { - String source = "org.eclipse.viatra.query.querybasedfeature"; - addAnnotation - (getFileSystem_Live(), - source, - new String[] { - "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live" - }); - } - } //filesystemPackageImpl -- cgit v1.2.3-54-g00ecf