fixed bug in operation parsing

haslab · Nov 7, 2013 · ddc75f5 · ddc75f5
1 parent 8aa87b5
commit ddc75f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/examples/pt.uminho.haslab.echo.examples/metamodels/uml2rdbms_simple/UML.ecore b/examples/pt.uminho.haslab.echo.examples/metamodels/uml2rdbms_simple/UML.ecore
@@ -6,7 +6,7 @@
       <details key="acyclic_inheritance" value="not self->closure(super)->includes(self)"/>
       <details key="unique_names" value="self.attributes->forAll(x | self.attributes->forAll(y | x = y or x.name &lt;> y.name))"/>
     </eAnnotations>
-    <eAnnotations source="Echo/Gen">
+    <eAnnotations source="Echo/Gen_">
       <details key="gen_linear" value="self.attributes->forAll(x | x.name = self.name)"/>
       <details key="gen_linear" value="not self.persistent implies (self.attributes->isEmpty() and self.child->one(x | x.persistent) and (self.child->one(x | not x.persistent) or (not self.child->exists(x | not x.persistent))))"/>
       <details key="gen_linear" value="self.persistent implies (self.attributes->one(x | true) and self.child->isEmpty())"/>

diff --git a/plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/views/GraphView.java b/plugins/pt.uminho.haslab.echo.plugin/src/pt/uminho/haslab/echo/plugin/views/GraphView.java
@@ -100,7 +100,9 @@ public void dispose() {
 	 */
 	public void drawGraph() {
 		EchoRunner runner = EchoPlugin.getInstance().getRunner();
-		A4Solution sol = ((AlloyTuple) runner.getAInstance().getContents()).getSolution();
+		if (runner == null) return;
+		AlloyTuple tuple = ((AlloyTuple) runner.getAInstance().getContents());
+		A4Solution sol = tuple.getSolution();
 		try {
 			if (sol != null && sol.satisfiable()) {
 				sol.writeXML(".dummy.xml");

diff --git a/plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/transform/alloy/ECore2Alloy.java b/plugins/pt.uminho.haslab.echo/src/pt/uminho/haslab/echo/transform/alloy/ECore2Alloy.java
@@ -428,7 +428,7 @@ private void processOperations(List<EOperation> operations) throws ErrorTransfor
 
 			OCL2Alloy converter = new OCL2Alloy(sd,posstatevars,prestatevars);
 			for (EAnnotation ea : operation.getEAnnotations())
-				if(ea.getSource().equals("http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot")) {
+				if(ea.getSource().equals("http://www.eclipse.org/emf/2002/Ecore/OCL")) {
 					Expr oclalloy = Sig.NONE.no();
 					for(String sExpr: ea.getDetails().values()) {
 						try{