Inter model consistency

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.plcopen2caex/.project → bundles/automationml/tools.vitruv.applications.automationml.demo/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tools.vitruv.applications.plcopencaex.plcopen2caex</name>
+	<name>tools.vitruv.applications.automationml.demo</name>
 	<comment></comment>
 	<projects>
 	</projects>

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.demo/META-INF/MANIFEST.MF → bundles/automationml/tools.vitruv.applications.automationml.demo/META-INF/MANIFEST.MF

@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CreateVsumTest
-Bundle-SymbolicName: tools.vitruv.applications.plcopencaex.demo;singleton:=true
+Bundle-SymbolicName: tools.vitruv.applications.automationml.demo;singleton:=true
 Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: tools.vitruv.applications.plcopencaex.demo.Activator
+Bundle-Activator: tools.vitruv.applications.automationml.caexplcopen.demo.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.google.guava,
@@ -18,11 +18,13 @@ Require-Bundle: com.google.guava,
  tools.vitruv.framework.tuid,
  tools.vitruv.framework.metamodel,
  tools.vitruv.framework.change.processing,
- tools.vitruv.applications.plcopencaex.plcopen2caex,
  tools.vitruv.framework.vsum,
  tools.vitruv.framework.util,
  tools.vitruv.domains.plcopen,
  tools.vitruv.domains.caex,
  tools.vitruv.extensions.emf;bundle-version="0.2.0",
- tools.vitruv.testutils;bundle-version="0.2.0",
- tools.vitruv.extensions.emf.monitorededitor;bundle-version="0.2.0"
+ tools.vitruv.extensions.emf.monitorededitor;bundle-version="0.2.0",
+ tools.vitruv.applications.automationml;bundle-version="1.0.0",
+ tools.vitruv.domains.collada;bundle-version="0.3.0",
+ tools.vitruv.domains.aml;bundle-version="0.3.0",
+ tools.vitruv.testutils;bundle-version="0.3.0"

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.demo/plugin.xml → bundles/automationml/tools.vitruv.applications.automationml.demo/plugin.xml

@@ -4,7 +4,7 @@
    <extension
          point="org.eclipse.ui.handlers">
       <handler
-            class="tools.vitruv.applications.plcopencaex.demo.PLCOpenCAEXProjectAndVsumGenerationHandler"
+            class="tools.vitruv.applications.automationml.caexplcopen.demo.PLCOpenCAEXProjectAndVsumGenerationHandler"
             commandId="tools.vitruv.applications.plcopencaex.demo.PLCOpenCAEXProjectAndVsumGeneration">
       </handler>
    </extension>

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.demo/src/tools/vitruv/applications/plcopencaex/demo/Activator.java → bundles/automationml/tools.vitruv.applications.automationml.demo/src/tools/vitruv/applications/automationml/caexplcopen/demo/Activator.java

@@ -1,4 +1,4 @@
-package tools.vitruv.applications.plcopencaex.demo;
+package tools.vitruv.applications.automationml.caexplcopen.demo;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.demo/src/tools/vitruv/applications/plcopencaex/demo/PLCOpenCAEXProjectAndVsumGeneration.xtend → bundles/automationml/tools.vitruv.applications.automationml.demo/src/tools/vitruv/applications/automationml/caexplcopen/demo/PLCOpenCAEXProjectAndVsumGeneration.xtend

@@ -1,14 +1,13 @@
-package tools.vitruv.applications.plcopencaex.demo
+package tools.vitruv.applications.automationml.caexplcopen.demo
 
 import org.eclipse.core.resources.IProject
 import org.eclipse.core.runtime.CoreException
-import tools.vitruv.applications.plcopencaex.plcopen2caex.PLCOpen2CAEXChangePropagationSpecification
+import tools.vitruv.applications.automationml.caexchanges.CombinedCAEXChangePropagationSpecification
 import tools.vitruv.domains.emf.builder.VitruviusEmfBuilder
 import tools.vitruv.domains.emf.builder.VitruviusEmfBuilderApplicator
 import tools.vitruv.framework.change.processing.ChangePropagationSpecification
 import tools.vitruv.testutils.util.TestUtil
 import tools.vitruv.framework.tuid.TuidManager
-import tools.vitruv.framework.userinteraction.impl.UserInteractor
 import tools.vitruv.framework.vsum.InternalVirtualModel
 import tools.vitruv.domains.plcopen.PLCOpenDomainProvider
 import tools.vitruv.domains.plcopen.PLCOpenDomain
@@ -18,14 +17,15 @@ import tools.vitruv.framework.domains.VitruvDomain
 import tools.vitruv.framework.ui.monitorededitor.ProjectBuildUtils
 import org.eclipse.core.resources.ResourcesPlugin
 import static edu.kit.ipd.sdq.commons.util.org.eclipse.core.resources.IProjectUtil.*;
+import tools.vitruv.framework.userinteraction.UserInteractionFactory
 
 class PLCOpenCAEXProjectAndVsumGeneration {
 
-	public def void createProjectAndVsum() {
+	def void createProjectAndVsum() {
 		TuidManager.instance.reinitialize();
         val project = createTestProject("testProject");
         val virtualModel = createVirtualModel("testProjectVsum");
-        virtualModel.userInteractor = new UserInteractor();
+        virtualModel.userInteractor = UserInteractionFactory.instance.createDialogUserInteractor();
 		val VitruviusEmfBuilderApplicator emfBuilder = new VitruviusEmfBuilderApplicator();
 		emfBuilder.addToProject(project , virtualModel.folder, #[PLCOpenDomain.FILE_EXTENSION, CAEXDomain.FILE_EXTENSION]);
 		// build the project
@@ -38,7 +38,7 @@ class PLCOpenCAEXProjectAndVsumGeneration {
 		project.create(null);
     	project.open(null);
 		val virtualModel = TestUtil.createVirtualModel(project.location.toFile, false, metamodels, createChangePropagationSpecifications(),
-			new UserInteractor()
+			UserInteractionFactory.instance.createDialogUserInteractor()
 		);
 		return virtualModel;
 	}
@@ -48,7 +48,7 @@ class PLCOpenCAEXProjectAndVsumGeneration {
 	}
 
 	protected def Iterable<ChangePropagationSpecification> createChangePropagationSpecifications() {
-		return #[new PLCOpen2CAEXChangePropagationSpecification()];
+		return #[new CombinedCAEXChangePropagationSpecification];
 	}
 
 	protected def IProject createTestProject(String projectName) throws CoreException {

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.demo/src/tools/vitruv/applications/plcopencaex/demo/PLCOpenCAEXProjectAndVsumGenerationHandler.xtend → bundles/automationml/tools.vitruv.applications.automationml.demo/src/tools/vitruv/applications/automationml/caexplcopen/demo/PLCOpenCAEXProjectAndVsumGenerationHandler.xtend

@@ -1,4 +1,4 @@
-package tools.vitruv.applications.plcopencaex.demo
+package tools.vitruv.applications.automationml.caexplcopen.demo
 
 import org.eclipse.core.commands.AbstractHandler
 import org.eclipse.core.commands.ExecutionEvent

bundles/plcopencaex/tools.vitruv.applications.plcopencaex.demo/.project → bundles/automationml/tools.vitruv.applications.automationml/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tools.vitruv.applications.plcopencaex.demo</name>
+	<name>tools.vitruv.applications.automationml</name>
 	<comment></comment>
 	<projects>
 	</projects>

bundles/automationml/tools.vitruv.applications.automationml/META-INF/MANIFEST.MF

@@ -0,0 +1,35 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: AutomationMLReactions
+Bundle-SymbolicName: tools.vitruv.applications.automationml
+Bundle-Version: 1.0.0.qualifier
+Require-Bundle: org.apache.log4j,
+ com.google.guava,
+ org.eclipse.emf.ecore,
+ org.eclipse.core.resources,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ tools.vitruv.framework.util,
+ tools.vitruv.framework.change,
+ tools.vitruv.framework.change.processing,
+ tools.vitruv.framework.correspondence,
+ tools.vitruv.framework.userinteraction,
+ tools.vitruv.extensions.dslsruntime.reactions,
+ org.plcopen.xml.tc60201,
+ tools.vitruv.domains.plcopen,
+ tools.vitruv.domains.caex,
+ tools.vitruv.dsls.mappings;bundle-version="0.2.0",
+ tools.vitruv.extensions.dslsruntime.mappings,
+ org.eclipse.xtext;bundle-version="2.12.0",
+ tools.vitruv.applications.automationml.utils;bundle-version="1.0.0",
+ caex.caex30;bundle-version="0.1.0",
+ edu.kit.sdq.aml_aggregator;bundle-version="0.1.0",
+ org.khronos.collada;bundle-version="1.0.0",
+ tools.vitruv.domains.collada;bundle-version="0.3.0",
+ tools.vitruv.domains.aml;bundle-version="0.3.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: tools.vitruv.applications.automationml.aggregatorchanges,
+ tools.vitruv.applications.automationml.attributechanges,
+ tools.vitruv.applications.automationml.caexchanges,
+ tools.vitruv.applications.automationml.colladachanges,
+ tools.vitruv.applications.automationml.plcopenchanges

bundles/automationml/tools.vitruv.applications.automationml/src/tools/vitruv/applications/automationml/aggregatorchanges/AggregatorPathChanges.reactions

@@ -0,0 +1,75 @@
+import caex.caex30.caex.ExternalInterface
+import tools.vitruv.applications.automationml.utils.aml.CAEXUtils
+import org.eclipse.xtext.EcoreUtil2
+import org.plcopen.xml.tc60201.PouType1
+import org.khronos.collada.SceneType
+import tools.vitruv.applications.automationml.utils.aml.AMLTags
+
+import "http://www.plcopen.org/xml/tc6_0201" as plcopen
+import "http://www.dke.de/CAEX/300" as caex
+import "http://edu.kit.ipd.sdq.aml" as aml
+import "http://www.collada.org/2005/11/COLLADASchema" as collada
+
+reactions: aggregatorPathChanges
+in reaction to changes in AML
+execute actions in AML
+
+/**
+ * reaction for changing the path to a collada file
+ */
+reaction ChangePathForCollada {
+	after attribute replaced at aml::ColladaContainer[path]
+	call {
+		logger.debug("Reaction ChangePathForCollada")
+
+		changePathInColladaInterfaces(affectedEObject)
+	}
+}
+
+/**
+ * reaction for changing the path to a plcopen file
+ */
+reaction ChangePathForPlcopen {
+	after attribute replaced at aml::PLCopenContainer[path]
+	call {
+		logger.debug("Reaction ChangePathForPLCopen")
+
+		changePathInPlcopenInterfaces(affectedEObject)
+	}
+}
+
+/**
+ * routine to change the path to a collada file in ExternalInterfaces
+ */
+routine changePathInColladaInterfaces (aml::ColladaContainer container) {
+	match {
+		val colladaType = retrieve collada::COLLADAType corresponding to container tagged with AMLTags.AML_COLLADA
+		val externalInterfaces = retrieve many caex::ExternalInterface corresponding to EcoreUtil2.getAllContentsOfType(colladaType, SceneType).get(0) tagged with AMLTags.INTERFACE_SCENE
+	}
+	action {
+		execute {
+			for (ExternalInterface currInterface : externalInterfaces) {
+				val currAttribute = CAEXUtils.getAttributeInExternalInterface(currInterface, "refUri")
+				currAttribute.value = container.path
+			}
+		}
+	}
+}
+
+/**
+ * routine to change the path to a plcopen file in ExternalInterfaces
+ */
+routine changePathInPlcopenInterfaces (aml::PLCopenContainer container) {
+	match {
+		val projectType = retrieve plcopen::ProjectType corresponding to container tagged with AMLTags.AML_PLCOPEN
+		val externalInterfaces = retrieve many caex::ExternalInterface corresponding to EcoreUtil2.getAllContentsOfType(projectType, PouType1).get(0) tagged with AMLTags.INTERFACE_POU
+	}
+	action {
+		execute {
+			for (ExternalInterface currInterface : externalInterfaces) {
+				val currAttribute = CAEXUtils.getAttributeInExternalInterface(currInterface, "refUri")
+				currAttribute.value = container.path
+			}
+		}
+	}
+}

bundles/automationml/tools.vitruv.applications.automationml/src/tools/vitruv/applications/automationml/aggregatorchanges/AggregatorRoutinesForCollada.reactions

@@ -0,0 +1,53 @@
+import org.eclipse.xtext.EcoreUtil2
+import caex.caex30.caex.ExternalInterface
+import tools.vitruv.applications.automationml.utils.aml.CAEXUtils
+import org.khronos.collada.SceneType
+import tools.vitruv.applications.automationml.utils.aml.AMLTags
+import tools.vitruv.applications.automationml.utils.aml.AggregatorUtils
+
+import "http://www.plcopen.org/xml/tc6_0201" as plcopen
+import "http://www.dke.de/CAEX/300" as caex
+import "http://edu.kit.ipd.sdq.aml" as aml
+import "http://www.collada.org/2005/11/COLLADASchema" as collada
+
+reactions: aggregatorToCollada
+in reaction to changes in AML
+execute actions in AML
+
+/**
+ * routine to create a new collada file with its basic structure
+ */
+routine createColladaFile(aml::ColladaContainer container) {
+	action {
+		val visualSceneInstance = create collada::InstanceWithExtra
+		val scene = create collada::SceneType and initialize {
+			scene.instanceVisualScene = visualSceneInstance
+		}
+		val colladaType = create collada::COLLADAType and initialize {
+			colladaType.scene = scene
+		}
+		add correspondence between colladaType and container tagged with AMLTags.AML_COLLADA
+		execute {
+			val colladaNumber = AggregatorUtils.newNumberOfColladaFiles
+			persistProjectRelative(container, colladaType, "../../../../../Desktop/resources-gen/collada" + colladaNumber + ".dae")
+		}
+	}
+}
+
+/**
+ * routine to delete collada file and set references to deleted file to an empty string
+ */
+routine deleteColladaFile(aml::ColladaContainer container) {
+	match {
+		val colladaType = retrieve collada::COLLADAType corresponding to container tagged with AMLTags.AML_COLLADA
+		val externalInterfaces = retrieve many caex::ExternalInterface corresponding to EcoreUtil2.getAllContentsOfType(colladaType, SceneType).get(0) tagged with AMLTags.INTERFACE_SCENE
+	}
+	action {
+		execute {
+			for(ExternalInterface currInterface : externalInterfaces) {
+				CAEXUtils.getAttributeInExternalInterface(currInterface, "refUri").value = ""
+			}
+		}
+		delete colladaType
+	}
+}

bundles/automationml/tools.vitruv.applications.automationml/src/tools/vitruv/applications/automationml/aggregatorchanges/AggregatorRoutinesForPLCopen.reactions

@@ -0,0 +1,56 @@
+import org.eclipse.xtext.EcoreUtil2
+import org.plcopen.xml.tc60201.PouType1
+import caex.caex30.caex.ExternalInterface
+import tools.vitruv.applications.automationml.utils.aml.CAEXUtils
+import tools.vitruv.applications.automationml.utils.aml.AMLTags
+import tools.vitruv.applications.automationml.utils.aml.AggregatorUtils
+
+import "http://www.plcopen.org/xml/tc6_0201" as plcopen
+import "http://www.dke.de/CAEX/300" as caex
+import "http://edu.kit.ipd.sdq.aml" as aml
+import "http://www.collada.org/2005/11/COLLADASchema" as collada
+
+reactions: aggregatorToPlcopen
+in reaction to changes in AML
+execute actions in AML
+
+/**
+ * routine to create a new plcopen file with its basic structure
+ */
+routine createPLCopenFile(aml::PLCopenContainer container) {
+	action {
+		val pouType = create plcopen::PouType1
+		val pousType = create plcopen::PousType and initialize {
+			pousType.pou += pouType
+		}
+		val typesType = create plcopen::TypesType and initialize {
+			typesType.pous = pousType
+		}
+		val projectType = create plcopen::ProjectType and initialize {
+			projectType.types = typesType
+		}
+		add correspondence between projectType and container tagged with AMLTags.AML_PLCOPEN
+		execute { 
+			val plcNumber = AggregatorUtils.newNumberOfPLCopenFiles
+			persistProjectRelative(container, projectType, "../../../../../Desktop/resources-gen/plc" + plcNumber + ".tc60201")
+		}
+	}
+}
+
+/**
+ * routine to delete plcopen file and set references to deleted file to an empty string
+ */
+routine deletePLCopenFile(aml::PLCopenContainer container) {
+	match {
+		val plcProject = retrieve plcopen::ProjectType corresponding to container tagged with AMLTags.AML_PLCOPEN
+		val externalInterfaces = retrieve many caex::ExternalInterface corresponding to EcoreUtil2.getAllContentsOfType(plcProject, PouType1).get(0) tagged with AMLTags.INTERFACE_POU
+	}
+	action {
+		execute {
+			for(ExternalInterface currInterface : externalInterfaces) {
+				CAEXUtils.getAttributeInExternalInterface(currInterface, "refUri").value = ""
+			}
+		}
+		delete plcProject
+	}
+}