Merge pull request #64 from kieler/als/master

Various improvements and new features for OO, dataflow and timed SCCharts

Author: a-sr

plugins/de.cau.cs.kieler.annotations/src-gen/de/cau/cs/kieler/annotations/serializer/AbstractAnnotationsSemanticSequencer.java

@@ -102,6 +102,7 @@ else if (rule == grammarAccess.getAnnotationRule()
 	}
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     Annotation returns CommentAnnotation
 	 *     ValuedAnnotation returns CommentAnnotation
@@ -111,45 +112,52 @@ else if (rule == grammarAccess.getAnnotationRule()
 	 *
 	 * Constraint:
 	 *     values+=COMMENT_ANNOTATION
+	 * </pre>
 	 */
 	protected void sequence_CommentAnnotation(ISerializationContext context, CommentAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     CommentAnnotatonSL returns CommentAnnotation
 	 *
 	 * Constraint:
 	 *     values+=SL_COMMENT_ANNOTATION
+	 * </pre>
 	 */
 	protected void sequence_CommentAnnotatonSL(ISerializationContext context, CommentAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     Annotation returns StringAnnotation
 	 *     ValuedAnnotation returns StringAnnotation
 	 *     KeyStringValueAnnotation returns StringAnnotation
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID values+=EStringAllTypes values+=EStringAllTypes*)
+	 * </pre>
 	 */
 	protected void sequence_KeyStringValueAnnotation(ISerializationContext context, StringAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     Pragma returns Pragma
 	 *     PragmaTag returns Pragma
 	 *
 	 * Constraint:
 	 *     name=ExtendedID
+	 * </pre>
 	 */
 	protected void sequence_PragmaTag(ISerializationContext context, Pragma semanticObject) {
 		if (errorAcceptor != null) {
@@ -163,71 +171,82 @@ protected void sequence_PragmaTag(ISerializationContext context, Pragma semantic
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     QuotedStringAnnotation returns StringAnnotation
 	 *     QuotedKeyStringValueAnnotation returns StringAnnotation
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID values+=STRING values+=STRING*)
+	 * </pre>
 	 */
 	protected void sequence_QuotedKeyStringValueAnnotation(ISerializationContext context, StringAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     QuotedStringAnnotation returns TypedStringAnnotation
 	 *     QuotedTypedKeyStringValueAnnotation returns TypedStringAnnotation
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID type=ExtendedID values+=STRING values+=STRING*)
+	 * </pre>
 	 */
 	protected void sequence_QuotedTypedKeyStringValueAnnotation(ISerializationContext context, TypedStringAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     RestrictedTypeAnnotation returns StringAnnotation
 	 *     RestrictedKeyStringValueAnnotation returns StringAnnotation
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID values+=EStringBoolean values+=EStringBoolean*)
+	 * </pre>
 	 */
 	protected void sequence_RestrictedKeyStringValueAnnotation(ISerializationContext context, StringAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     RestrictedTypeAnnotation returns TypedStringAnnotation
 	 *     RestrictedTypedKeyStringValueAnnotation returns TypedStringAnnotation
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID type=ExtendedID values+=EStringBoolean values+=EStringBoolean*)
+	 * </pre>
 	 */
 	protected void sequence_RestrictedTypedKeyStringValueAnnotation(ISerializationContext context, TypedStringAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     Pragma returns StringPragma
 	 *     StringPragma returns StringPragma
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID values+=EStringAllTypes values+=EStringAllTypes*)
+	 * </pre>
 	 */
 	protected void sequence_StringPragma(ISerializationContext context, StringPragma semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);
 	}
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     Annotation returns TagAnnotation
 	 *     RestrictedTypeAnnotation returns TagAnnotation
@@ -236,6 +255,7 @@ protected void sequence_StringPragma(ISerializationContext context, StringPragma
 	 *
 	 * Constraint:
 	 *     name=ExtendedID
+	 * </pre>
 	 */
 	protected void sequence_TagAnnotation(ISerializationContext context, TagAnnotation semanticObject) {
 		if (errorAcceptor != null) {
@@ -249,13 +269,15 @@ protected void sequence_TagAnnotation(ISerializationContext context, TagAnnotati
 
 
 	/**
+	 * <pre>
 	 * Contexts:
 	 *     Annotation returns TypedStringAnnotation
 	 *     ValuedAnnotation returns TypedStringAnnotation
 	 *     TypedKeyStringValueAnnotation returns TypedStringAnnotation
 	 *
 	 * Constraint:
 	 *     (name=ExtendedID type=ExtendedID values+=EStringAllTypes values+=EStringAllTypes*)
+	 * </pre>
 	 */
 	protected void sequence_TypedKeyStringValueAnnotation(ISerializationContext context, TypedStringAnnotation semanticObject) {
 		genericSequencer.createSequence(context, semanticObject);

plugins/de.cau.cs.kieler.core/src/de/cau/cs/kieler/core/definitions/DynamicTicks.xtend

@@ -27,6 +27,7 @@ class DynamicTicks {
     public static val IProperty<Boolean> DYNAMIC_TICK_COMPILATION = 
         new Property<Boolean>("de.cau.cs.kieler.core.dynamic.ticks", false)
 
+    public static val MSEC_SIM_TAG = "dynamic-ticks-msec"
     public static val TAG = "dynamic-ticks"
     public static val SLEEP_T = "sleepT"
     public static val DELTA_T = "deltaT"