1 files changed, 20 insertions, 98 deletions

diff --git a/src/cppcheckplus/control/MyContorlUtil.java b/src/cppcheckplus/control/MyContorlUtil.java
index e7e3d07..8befdc7 100644
--- a/src/cppcheckplus/control/MyContorlUtil.java
+++ b/src/cppcheckplus/control/MyContorlUtil.java
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import javax.imageio.ImageIO;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -35,7 +36,6 @@ import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 import javax.swing.plaf.FontUIResource;
 import javax.xml.parsers.DocumentBuilder;
@@ -48,7 +48,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import toolsconfig.ToolsConfig;
+import org.yaml.snakeyaml.Yaml;
 import toolsconfig.ToolsRegistry;
 
 
@@ -318,116 +318,38 @@ public class MyContorlUtil {
         return menuBar;
     }
 
-
-    public static void fixSettingPath(String xml, String tool, String newPath) {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document doc = db.parse(MyContorlUtil.getXMLFile(xml));
-            Element root = doc.getDocumentElement();
-            NodeList tools = root.getChildNodes();
-            if (tools != null) {
-                for (int i = 0; i < tools.getLength(); i++) {
-                    org.w3c.dom.Node menu = tools.item(i);
-                    if (menu.getNodeType() == Node.ELEMENT_NODE) {
-                        if (menu.getNodeName().equalsIgnoreCase("tool")) {
-                            org.w3c.dom.Node att =
-                                menu.getAttributes().getNamedItem("id");
-                            String toolName =
-                                MyContorlUtil.getStringAttribute(menu,
-                                    "toolName");
-                            if (tool.equals("cppcheck") &&
-                                toolName.equals("cppcheck")) {
-                                org.w3c.dom.Node attribute =
-                                    menu.getAttributes()
-                                        .getNamedItem("filePath");
-                                if (attribute != null) {
-                                    attribute.setNodeValue(
-                                        newPath.replaceAll("\\\\", "\\/"));
-                                }
-                            } else if (tool.equals("flawfinder") &&
-                                toolName.equals("flawfinder")) {
-                                org.w3c.dom.Node attribute =
-                                    menu.getAttributes()
-                                        .getNamedItem("filePath");
-                                if (attribute != null) {
-                                    attribute.setNodeValue(
-                                        newPath.replaceAll("\\\\", "\\/"));
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            Transformer transformer =
-                TransformerFactory.newInstance().newTransformer();
-            DOMSource source = new DOMSource(doc);
-            File file = new File(ClassLoader.getSystemResource(xml).toURI());
-            FileOutputStream outstream =
-                new FileOutputStream("src/cppcheckplus/control/settings.xml");
-            StreamResult reslut = new StreamResult(outstream);
-            transformer.transform(source, reslut);
-            outstream.close();
-
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
     public static void loadToolsRoad(String xml, UIFrame ui,
                                      ActionListener action) {
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document doc = db.parse(MyContorlUtil.getXMLFile(xml));
-            Element root = doc.getDocumentElement();
-            NodeList tools = root.getChildNodes();
+        Yaml yaml = new Yaml();
 
+        try (InputStream input = Main.class.getClassLoader()
+            .getResourceAsStream(xml)) {
+            Map<String, Object> data = yaml.load(input);
             MyRootMenu checkBar = new MyRootMenu();
-            String toolName, filePath, para;
-            MyMenuItem menuItem;
-            if (tools == null) {
-                // 弹窗提示
-                JOptionPane.showMessageDialog(null, "Error: 工具配置文件未找到",
-                    "提示", 2);
-                return;
-            }
-            for (int i = 0; i < tools.getLength(); i++) {
-                org.w3c.dom.Node menu = tools.item(i);
-                if (menu.getNodeType() != Node.ELEMENT_NODE ||
-                    !menu.getNodeName().equalsIgnoreCase("tool")) {
-                    continue;
-                }
-                toolName = MyContorlUtil.getStringAttribute(menu, "toolName");
-                filePath = MyContorlUtil.getStringAttribute(menu, "filePath");
-                para = MyContorlUtil.getStringAttribute(menu, "para");
-
-                ToolsConfig tool = ToolsRegistry.getTool(toolName);
-                if (tool != null) {
-                    tool.init(filePath, para, ui);
-                    continue;
-                }
+            // 遍历map的所有key-value
+            data.forEach((key, value) -> {
+                Map<String, Object> tool = (Map<String, Object>) value;
                 try {
-                    Class<?> clazz = Class.forName("toolsconfig." + toolName);
+                    Class<?> clazz = Class.forName("toolsconfig." + key);
                     Object obj = clazz.getDeclaredConstructor().newInstance();
-                    ToolsRegistry.getTool(toolName).init(filePath, para, ui);
+                    ToolsRegistry.getTool(key).init(tool.get("path").toString(),
+                        tool.get("params").toString(), ui);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                menuItem = new MyMenuItem();
-                menuItem.setText(toolName);
-                menuItem.setToolTipText(toolName);
-                menuItem.setActionCommand(toolName);
+                MyMenuItem menuItem = new MyMenuItem();
+                menuItem.setText(key);
+                menuItem.setToolTipText(key);
+                menuItem.setActionCommand(key);
 
                 menuItem.addActionListener(action);
                 checkBar.add(menuItem);
-            }
+            });
 
-            checkBar.setText("检���工具");
+            checkBar.setText("检���工具");
             ui.mymenubar.add(checkBar, 1);
-        } catch (Exception ex) {
-            ex.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }