Browse Source

Avoid error messages for PropertyImpl replacement (#1152)

* Avoid error messages for PropertyImpl replacement

* Refine error message catch
Rene Beckmann 8 years ago
parent
commit
06a62a6ef5

+ 13 - 8
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/ModelSequencer.xtend

@@ -32,6 +32,7 @@ import org.yakindu.sct.model.stext.stext.ImportScope
 import org.yakindu.sct.model.stext.stext.InterfaceScope
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.base.types.Property
 
 class ModelSequencer implements IModelSequencer {
 	 
@@ -149,17 +150,16 @@ class ModelSequencer implements IModelSequencer {
 	
 	
 	def dispatch Declaration replaced(EObject ne) {
+		var err = if (ne == null) "Replace called with null" else {
+			"Replace with unknown EObject (" + ne.class.simpleName + ") called: " 
+			+ ne.fullyQualifiedName + " in " + ne.eResource.URI.toString
+		}
+		
 		try {
-			var name = if (ne == null) "null" else ne.fullyQualifiedName
-			var type = if (ne == null) "unknown type" else ne.class.simpleName
-			var resource = if (ne == null) "unknown resource" else ne.eResource.URI.toString
-			
-			println("Replace with unknown EObject ("+type+") called: " + name + " in " + resource)
-			
-			LogFactory::getLog(typeof(ModelSequencer)).error("Replace with unknown EObject ("+type+") called: " + name + " in " + resource)
+			LogFactory::getLog(typeof(ModelSequencer)).error(err)
 		} catch (LogConfigurationException e) {
 			e.printStackTrace
-			println("Replace with unknown NamedElement called: "+if (ne ==null) "null" else ne.fullyQualifiedName)
+			println(err)
 		}
 		null;
 	}
@@ -179,5 +179,10 @@ class ModelSequencer implements IModelSequencer {
 		ed
 	}
 	
+	// avoid useless error messages
+	def dispatch replaced(Declaration decl) {
+		null;
+	}
+	
 		 	
 }

+ 3 - 3
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SexecElementMapping.xtend

@@ -113,11 +113,11 @@ import org.yakindu.base.types.Event
 	}
 	
 	
-	def EventDefinition create r : EcoreUtil::copy(event) create(EventDefinition event) {}
+	def EventDefinition create r : EcoreUtil.copy(event) create(EventDefinition event) {}
 	
-	def VariableDefinition create r : EcoreUtil::copy(v) create(VariableDefinition v) {}
+	def VariableDefinition create r : EcoreUtil.copy(v) create(VariableDefinition v) {}
 	
-	def OperationDefinition create r : EcoreUtil::copy(v) create(OperationDefinition v) {}
+	def OperationDefinition create r : EcoreUtil.copy(v) create(OperationDefinition v) {}
 	
 	 
 	def ExecutionState create r : sexecFactory.createExecutionState create(RegularState state){