Ensure system properties are refreshed in Simulator when loaded

Author: rensink

src/main/java/nl/utwente/groove/gui/SimulatorModel.java

@@ -166,10 +166,7 @@ private void setEnabled(ResourceKind kind, Set<QualName> names) throws IOExcepti
             }
             getStore().putGraphs(ResourceKind.RULE, newRules, false);
             break;
-        case HOST:
-        case TYPE:
-        case PROLOG:
-        case CONTROL:
+        case HOST, TYPE, PROLOG, CONTROL:
             GrammarProperties newProperties = getGrammar().getProperties().clone();
             List<QualName> actives = new ArrayList<>(newProperties.getActiveNames(kind));
             actives.sort(null);
@@ -181,7 +178,6 @@ private void setEnabled(ResourceKind kind, Set<QualName> names) throws IOExcepti
             newProperties.setActiveNames(kind, actives);
             getStore().putProperties(newProperties);
             break;
-        case PROPERTIES:
         default:
             throw Exceptions.UNREACHABLE;
         }

src/main/java/nl/utwente/groove/gui/action/LoadSystemPropertiesAction.java

@@ -53,7 +53,8 @@ public void load(File propertiesFile) throws IOException, FormatException {
         try (InputStream s = new FileInputStream(propertiesFile)) {
             properties.load(s);
         }
+        properties.check(getGrammarModel());
         properties = properties.repairVersion().addDerivedProperties(grammarPath);
-        getGrammarModel().setProperties(properties);
+        getSimulatorModel().doSetProperties(properties);
     }
 }