Fuege restliche Analysen zum AnalysisLoader hinzu (noch statisch).

ppati000 · Aug 13, 2017 · 1d5ebbd · 1d5ebbd
1 parent 9be81cb
commit 1d5ebbd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/Implementierung/visual-dfa/src/main/java/dfa/analyses/TaintFactory.java b/Implementierung/visual-dfa/src/main/java/dfa/analyses/TaintFactory.java
@@ -15,7 +15,7 @@ public class TaintFactory extends DFAFactory<TaintElement> {
 
     @Override
     public String getName() {
-        return "taint";
+        return "Taint-Analysis";
     }
 
     @Override

diff --git a/Implementierung/visual-dfa/src/main/java/dfa/framework/AnalysisLoader.java b/Implementierung/visual-dfa/src/main/java/dfa/framework/AnalysisLoader.java
@@ -7,7 +7,10 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import dfa.analyses.ConstantBitsFactory;
 import dfa.analyses.ConstantFoldingFactory;
+import dfa.analyses.ReachingDefinitionsFactory;
+import dfa.analyses.TaintFactory;
 import dfa.analyses.testanalyses.DummyFactory;
 
 public class AnalysisLoader {
@@ -56,17 +59,29 @@ public void loadAnalyses(Logger logger) {
         analysisNames = new LinkedList<String>();
         analyses = new HashMap<String, DFAFactory<? extends LatticeElement>>();
 
-        DummyFactory dummyFactory = new DummyFactory();
-        String dummyName = dummyFactory.getName();
+        //DummyFactory dummyFactory = new DummyFactory();
+        //String dummyName = dummyFactory.getName();
 
         ConstantFoldingFactory cfFactory = new ConstantFoldingFactory();
-        String cfName = cfFactory.getName();
-
-        analysisNames.add(dummyName);
-        analyses.put(dummyName, dummyFactory);
-
-        analysisNames.add(cfName);
-        analyses.put(cfName, cfFactory);
+        ConstantBitsFactory cbFactory = new ConstantBitsFactory();
+        ReachingDefinitionsFactory rdFactory = new ReachingDefinitionsFactory();
+        TaintFactory tFactory = new TaintFactory();
+
+        //analysisNames.add(dummyName);
+        //analyses.put(dummyName, dummyFactory);
+
+
+        analysisNames.add(cfFactory.getName());
+        analyses.put(cfFactory.getName(), cfFactory);
+
+        analysisNames.add(cbFactory.getName());
+        analyses.put(cbFactory.getName(), cbFactory);
+
+        analysisNames.add(rdFactory.getName());
+        analyses.put(rdFactory.getName(), rdFactory);
+
+        analysisNames.add(tFactory.getName());
+        analyses.put(tFactory.getName(), tFactory);
 
         // TODO resolve NoSuchMethodError on Reflections(packageName)
         // or more likely: find another way to load analyses