Commit 2fec4612 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

SafetyCases: Java 9 compliance.

* Rename the class Module to SafetyModule.
* Make the class SafetyModule abstract (as per intention of the meta-model).
* Align the naming of the ModuleRef class (Library elements) --> SafetyModuleRef.
* Add a migrator for ModuleRef elements. A migrator for Module elements is not needed since this class has been used like an abstract one.
* Change the getFileProject utility class to handle cases in which the passed element is the FileProject.
refs 3104
parent 5c2c6b3a
AutomaticArgumentGenerationUtil.java c40f390f49aed62432575149c7310b1989ccd3e7 GREEN
LibraryModuleUtils.java 6256f3e086460884978aeb3262c2decf92a7a405 GREEN
AutomaticArgumentGenerationUtil.java 684dd34acfe64f5a1731f8b877c69a229ca495fb RED
LibraryModuleUtils.java 593ea45e1b5f6ef4b4fc445874a8b6aa190536f0 YELLOW
ModuleLibraryModelElementFactory.java e626b38204ee88e241a232156e49bfd30675b2e1 GREEN
SafetyCasesAnalysisUtils.java b6bc9a3fb9d0c899f0a4d1099f90be43c167a208 GREEN
SafetyCasesModelElementFactory.java 867edabf3d334558310cf255228cf0da5ffc0d48 GREEN
SafetyCasesModelElementFactory.java 48b5b552220ca74236a919633079f92330cc59f2 YELLOW
SafetyCasesModellingUtils.java e199a8db06e003a07873adbb68af42d538325b18 GREEN
SafetyCasesUtils.java d915099b943e2a9c60fc45a7b78a7158c1c4415c GREEN
......@@ -42,7 +42,7 @@ import org.fortiss.af3.safetycases.model.Context;
import org.fortiss.af3.safetycases.model.Goal;
import org.fortiss.af3.safetycases.model.InContextOf;
import org.fortiss.af3.safetycases.model.Justification;
import org.fortiss.af3.safetycases.model.Module;
import org.fortiss.af3.safetycases.model.SafetyModule;
import org.fortiss.af3.safetycases.model.OptionEntity;
import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.Solution;
......@@ -115,7 +115,7 @@ public class AutomaticArgumentGenerationUtil {
* The claim of the to be created argument element.
* @return The newly created argument element.
*/
public static ArgumentElement createArgumentElement(Module container, ArgumentElement root,
public static ArgumentElement createArgumentElement(SafetyModule container, ArgumentElement root,
Class<? extends ArgumentElement> elementType, String claim) {
ArgumentElement argElement = null;
if(elementType.equals(Goal.class)) {
......
......@@ -26,7 +26,7 @@ import org.fortiss.af3.safetycases.model.AwayArgumentElement;
import org.fortiss.af3.safetycases.model.Context;
import org.fortiss.af3.safetycases.model.Goal;
import org.fortiss.af3.safetycases.model.LibraryModule;
import org.fortiss.af3.safetycases.model.Module;
import org.fortiss.af3.safetycases.model.SafetyModule;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.tooling.kernel.model.ILibraryElement;
......@@ -56,7 +56,7 @@ public class LibraryModuleUtils {
* The argument module to be checked.
* @return true if the argument module only contains primitive types, false otherwise.
*/
public static boolean containsOnlyUninstantiatedArgEle(Module scope) {
public static boolean containsOnlyUninstantiatedArgEle(SafetyModule scope) {
for(ArgumentElement argEle : ((ArgumentModule)scope).getContainedArgumentElements()) {
if(argEle.getSafetyClaimPattern() != null) {
boolean uninstantiatedText =
......
......@@ -19,7 +19,7 @@ import org.fortiss.af3.safetycases.model.ExitConnector;
import org.fortiss.af3.safetycases.model.Goal;
import org.fortiss.af3.safetycases.model.InContextOf;
import org.fortiss.af3.safetycases.model.Justification;
import org.fortiss.af3.safetycases.model.Module;
import org.fortiss.af3.safetycases.model.SafetyModule;
import org.fortiss.af3.safetycases.model.OptionEntity;
import org.fortiss.af3.safetycases.model.SafetyCase;
import org.fortiss.af3.safetycases.model.SafetyCasesConnection;
......@@ -234,7 +234,7 @@ public class SafetyCasesModelElementFactory {
// ### Creation of Connections ############################################
/** Creates a {@link SafetyCasesConnection} of the given type between the given {@link Module}s. */
/** Creates a {@link SafetyCasesConnection} of the given type between the given {@link SafetyModule}s. */
public static <T extends SafetyCasesConnection> SafetyCasesConnection
createConnectionAndAttach(HierarchicElementBase parent, ArgumentElementBase source,
ArgumentElementBase target, Class<T> clazz) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment