Commit d03180e1 authored by Paff's avatar Paff
Browse files

back to normal config

output for beginner
parent 37c02b0d
......@@ -88,7 +88,7 @@ public final class MontiSecArcAnalysis extends MontiSecArc {
//AnalysisCreator
analysisWorkflow.setAnalysis(MontiSecArcAnalysisCreator.createAnalysis(analysisConfPath));
//AnalysisConfiguratin
analysisWorkflow.setAnalysisConfiguration(MontiSecArcAnalysisCreator.createConfig(analysisConfPath));
analysisWorkflow.setAnalysisConfiguration(MontiSecArcAnalysisCreator.createConfig());
//AnalysisParaemter
analysisWorkflow.setAnalysisParameter(analysisParameter);
//Add Workflow for Analysis for advanced users
......
......@@ -155,7 +155,7 @@ public class MontiSecArcAnalysisTool extends ETSTool {
// set default CoCos
Map<String, Type> cocoConfig = MontiSecArcContextConditionCreator.createConfig();
cocoConfig.putAll(MontiSecArcAnalysisCreator.createConfig(analysisConfPath));
cocoConfig.putAll(MontiSecArcAnalysisCreator.createConfig());
setCocoConfiguration(cocoConfig);
}
......
......@@ -44,8 +44,13 @@ public class ReviewedConfiguration extends Analysis implements
*/
public int check(ASTSecArcConfiguration node, ConfigurationEntry entry, boolean advanced) {
String name = entry.getName();
String standardOutput = "The configuration " + name + " is not reviewed, yet.";
if(!name.endsWith("_reviewed")) {
addReport("The configuration " + name + " is not reviewed, yet. After the configuration is reviewed, a \"_reviewed\" must be added to the configuration's name.", node.get_SourcePositionStart());
if(advanced) {
addReport(standardOutput + " After the configuration is reviewed, a \"_reviewed\" must be added to the configuration's name.", node.get_SourcePositionStart());
} else {
addReport(standardOutput, node.get_SourcePositionStart());
}
return factor;
}
return 0;
......
......@@ -54,7 +54,7 @@ public class DerivedTrustlevel extends Analysis implements
SecComponentEntry trustlevelEntry = getDerivedTrustlevel(node);
String trustlevel = CoCoHelper.getTrustlevelAsString(trustlevelEntry);
addReport("The component " + entry.getName() + " has the trustlevel " + trustlevel, node.get_SourcePositionStart());
addReport("The component " + entry.getName() + " has the derived trustlevel " + trustlevel, node.get_SourcePositionStart());
return factor;
}
......
......@@ -8,7 +8,6 @@ import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
......
......@@ -91,7 +91,7 @@ public class AnalysisCriticalPortTransformationWorkflow<T extends MontiSecArcRoo
//AnalysisCreator
analysisTransformWorkflow.setAnalysis(MontiSecArcAnalysisCreator.createAnalysis(analysisConfPath));
//AnalysisConfiguratin
analysisTransformWorkflow.setAnalysisConfiguration(MontiSecArcAnalysisCreator.createConfig(analysisConfPath));
analysisTransformWorkflow.setAnalysisConfiguration(MontiSecArcAnalysisCreator.createConfig());
//Visitor for Analysis
MontiSecArcAnalysisVisitor analysisTransfromVisitor = new MontiSecArcAnalysisVisitor();
analysisTransfromVisitor.setAdvanced(advanced);
......
......@@ -76,7 +76,7 @@ public class AnalysisTrustlevelTransformationWorkflow<T extends MontiSecArcRoot>
//AnalysisCreator
analysisTransformWorkflow.setAnalysis(MontiSecArcAnalysisCreator.createAnalysis(analysisConfPath));
//AnalysisConfiguratin
analysisTransformWorkflow.setAnalysisConfiguration(MontiSecArcAnalysisCreator.createConfig(analysisConfPath));
analysisTransformWorkflow.setAnalysisConfiguration(MontiSecArcAnalysisCreator.createConfig());
//Visitor for Analysis
MontiSecArcAnalysisVisitor analysisTransfromVisitor = new MontiSecArcAnalysisVisitor();
analysisTransfromVisitor.setAdvanced(advanced);
......
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