back to normal config

output for beginner

montiSecArcAnalysis/src/main/java/secarc/MontiSecArcAnalysis.java

@@ -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

montiSecArcAnalysis/src/main/java/secarc/MontiSecArcAnalysisTool.java

@@ -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);
 	}
 

montiSecArcAnalysis/src/main/java/secarc/ets/analysis/configuration/ReviewedConfiguration.java

@@ -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;

montiSecArcAnalysis/src/main/java/secarc/ets/analysis/trustlevel/DerivedTrustlevel.java

@@ -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;
 	}
 	

montiSecArcAnalysis/src/main/java/secarc/ets/check/MontiSecArcAnalysisCreator.java

@@ -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;
 

montiSecArcAnalysis/src/main/java/secarc/ets/transform/criticalport/AnalysisCriticalPortTransformationWorkflow.java

@@ -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);

montiSecArcAnalysis/src/main/java/secarc/ets/transform/trustlevel/AnalysisTrustlevelTransformationWorkflow.java

@@ -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);