From dfc05478bbf75bf7673baca933391f8c8574332e Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Thu, 16 Dec 2021 14:56:19 +0100 Subject: [PATCH] modes: Changes target property value of clock-sync from initial to init to prevent clash with new keyword for modes. --- org.lflang/src/org/lflang/TargetConfig.java | 2 +- org.lflang/src/org/lflang/TargetProperty.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java index 44b398e277..213ddd9a26 100644 --- a/org.lflang/src/org/lflang/TargetConfig.java +++ b/org.lflang/src/org/lflang/TargetConfig.java @@ -60,7 +60,7 @@ public class TargetConfig { * The mode of clock synchronization to be used in federated programs. * The default is 'initial'. */ - public ClockSyncMode clockSync = ClockSyncMode.INITIAL; + public ClockSyncMode clockSync = ClockSyncMode.INIT; /** * Clock sync options. diff --git a/org.lflang/src/org/lflang/TargetProperty.java b/org.lflang/src/org/lflang/TargetProperty.java index cd1d905515..b21f8b7a7d 100644 --- a/org.lflang/src/org/lflang/TargetProperty.java +++ b/org.lflang/src/org/lflang/TargetProperty.java @@ -752,7 +752,7 @@ public enum UnionType implements TargetPropertyType { CoordinationType.CENTRALIZED), LOGGING_UNION(Arrays.asList(LogLevel.values()), LogLevel.INFO), CLOCK_SYNC_UNION(Arrays.asList(ClockSyncMode.values()), - ClockSyncMode.INITIAL), + ClockSyncMode.INIT), DOCKER_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.DOCKER_DICT), null), TRACING_UNION(Arrays.asList(PrimitiveType.BOOLEAN, DictionaryType.TRACING_DICT), @@ -985,8 +985,8 @@ public String toString() { * @author{Edward A. Lee } */ public enum ClockSyncMode { - OFF, INITIAL, ON; - + OFF, INIT, ON; // TODO Discuss initial in now a mode keyword (same as startup) and cannot be used as target property value, thus changed it to init + // FIXME I could not test if this change breaks anything /** * Return the name in lower case.