Moved JCA latest ruleset eclipse path to Constants

Signed-off-by: Rakshit Krishnappa Ravi <rakshitkrishnapparavi@gmail.com>

- created a new constant named JCA_LATEST_ECLIPSE_RULES_DIR for retrieve latest JCA ruleset
- used it for content proposal & code generation

Author: rakshitkr

plugins/de.cognicrypt.codegenerator/src/main/java/de/cognicrypt/codegenerator/ui/contentassist/CustomCompletionProposalComputer.java

@@ -17,17 +17,13 @@
 
 import de.cognicrypt.codegenerator.Activator;
 import de.cognicrypt.core.Constants;
-import de.cognicrypt.utils.CrySLUtils;
 
 
 @SuppressWarnings("restriction")
 public class CustomCompletionProposalComputer extends JavaCompletionProposalComputer {
 
-	static private String rulesDir = Constants.ECLIPSE_RULES_DIR + Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + 
-	CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString())[CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString()).length - 1] + 
-	Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString();
 
-	static private List<String> ruleNames = readClassnames(rulesDir);
+	static private List<String> ruleNames = readClassnames(Constants.JCA_LATEST_ECLIPSE_RULES_DIR);
 
 	@Override
 	public List<ICompletionProposal> computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) {
@@ -78,7 +74,7 @@ private static List<String> readClassnames(String rulesFolder) {
 
 	private static String readClassnameFromRule(File ruleFile) throws IOException {
 		final String fileName = ruleFile.getName();
-		if (!fileName.endsWith(".crysl")) {
+		if (!fileName.endsWith(Constants.cryslFileEnding)) {
 			return null;
 		}
 

plugins/de.cognicrypt.core/src/de/cognicrypt/core/Constants.java

@@ -10,6 +10,8 @@
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
+import de.cognicrypt.utils.CrySLUtils;
+
 /**
  * This class comprises all constants that are used by the plugin.
  */
@@ -581,6 +583,10 @@ public String toString() {
 	public static final int JDT_PROBLEM_ID = 10000000;
 	public final static String RELATIVE_RULES_DIR = "resources/CrySLRules";
 	public final static String ECLIPSE_RULES_DIR = System.getProperty("user.dir");
+	public final static String JCA_LATEST_ECLIPSE_RULES_DIR = Constants.ECLIPSE_RULES_DIR + Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + 
+			CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString())[CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString()).length - 1] + 
+			Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString();
+			
 	public static final String cryslFileEnding = ".crysl";
 	public static final String cryslEditorID = "de.darmstadt.tu.crossing.CrySL";
 	public static final String HEALTHY = "Secure";

plugins/de.cognicrypt.core/src/de/cognicrypt/utils/CrySLUtils.java

@@ -9,16 +9,16 @@
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+
 import crypto.analysis.CrySLRulesetSelector.RuleFormat;
 import crypto.cryslhandler.CrySLModelReader;
 import crypto.rules.CrySLRule;
 import crypto.rules.CrySLRuleReader;
 import crypto.rules.StateNode;
 import crypto.rules.TransitionEdge;
-import de.cognicrypt.core.Activator;
 import de.cognicrypt.core.Constants;
-import de.cognicrypt.core.Constants.Rules;
 
 public class CrySLUtils {
 
@@ -72,9 +72,7 @@ public static List<CrySLRule> readCrySLRules() {
 	 */
 
 	public static CrySLRule getCrySLRule(String cryslRule) throws MalformedURLException {
-		File ruleRes = new File(Constants.ECLIPSE_RULES_DIR + Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + 
-								CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString())[CrySLUtils.getRuleVersions(Constants.Rules.JavaCryptographicArchitecture.toString()).length - 1] + 
-								Constants.innerFileSeparator + Constants.Rules.JavaCryptographicArchitecture.toString() + Constants.innerFileSeparator + cryslRule + RuleFormat.SOURCE.toString());
+		File ruleRes = new File(Constants.JCA_LATEST_ECLIPSE_RULES_DIR + Constants.innerFileSeparator + cryslRule + RuleFormat.SOURCE.toString());
 		if (ruleRes == null || !ruleRes.exists() || !ruleRes.canRead()) {
 			ruleRes = Utils.getResourceFromWithin(Constants.RELATIVE_CUSTOM_RULES_DIR + Constants.innerFileSeparator + cryslRule + RuleFormat.SOURCE.toString(), de.cognicrypt.core.Activator.PLUGIN_ID);
 		}