Resolving compiler errors after latest merges.

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.core/src/de/cognicrypt/utils/Utils.java

@@ -374,14 +374,9 @@ protected static List<CryptSLRule> readCrySLRules(String rulesFolder) {
 				continue;
 			}
 
-			try {
-				CryptSLRule readFromSourceFile = CryptSLRuleReader.readFromSourceFile(rule);
-				if (readFromSourceFile != null) {
-					rules.add(readFromSourceFile);
-				}
-			}
-			catch (IOException e) {
-				Activator.getDefault().logError(e);
+			CryptSLRule readFromSourceFile = CryptSLRuleReader.readFromSourceFile(rule);
+			if (readFromSourceFile != null) {
+				rules.add(readFromSourceFile);
 			}
 		}
 		return rules;

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

@@ -102,11 +102,7 @@ private static List<CryptSLRule> getRules(IProject project) {
 
 			rules.addAll(Files.find(Paths.get(Utils.getResourceFromWithin("/resources/CrySLRules/").getPath()), Integer.MAX_VALUE, (file, attr) -> file.toString().endsWith(".cryptsl"))
 					.map(path -> {
-						try {
 							return CryptSLRuleReader.readFromSourceFile(path.toFile());
-						}
-						catch (MalformedURLException e) {}
-						return null;
 					}).collect(Collectors.toList()));
 		}
 		catch (IOException | CoreException e) {