Merge branch 'develop' into ensuresPredicatePreAnalyse

Conflicts:
	plugins/de.cognicrypt.staticanalyzer/src/de/cognicrypt/staticanalyzer/sootbridge/SootRunner.java

Author: kruegers

plugins/de.cognicrypt.codegenerator/META-INF/MANIFEST.MF

@@ -32,7 +32,22 @@ Bundle-ClassPath: lib/claferchocoig.jar,
  lib/saxon9he.jar
 Automatic-Module-Name: de.cognicrypt.codegenerator
 Bundle-Vendor: TU Darmstadt, Paderborn University
-Export-Package: de.cognicrypt.codegenerator.featuremodel.clafer,
- de.cognicrypt.codegenerator.question,
- de.cognicrypt.codegenerator.tasks,
+Export-Package: de.cognicrypt.codegenerator,
+ de.cognicrypt.codegenerator.actions,
+ de.cognicrypt.codegenerator.crysl,
+ de.cognicrypt.codegenerator.crysl.templates.asymmetricencryption,
+ de.cognicrypt.codegenerator.crysl.templates.digitalsignatures,
+ de.cognicrypt.codegenerator.crysl.templates.encryption,
+ de.cognicrypt.codegenerator.crysl.templates.encryptionfiles,
+ de.cognicrypt.codegenerator.crysl.templates.encryptionhybrid,
+ de.cognicrypt.codegenerator.crysl.templates.encryptionhybridfiles,
+ de.cognicrypt.codegenerator.crysl.templates.encryptionhybridstrings,
+ de.cognicrypt.codegenerator.crysl.templates.encryptionstrings,
+ de.cognicrypt.codegenerator.crysl.templates.secretkeyencryption,
+ de.cognicrypt.codegenerator.crysl.templates.securepassword,
+ de.cognicrypt.codegenerator.crysl.templates.stringhashing,
+ de.cognicrypt.codegenerator.featuremodel.clafer,
+ de.cognicrypt.codegenerator.generator,
+ de.cognicrypt.codegenerator.question,
+ de.cognicrypt.codegenerator.tasks,
  de.cognicrypt.codegenerator.utilities

plugins/de.cognicrypt.staticanalyzer/src/de/cognicrypt/staticanalyzer/StaticAnalyzerPreferences.java

@@ -63,7 +63,7 @@ private void initializeBasicValues() {
 
 	private void performBasicDefaults() {
 		preferences.setDefault(Constants.RULE_SELECTION, 0);
-		preferences.setDefault(Constants.AUTOMATED_ANALYSIS, false);
+		preferences.setDefault(Constants.AUTOMATED_ANALYSIS, true);
 		preferences.setDefault(Constants.SHOW_SECURE_OBJECTS, false);
 		preferences.setDefault(Constants.ANALYSE_DEPENDENCIES, true);
 		preferences.setDefault(Constants.CALL_GRAPH_SELECTION, 0);

plugins/de.cognicrypt.staticanalyzer/src/de/cognicrypt/staticanalyzer/sootbridge/SootRunner.java

@@ -307,4 +307,4 @@ private static void resolveClassPathEntry(IClasspathEntry entry, Collection<Stri
 		}
 	}
 
-}
+}