Minor changes: help, suppressWarnings
diff --git a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/CollectorExample.java b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/CollectorExample.java
index 1a61712..367ef0f 100644
--- a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/CollectorExample.java
+++ b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/CollectorExample.java
@@ -30,7 +30,7 @@
 import org.eclipse.app4mc.amalthea.model.io.AmaltheaWriter;
 import org.eclipse.app4mc.amalthea.model.util.SoftwareUtil;
 
-@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
+//@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
 public class CollectorExample {
 
 	public static void main(String[] args) {
diff --git a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/EnumExample.java b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/EnumExample.java
index 20924fd..eaefed6 100644
--- a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/EnumExample.java
+++ b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/EnumExample.java
@@ -32,7 +32,7 @@
 import org.eclipse.app4mc.amalthea.model.RunnableCall;
 import org.eclipse.app4mc.amalthea.model.SWModel;
 
-@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
+//@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
 public class EnumExample {
 
 	public static void main(String[] args) {
diff --git a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/IndexExample.java b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/IndexExample.java
index 621f32a..15c6ab2 100644
--- a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/IndexExample.java
+++ b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/IndexExample.java
@@ -30,7 +30,7 @@
 import org.eclipse.app4mc.amalthea.model.util.ModelUtil;
 import org.eclipse.emf.ecore.EObject;
 
-@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
+//@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
 public class IndexExample {
 
 	public static void main(String[] args) {
diff --git a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/LoadModifySaveExample.java b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/LoadModifySaveExample.java
index fddaf37..31f258e 100644
--- a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/LoadModifySaveExample.java
+++ b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/LoadModifySaveExample.java
@@ -24,7 +24,7 @@
 import org.eclipse.app4mc.amalthea.model.io.AmaltheaWriter;
 import org.eclipse.app4mc.amalthea.model.util.ModelUtil;
 
-@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
+//@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
 public class LoadModifySaveExample {
 
 	public static void main(String[] args) {
diff --git a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/SplitModelExample.java b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/SplitModelExample.java
index 0b3a4b1..bd8b188 100644
--- a/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/SplitModelExample.java
+++ b/examples/app4mc.example.tool.java/src/app4mc/example/tool/java/SplitModelExample.java
@@ -29,7 +29,7 @@
 import org.eclipse.sphinx.emf.resource.ExtendedResourceSet;
 import org.eclipse.sphinx.emf.resource.ExtendedResourceSetImpl;
 
-@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
+//@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
 public class SplitModelExample {
 
 	public static void main(String[] args) {
diff --git a/examples/app4mc.example.tool.validation/src/app4mc/example/tool/validation/NewValidationExample.java b/examples/app4mc.example.tool.validation/src/app4mc/example/tool/validation/NewValidationExample.java
index d448fca..7f8ff3a 100644
--- a/examples/app4mc.example.tool.validation/src/app4mc/example/tool/validation/NewValidationExample.java
+++ b/examples/app4mc.example.tool.validation/src/app4mc/example/tool/validation/NewValidationExample.java
@@ -37,7 +37,7 @@
 import org.eclipse.app4mc.validation.util.ValidationAggregator;
 import org.eclipse.app4mc.validation.util.ValidationExecutor;
 
-@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
+//@SuppressWarnings("java:S106") // Example code - Use of standard outputs is intended
 public class NewValidationExample {
 	
 	public static void main(String[] args) {
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/AmaltheaBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/AmaltheaBuilder.java
index 2a805f1..4839e52 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/AmaltheaBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/AmaltheaBuilder.java
@@ -117,7 +117,7 @@
 
 	// ********** Cross reference registry **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public <T extends EObject> void _reg(final @NonNull T object, final @NonNull String name) {
 		checkArgument(object != null, ARG_OBJECT_MESSAGE);
 		checkArgument(name != null, ARG_NAME_MESSAGE);
@@ -125,7 +125,7 @@
 		this.objectRegistry.put(name, object);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public <T extends EObject> T _ref(final @NonNull Class<T> cl, final @NonNull String name) {
 		checkArgument(cl != null, ARG_CLASS_MESSAGE, "T extends EObject");
 		checkArgument(name != null, ARG_NAME_MESSAGE);
@@ -136,7 +136,7 @@
 
 	// ********** Cross reference finder (via name based index search) **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public <T extends INamed> T _find(final @NonNull EObject context, final @NonNull Class<T> cl, final @NonNull String name) {
 		checkArgument(context != null, ARG_NOTIFIER_MESSAGE);
 		checkArgument(cl != null, ARG_CLASS_MESSAGE, "T extends INamed");
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/ConstraintsBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/ConstraintsBuilder.java
index 38291e2..db48d25 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/ConstraintsBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/ConstraintsBuilder.java
@@ -50,28 +50,28 @@
 
 	// ********** Top level - Requirements **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void requirement_Architecture(final ConstraintsModel container, final Procedure1<ArchitectureRequirement> initializer) {
 		final ArchitectureRequirement obj = AmaltheaFactory.eINSTANCE.createArchitectureRequirement();
 		container.getRequirements().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void requirement_Runnable(final ConstraintsModel container, final Procedure1<RunnableRequirement> initializer) {
 		final RunnableRequirement obj = AmaltheaFactory.eINSTANCE.createRunnableRequirement();
 		container.getRequirements().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void requirement_Process(final ConstraintsModel container, final Procedure1<ProcessRequirement> initializer) {
 		final ProcessRequirement obj = AmaltheaFactory.eINSTANCE.createProcessRequirement();
 		container.getRequirements().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void requirement_ProcessChain(final ConstraintsModel container, final Procedure1<ProcessChainRequirement> initializer) {
 		final ProcessChainRequirement obj = AmaltheaFactory.eINSTANCE.createProcessChainRequirement();
 		container.getRequirements().add(obj);
@@ -80,7 +80,7 @@
 
 	// ********** Top level shortcut - deadline (ResponseTime, UpperLimit) **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void deadline_Process(final ConstraintsModel container, final AbstractProcess process, final Time deadline) {
 		final TimeRequirementLimit limit = AmaltheaFactory.eINSTANCE.createTimeRequirementLimit();
 		limit.setMetric(TimeMetric.RESPONSE_TIME);
@@ -93,7 +93,7 @@
 		container.getRequirements().add(req);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void deadline_Runnable(final ConstraintsModel container, final Runnable runnable, final Time deadline) {
 		final TimeRequirementLimit limit = AmaltheaFactory.eINSTANCE.createTimeRequirementLimit();
 		limit.setMetric(TimeMetric.RESPONSE_TIME);
@@ -108,35 +108,35 @@
 
 	// ********** Requirements - limits **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void limit_Time(final Requirement container, final Procedure1<TimeRequirementLimit> initializer) {
 		final TimeRequirementLimit obj = AmaltheaFactory.eINSTANCE.createTimeRequirementLimit();
 		container.setLimit(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void limit_Frequency(final Requirement container, final Procedure1<FrequencyRequirementLimit> initializer) {
 		final FrequencyRequirementLimit obj = AmaltheaFactory.eINSTANCE.createFrequencyRequirementLimit();
 		container.setLimit(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void limit_Percentage(final Requirement container, final Procedure1<PercentageRequirementLimit> initializer) {
 		final PercentageRequirementLimit obj = AmaltheaFactory.eINSTANCE.createPercentageRequirementLimit();
 		container.setLimit(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void limit_Count(final Requirement container, final Procedure1<CountRequirementLimit> initializer) {
 		final CountRequirementLimit obj = AmaltheaFactory.eINSTANCE.createCountRequirementLimit();
 		container.setLimit(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void limit_CPUPercentage(final Requirement container, final Procedure1<CPUPercentageRequirementLimit> initializer) {
 		final CPUPercentageRequirementLimit obj = AmaltheaFactory.eINSTANCE.createCPUPercentageRequirementLimit();
 		container.setLimit(obj);
@@ -159,7 +159,7 @@
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void subchain_ref(final EventChain container, final EventChain ref) {
 		final EventChainReference container2 = AmaltheaFactory.eINSTANCE.createEventChainReference();
 		container.getItems().add(container2);
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/DatatypeBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/DatatypeBuilder.java
index 79079eb..fde4192 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/DatatypeBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/DatatypeBuilder.java
@@ -30,14 +30,14 @@
 
 public class DatatypeBuilder {
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void typeDefinition_BaseType(final SWModel container, final Procedure1<BaseTypeDefinition> initializer) {
 		final BaseTypeDefinition obj = AmaltheaFactory.eINSTANCE.createBaseTypeDefinition();
 		container.getTypeDefinitions().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void typeDefinition_DataType(final SWModel container, final Procedure1<DataTypeDefinition> initializer) {
 		final DataTypeDefinition obj = AmaltheaFactory.eINSTANCE.createDataTypeDefinition();
 		container.getTypeDefinitions().add(obj);
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/HardwareBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/HardwareBuilder.java
index 3ec1baf..8e9b2dd 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/HardwareBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/HardwareBuilder.java
@@ -46,49 +46,49 @@
 
 	// ********** Top level elements **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void definition_Cache(final HWModel container, final Procedure1<CacheDefinition> initializer) {
 		final CacheDefinition obj = AmaltheaFactory.eINSTANCE.createCacheDefinition();
 		container.getDefinitions().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void definition_Memory(final HWModel container, final Procedure1<MemoryDefinition> initializer) {
 		final MemoryDefinition obj = AmaltheaFactory.eINSTANCE.createMemoryDefinition();
 		container.getDefinitions().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void definition_ProcessingUnit(final HWModel container, final Procedure1<ProcessingUnitDefinition> initializer) {
 		final ProcessingUnitDefinition obj = AmaltheaFactory.eINSTANCE.createProcessingUnitDefinition();
 		container.getDefinitions().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void definition_ConnectionHandler(final HWModel container, final Procedure1<ConnectionHandlerDefinition> initializer) {
 		final ConnectionHandlerDefinition obj = AmaltheaFactory.eINSTANCE.createConnectionHandlerDefinition();
 		container.getDefinitions().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void domain_Frequency(final HWModel container, final Procedure1<FrequencyDomain> initializer) {
 		final FrequencyDomain obj = AmaltheaFactory.eINSTANCE.createFrequencyDomain();
 		container.getDomains().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void domain_Power(final HWModel container, final Procedure1<PowerDomain> initializer) {
 		final PowerDomain obj = AmaltheaFactory.eINSTANCE.createPowerDomain();
 		container.getDomains().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void featureCategory(final HWModel container, final Procedure1<HwFeatureCategory> initializer) {
 		final HwFeatureCategory obj = AmaltheaFactory.eINSTANCE.createHwFeatureCategory();
 		container.getFeatureCategories().add(obj);
@@ -117,28 +117,28 @@
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void module_Memory(final HwStructure container, final Procedure1<Memory> initializer) {
 		final Memory obj = AmaltheaFactory.eINSTANCE.createMemory();
 		container.getModules().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void module_ProcessingUnit(final HwStructure container, final Procedure1<ProcessingUnit> initializer) {
 		final ProcessingUnit obj = AmaltheaFactory.eINSTANCE.createProcessingUnit();
 		container.getModules().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void module_Cache(final HwStructure container, final Procedure1<Cache> initializer) {
 		final Cache obj = AmaltheaFactory.eINSTANCE.createCache();
 		container.getModules().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void module_ConnectionHandler(final HwStructure container, final Procedure1<ConnectionHandler> initializer) {
 		final ConnectionHandler obj = AmaltheaFactory.eINSTANCE.createConnectionHandler();
 		container.getModules().add(obj);
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/InstructionsBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/InstructionsBuilder.java
index cdfbedf..fbc6a40 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/InstructionsBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/InstructionsBuilder.java
@@ -48,7 +48,7 @@
 
 	// ********** Hardware Feature Category **********
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void featureCategory_Instructions(final HWModel container, final Procedure1<HwFeatureCategory> initializer) {
 		final HwFeatureCategory obj = AmaltheaFactory.eINSTANCE.createHwFeatureCategory();
 		obj.setName(InstructionsUtil.INSTRUCTIONS_CATEGORY_NAME);
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/OperatingSystemBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/OperatingSystemBuilder.java
index e5e6d5b..55e45c9 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/OperatingSystemBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/OperatingSystemBuilder.java
@@ -48,7 +48,7 @@
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void operatingSystem_Vendor(final OSModel container, final Procedure1<VendorOperatingSystem> initializer) {
 		final VendorOperatingSystem obj = AmaltheaFactory.eINSTANCE.createVendorOperatingSystem();
 		container.getOperatingSystems().add(obj);
@@ -107,7 +107,7 @@
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void parameter_extension(final SchedulerAssociation container, final String key, final String value) {
 		container.getParameterExtensions().put(key, value);
 	}
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/SoftwareBuilder.java b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/SoftwareBuilder.java
index 45cdd0e..aa43c33 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/SoftwareBuilder.java
+++ b/plugins/org.eclipse.app4mc.amalthea.model/src/org/eclipse/app4mc/amalthea/model/builder/SoftwareBuilder.java
@@ -117,56 +117,56 @@
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void activation_Single(final SWModel container, final Procedure1<SingleActivation> initializer) {
 		final SingleActivation obj = AmaltheaFactory.eINSTANCE.createSingleActivation();
 		container.getActivations().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void activation_Sporadic(final SWModel container, final Procedure1<SporadicActivation> initializer) {
 		final SporadicActivation obj = AmaltheaFactory.eINSTANCE.createSporadicActivation();
 		container.getActivations().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void activation_Periodic(final SWModel container, final Procedure1<PeriodicActivation> initializer) {
 		final PeriodicActivation obj = AmaltheaFactory.eINSTANCE.createPeriodicActivation();
 		container.getActivations().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void activation_Event(final SWModel container, final Procedure1<EventActivation> initializer) {
 		final EventActivation obj = AmaltheaFactory.eINSTANCE.createEventActivation();
 		container.getActivations().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void activation_VariableRate(final SWModel container, final Procedure1<VariableRateActivation> initializer) {
 		final VariableRateActivation obj = AmaltheaFactory.eINSTANCE.createVariableRateActivation();
 		container.getActivations().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void activation_Custom(final SWModel container, final Procedure1<CustomActivation> initializer) {
 		final CustomActivation obj = AmaltheaFactory.eINSTANCE.createCustomActivation();
 		container.getActivations().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void mode_Enum(final SWModel container, final Procedure1<EnumMode> initializer) {
 		final EnumMode obj = AmaltheaFactory.eINSTANCE.createEnumMode();
 		container.getModes().add(obj);
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void mode_Numeric(final SWModel container, final Procedure1<NumericMode> initializer) {
 		final NumericMode obj = AmaltheaFactory.eINSTANCE.createNumericMode();
 		container.getModes().add(obj);
@@ -227,7 +227,7 @@
 		initializer.apply(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void condition_OR(final ModeSwitchEntry container, final Procedure1<ModeConditionDisjunction> initializer) {
 		final ModeConditionDisjunction obj = AmaltheaFactory.eINSTANCE.createModeConditionDisjunction();
 		container.setCondition(obj);
@@ -250,7 +250,7 @@
 		container.getEntries().add(obj);
 	}
 
-	@SuppressWarnings("java:S100") // domain specific builder language
+	//@SuppressWarnings("java:S100") // domain specific builder language
 	public void condition_AND(final ModeConditionDisjunction container, final Procedure1<ModeConditionConjunction> initializer) {
 		final ModeConditionConjunction obj = AmaltheaFactory.eINSTANCE.createModeConditionConjunction();
 		container.getEntries().add(obj);
diff --git a/plugins/org.eclipse.app4mc.help/docu/example_scheduler.textile b/plugins/org.eclipse.app4mc.help/docu/example_scheduler.textile
index ceb9e1d..af84af1 100644
--- a/plugins/org.eclipse.app4mc.help/docu/example_scheduler.textile
+++ b/plugins/org.eclipse.app4mc.help/docu/example_scheduler.textile
@@ -15,6 +15,6 @@
 
 h4. Partitioned_FPP Scheduler
 
-In this example a custom FPP scheduler named *Partitioned_FPP* is representing a global scheduler. It schedules tasks on a FPP basis but with the additional constraint that it’s group must have budget left (has similarities to QNX’s adaptive partitioned scheduling). The scheduler "Grouping" is only there to assign budgets to a logical task group and define no mapping or responsibility at all. Therefore in the taskAllocation only priority and coreAffinity are specified. The coreAffinity of tasks in the same group can differ, even task migration is possible if a task’s affinity is *CoreA* as well as *CoreB*.
+In this example a custom FPP scheduler named *Partitioned_FPP* is representing a global scheduler. It schedules tasks on a FPP basis but with the additional constraint that its group must have budget left (has similarities to 'adaptive partitioned scheduling' of QNX). The scheduler "Grouping" is only there to assign budgets to a logical task group and define no mapping or responsibility at all. Therefore in the taskAllocation only priority and coreAffinity are specified. The coreAffinity of tasks in the same group can differ, even task migration is possible if a task affinity is *CoreA* as well as *CoreB*.
 
 !../pictures/example_scheduler_partitioned_fpp.png!
diff --git a/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/NameTest.java b/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/NameTest.java
index 0602e71..5ec216b 100644
--- a/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/NameTest.java
+++ b/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/NameTest.java
@@ -43,7 +43,7 @@
 	public ExpectedException thrown = ExpectedException.none(); // initially, expect no exception
 
 	@Test
-	@SuppressWarnings("java:S2637") // passing null to a @NonNull parameter is intended
+	//@SuppressWarnings("java:S2637") // passing null to a @NonNull parameter is intended
 	public void testArguments1() {
 		thrown.expect(IllegalArgumentException.class);
 		thrown.expectMessage("Argument is null, expected: EList");
diff --git a/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/TimeComparisonTest.java b/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/TimeComparisonTest.java
index bb7fe6e..ac6688e 100644
--- a/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/TimeComparisonTest.java
+++ b/tests/org.eclipse.app4mc.amalthea.model.tests/src/org/eclipse/app4mc/amalthea/model/tests/TimeComparisonTest.java
@@ -114,7 +114,7 @@
 	}
 
 	@Test
-	@SuppressWarnings("java:S2637") // passing null to a @NonNull parameter is intended
+	//@SuppressWarnings("java:S2637") // passing null to a @NonNull parameter is intended
 	public void case8() {
 
 		Time t1 = null;