1 files changed, 11 insertions, 16 deletions

diff --git a/src/cppcheckplus/control/MyContorlUtil.java b/src/cppcheckplus/control/MyContorlUtil.java
index acdc9ba..a43d570 100644
--- a/src/cppcheckplus/control/MyContorlUtil.java
+++ b/src/cppcheckplus/control/MyContorlUtil.java
@@ -47,6 +47,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import toolsconfig.ToolsRegistry;
 
 
 /**
@@ -368,7 +369,7 @@ public class MyContorlUtil {
 
     }
 
-    public static void loadToolsRoad(String xml, Main main) {
+    public static void loadToolsRoad(String xml, UIFrame main) {
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             DocumentBuilder db = dbf.newDocumentBuilder();
@@ -389,21 +390,15 @@ public class MyContorlUtil {
                             String para =
                                 MyContorlUtil.getStringAttribute(menu, "para");
 
-                            switch (toolName) {
-                                case "cppcheck":
-                                    main.cppcheckPath = filePath;
-                                    main.paracppcheck = para;
-                                    break;
-                                case "flawfinder":
-                                    main.flawfinderPath = filePath;
-                                    main.paraflawfinder = para;
-                                    break;
-                                case "clang-tidy":
-                                    main.clangtidyPath = filePath;
-                                    main.paraclangtidy = para;
-                                    break;
-                                default:
-                                    break;
+                            try {
+                                Class<?> clazz =
+                                    Class.forName("toolsconfig." + toolName);
+                                Object obj = clazz.getDeclaredConstructor()
+                                    .newInstance();
+                                ToolsRegistry.getTool(toolName)
+                                    .init(filePath, para, main);
+                            } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
                     }