Fixed visualization error for unlabeled elements.

tools/mvis/src/main/java/org/oceandsl/tools/mvis/graph/AbstractColorDependencyGraphBuilder.java

@@ -79,7 +79,7 @@ public abstract class AbstractColorDependencyGraphBuilder extends AbstractDepend
                 return "#eaeaea"; // other objects
             }
         } else {
-            return "#f000f0"; // pink on error
+            return "#d000d0"; // pink on error
         }
     }
 

tools/mvis/src/main/java/org/oceandsl/tools/mvis/graph/ColorAssemblyLevelOperationDependencyGraphBuilder.java

@@ -72,7 +72,7 @@ public class ColorAssemblyLevelOperationDependencyGraphBuilder extends AbstractC
         operationVertex.setPropertyIfAbsent(PropertyConstants.PARAMETER_TYPES,
                 operation.getOperationType().getParameterTypes());
         operationVertex.setPropertyIfAbsent(ExtraConstants.FOREGROUND_COLOR, this.selectForegroundColor(operation));
-        componentVertex.setPropertyIfAbsent(ExtraConstants.BACKGROUND_COLOR, this.selectBackgroundColor(operation));
+        operationVertex.setPropertyIfAbsent(ExtraConstants.BACKGROUND_COLOR, this.selectBackgroundColor(operation));
 
         this.responseTimeDecorator.decorate(operationVertex, operation);
 

tools/sar/src/main/java/org/oceandsl/tools/sar/Settings.java

@@ -36,10 +36,19 @@ public class Settings {
     @Parameter(names = { "-j",
             "--dataflow-input" }, required = false, converter = PathConverter.class, description = "Dataflow CSV file")
     private Path dataflowInputFile;
-    
-    @Parameter(names = { "-s", "--separation-char" }, required = false, description = "Separation character for CSV files, default is comma (,)")
-    private String splitSymbol;
-    
+
+    @Parameter(names = { "-cs",
+            "--call-separation-char" }, required = false, description = "Separation character for operation call CSV files, default is comma (,)")
+    private String callSplitSymbol;
+
+    @Parameter(names = { "-ds",
+            "--dataflow-separation-char" }, required = false, description = "Separation character for dataflow CSV files, default is comma (,)")
+    private String dataflowSplitSymbol;
+
+    @Parameter(names = { "-ns",
+            "--names-separation-char" }, required = false, description = "Separation character for function name lists CSV files, default is comma (,)")
+    private String namesSplitSymbol;
+
     @Parameter(names = { "-f",
             "--function-names" }, required = false, variableArity = true, converter = PathConverter.class, description = "Function file map CSV file")
     private List<Path> functionNameFiles;
@@ -73,13 +82,30 @@ public class Settings {
     public List<Path> getFunctionNameFiles() {
         return this.functionNameFiles;
     }
-    
-    public String getSplitSymbol() {
-    	if (splitSymbol == null)
-    		return ",";
-    	else
-    		return splitSymbol;
-	}
+
+    public String getCallSplitSymbol() {
+        if (this.callSplitSymbol == null) {
+            return ",";
+        } else {
+            return this.callSplitSymbol;
+        }
+    }
+
+    public String getDataflowSplitSymbol() {
+        if (this.dataflowSplitSymbol == null) {
+            return ",";
+        } else {
+            return this.dataflowSplitSymbol;
+        }
+    }
+
+    public String getNamesSplitSymbol() {
+        if (this.namesSplitSymbol == null) {
+            return ",";
+        } else {
+            return this.namesSplitSymbol;
+        }
+    }
 
     public Path getOutputDirectory() {
         return this.outputDirectory;

tools/sar/src/main/java/org/oceandsl/tools/sar/TeetimeCallConfiguration.java

@@ -57,20 +57,20 @@ import teetime.framework.OutputPort;
  * @since 1.0
  */
 public class TeetimeCallConfiguration extends Configuration {
-    public TeetimeCallConfiguration(final Logger logger, final Settings settings,
-            final ModelRepository repository) throws IOException, ValueConversionErrorException {
-    	
+    public TeetimeCallConfiguration(final Logger logger, final Settings settings, final ModelRepository repository)
+            throws IOException, ValueConversionErrorException {
+
         OutputPort<CallerCallee> readerPort;
 
         logger.info("Processing static call log");
         final CSVFunctionCallReaderStage readCsvStage = new CSVFunctionCallReaderStage(
-                settings.getOperationCallInputFile(), settings.getSplitSymbol());
+                settings.getOperationCallInputFile(), settings.getCallSplitSymbol());
 
         readerPort = readCsvStage.getOutputPort();
 
-        if ((settings.getFunctionNameFiles() != null)
-                && !settings.getFunctionNameFiles().isEmpty()) {
-            final CSVFixPathStage fixPathStage = new CSVFixPathStage(settings.getFunctionNameFiles(), settings.getSplitSymbol());
+        if ((settings.getFunctionNameFiles() != null) && !settings.getFunctionNameFiles().isEmpty()) {
+            final CSVFixPathStage fixPathStage = new CSVFixPathStage(settings.getFunctionNameFiles(),
+                    settings.getNamesSplitSymbol());
             this.connectPorts(readerPort, fixPathStage.getInputPort());
             readerPort = fixPathStage.getOutputPort();
         }
@@ -127,8 +127,8 @@ public class TeetimeCallConfiguration extends Configuration {
                 settings.getHostname());
         /** -- call based modeling -- */
         final TypeModelAssemblerStage typeModelAssemblerStage = new TypeModelAssemblerStage(
-                repository.getModel(TypeModel.class), repository.getModel(SourceModel.class),
-                settings.getSourceLabel(), componentSignatureExtractor, operationSignatureExtractor);
+                repository.getModel(TypeModel.class), repository.getModel(SourceModel.class), settings.getSourceLabel(),
+                componentSignatureExtractor, operationSignatureExtractor);
         final AssemblyModelAssemblerStage assemblyModelAssemblerStage = new AssemblyModelAssemblerStage(
                 repository.getModel(TypeModel.class), repository.getModel(AssemblyModel.class),
                 repository.getModel(SourceModel.class), settings.getSourceLabel());

tools/sar/src/main/java/org/oceandsl/tools/sar/TeetimeDataflowConfiguration.java

@@ -45,14 +45,14 @@ import teetime.framework.OutputPort;
  * @since 1.0
  */
 public class TeetimeDataflowConfiguration extends Configuration {
-    public TeetimeDataflowConfiguration(final Logger logger, final Settings settings,
-            final ModelRepository repository) throws IOException, ValueConversionErrorException {
+    public TeetimeDataflowConfiguration(final Logger logger, final Settings settings, final ModelRepository repository)
+            throws IOException, ValueConversionErrorException {
 
         OutputPort<DataAccess> readerDataflowPort;
 
         logger.info("Processing static call log");
-        final CSVDataflowReaderStage readDataflowStage = new CSVDataflowReaderStage(
-                settings.getDataflowInputFile(), settings.getSplitSymbol());
+        final CSVDataflowReaderStage readDataflowStage = new CSVDataflowReaderStage(settings.getDataflowInputFile(),
+                settings.getDataflowSplitSymbol());
 
         readerDataflowPort = readDataflowStage.getOutputPort();
 
@@ -92,6 +92,7 @@ public class TeetimeDataflowConfiguration extends Configuration {
                 deploymentModelDataflowAssemblerStage.getInputPort());
         this.connectPorts(deploymentModelDataflowAssemblerStage.getOutputPort(),
                 executionModelDataflowGenerationStage.getInputPort());
-        this.connectPorts(executionModelDataflowGenerationStage.getOutputPort(), countUniqueDataflowCalls.getInputPort());
+        this.connectPorts(executionModelDataflowGenerationStage.getOutputPort(),
+                countUniqueDataflowCalls.getInputPort());
     }
 }