Skip to content
Snippets Groups Projects
Commit 7f221698 authored by Reiner Jung's avatar Reiner Jung
Browse files

Fixed visualization error for unlabeled elements.

parent b93875ca
No related branches found
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ public abstract class AbstractColorDependencyGraphBuilder extends AbstractDepend ...@@ -79,7 +79,7 @@ public abstract class AbstractColorDependencyGraphBuilder extends AbstractDepend
return "#eaeaea"; // other objects return "#eaeaea"; // other objects
} }
} else { } else {
return "#f000f0"; // pink on error return "#d000d0"; // pink on error
} }
} }
......
...@@ -72,7 +72,7 @@ public class ColorAssemblyLevelOperationDependencyGraphBuilder extends AbstractC ...@@ -72,7 +72,7 @@ public class ColorAssemblyLevelOperationDependencyGraphBuilder extends AbstractC
operationVertex.setPropertyIfAbsent(PropertyConstants.PARAMETER_TYPES, operationVertex.setPropertyIfAbsent(PropertyConstants.PARAMETER_TYPES,
operation.getOperationType().getParameterTypes()); operation.getOperationType().getParameterTypes());
operationVertex.setPropertyIfAbsent(ExtraConstants.FOREGROUND_COLOR, this.selectForegroundColor(operation)); 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); this.responseTimeDecorator.decorate(operationVertex, operation);
......
...@@ -36,10 +36,19 @@ public class Settings { ...@@ -36,10 +36,19 @@ public class Settings {
@Parameter(names = { "-j", @Parameter(names = { "-j",
"--dataflow-input" }, required = false, converter = PathConverter.class, description = "Dataflow CSV file") "--dataflow-input" }, required = false, converter = PathConverter.class, description = "Dataflow CSV file")
private Path dataflowInputFile; private Path dataflowInputFile;
@Parameter(names = { "-s", "--separation-char" }, required = false, description = "Separation character for CSV files, default is comma (,)") @Parameter(names = { "-cs",
private String splitSymbol; "--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", @Parameter(names = { "-f",
"--function-names" }, required = false, variableArity = true, converter = PathConverter.class, description = "Function file map CSV file") "--function-names" }, required = false, variableArity = true, converter = PathConverter.class, description = "Function file map CSV file")
private List<Path> functionNameFiles; private List<Path> functionNameFiles;
...@@ -73,13 +82,30 @@ public class Settings { ...@@ -73,13 +82,30 @@ public class Settings {
public List<Path> getFunctionNameFiles() { public List<Path> getFunctionNameFiles() {
return this.functionNameFiles; return this.functionNameFiles;
} }
public String getSplitSymbol() { public String getCallSplitSymbol() {
if (splitSymbol == null) if (this.callSplitSymbol == null) {
return ","; return ",";
else } else {
return splitSymbol; 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() { public Path getOutputDirectory() {
return this.outputDirectory; return this.outputDirectory;
......
...@@ -57,20 +57,20 @@ import teetime.framework.OutputPort; ...@@ -57,20 +57,20 @@ import teetime.framework.OutputPort;
* @since 1.0 * @since 1.0
*/ */
public class TeetimeCallConfiguration extends Configuration { public class TeetimeCallConfiguration extends Configuration {
public TeetimeCallConfiguration(final Logger logger, final Settings settings, public TeetimeCallConfiguration(final Logger logger, final Settings settings, final ModelRepository repository)
final ModelRepository repository) throws IOException, ValueConversionErrorException { throws IOException, ValueConversionErrorException {
OutputPort<CallerCallee> readerPort; OutputPort<CallerCallee> readerPort;
logger.info("Processing static call log"); logger.info("Processing static call log");
final CSVFunctionCallReaderStage readCsvStage = new CSVFunctionCallReaderStage( final CSVFunctionCallReaderStage readCsvStage = new CSVFunctionCallReaderStage(
settings.getOperationCallInputFile(), settings.getSplitSymbol()); settings.getOperationCallInputFile(), settings.getCallSplitSymbol());
readerPort = readCsvStage.getOutputPort(); readerPort = readCsvStage.getOutputPort();
if ((settings.getFunctionNameFiles() != null) if ((settings.getFunctionNameFiles() != null) && !settings.getFunctionNameFiles().isEmpty()) {
&& !settings.getFunctionNameFiles().isEmpty()) { final CSVFixPathStage fixPathStage = new CSVFixPathStage(settings.getFunctionNameFiles(),
final CSVFixPathStage fixPathStage = new CSVFixPathStage(settings.getFunctionNameFiles(), settings.getSplitSymbol()); settings.getNamesSplitSymbol());
this.connectPorts(readerPort, fixPathStage.getInputPort()); this.connectPorts(readerPort, fixPathStage.getInputPort());
readerPort = fixPathStage.getOutputPort(); readerPort = fixPathStage.getOutputPort();
} }
...@@ -127,8 +127,8 @@ public class TeetimeCallConfiguration extends Configuration { ...@@ -127,8 +127,8 @@ public class TeetimeCallConfiguration extends Configuration {
settings.getHostname()); settings.getHostname());
/** -- call based modeling -- */ /** -- call based modeling -- */
final TypeModelAssemblerStage typeModelAssemblerStage = new TypeModelAssemblerStage( final TypeModelAssemblerStage typeModelAssemblerStage = new TypeModelAssemblerStage(
repository.getModel(TypeModel.class), repository.getModel(SourceModel.class), repository.getModel(TypeModel.class), repository.getModel(SourceModel.class), settings.getSourceLabel(),
settings.getSourceLabel(), componentSignatureExtractor, operationSignatureExtractor); componentSignatureExtractor, operationSignatureExtractor);
final AssemblyModelAssemblerStage assemblyModelAssemblerStage = new AssemblyModelAssemblerStage( final AssemblyModelAssemblerStage assemblyModelAssemblerStage = new AssemblyModelAssemblerStage(
repository.getModel(TypeModel.class), repository.getModel(AssemblyModel.class), repository.getModel(TypeModel.class), repository.getModel(AssemblyModel.class),
repository.getModel(SourceModel.class), settings.getSourceLabel()); repository.getModel(SourceModel.class), settings.getSourceLabel());
......
...@@ -45,14 +45,14 @@ import teetime.framework.OutputPort; ...@@ -45,14 +45,14 @@ import teetime.framework.OutputPort;
* @since 1.0 * @since 1.0
*/ */
public class TeetimeDataflowConfiguration extends Configuration { public class TeetimeDataflowConfiguration extends Configuration {
public TeetimeDataflowConfiguration(final Logger logger, final Settings settings, public TeetimeDataflowConfiguration(final Logger logger, final Settings settings, final ModelRepository repository)
final ModelRepository repository) throws IOException, ValueConversionErrorException { throws IOException, ValueConversionErrorException {
OutputPort<DataAccess> readerDataflowPort; OutputPort<DataAccess> readerDataflowPort;
logger.info("Processing static call log"); logger.info("Processing static call log");
final CSVDataflowReaderStage readDataflowStage = new CSVDataflowReaderStage( final CSVDataflowReaderStage readDataflowStage = new CSVDataflowReaderStage(settings.getDataflowInputFile(),
settings.getDataflowInputFile(), settings.getSplitSymbol()); settings.getDataflowSplitSymbol());
readerDataflowPort = readDataflowStage.getOutputPort(); readerDataflowPort = readDataflowStage.getOutputPort();
...@@ -92,6 +92,7 @@ public class TeetimeDataflowConfiguration extends Configuration { ...@@ -92,6 +92,7 @@ public class TeetimeDataflowConfiguration extends Configuration {
deploymentModelDataflowAssemblerStage.getInputPort()); deploymentModelDataflowAssemblerStage.getInputPort());
this.connectPorts(deploymentModelDataflowAssemblerStage.getOutputPort(), this.connectPorts(deploymentModelDataflowAssemblerStage.getOutputPort(),
executionModelDataflowGenerationStage.getInputPort()); executionModelDataflowGenerationStage.getInputPort());
this.connectPorts(executionModelDataflowGenerationStage.getOutputPort(), countUniqueDataflowCalls.getInputPort()); this.connectPorts(executionModelDataflowGenerationStage.getOutputPort(),
countUniqueDataflowCalls.getInputPort());
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment