1 files changed, 77 insertions, 55 deletions

diff --git a/src/cppcheckplus/control/MyContorlUtil.java b/src/cppcheckplus/control/MyContorlUtil.java
index a43d570..e7e3d07 100644
--- a/src/cppcheckplus/control/MyContorlUtil.java
+++ b/src/cppcheckplus/control/MyContorlUtil.java
@@ -35,6 +35,7 @@ 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;
@@ -47,6 +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 toolsconfig.ToolsRegistry;
 
 
@@ -270,38 +272,43 @@ public class MyContorlUtil {
     public static MyMenuBar loadMenuBar(String xml, ActionListener action) {
         MyMenuBar menuBar = null;
         try {
+            // 初始化XML解析器
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             DocumentBuilder db = dbf.newDocumentBuilder();
+            // 解析XML文件
             Document doc = db.parse(MyContorlUtil.getXMLFile(xml));
             Element root = doc.getDocumentElement();
             NodeList rootMenus = root.getChildNodes();
-            if (rootMenus != null) {
-                menuBar = new MyMenuBar();
-                for (int i = 0; i < rootMenus.getLength(); i++) {
-                    org.w3c.dom.Node menu = rootMenus.item(i);
-                    if (menu.getNodeType() == Node.ELEMENT_NODE) {
-                        if (menu.getNodeName().equalsIgnoreCase("menu")) {
-                            String text =
-                                MyContorlUtil.getStringAttribute(menu, "text");
-                            MyRootMenu rootMenu = new MyRootMenu();
-                            rootMenu.setText(text);
-                            menuBar.add(rootMenu);
-                            processMenuItem(menu, rootMenu, action);
-                        }
-                        if (menu.getNodeName().equalsIgnoreCase("logo")) {
-                            String tooltip =
-                                MyContorlUtil.getStringAttribute(menu,
-                                    "tooltip");
-                            String imageURL =
-                                MyContorlUtil.getStringAttribute(menu, "image");
-                            menuBar.add(Box.createGlue());
-                            JLabel label = new JLabel(
-                                MyContorlUtil.getImageIcon(imageURL));
-                            label.setBorder(
-                                BorderFactory.createEmptyBorder(0, 5, 0, 5));
-                            label.setToolTipText(tooltip);
-                            menuBar.add(label);
-                        }
+            if (rootMenus == null) {
+                return null;
+            }
+
+            menuBar = new MyMenuBar();
+            // 遍历
+            for (int i = 0; i < rootMenus.getLength(); i++) {
+                org.w3c.dom.Node menu = rootMenus.item(i);
+                if (menu.getNodeType() == Node.ELEMENT_NODE) {
+                    if (menu.getNodeName().equalsIgnoreCase("menu")) {
+                        // 菜单一级节点
+                        String text =
+                            MyContorlUtil.getStringAttribute(menu, "text");
+                        MyRootMenu rootMenu = new MyRootMenu();
+                        rootMenu.setText(text); // 以text作为菜单名
+                        menuBar.add(rootMenu);
+                        processMenuItem(menu, rootMenu, action);
+                    } else if (menu.getNodeName().equalsIgnoreCase("logo")) {
+                        // 总菜单栏的logo
+                        String tooltip =
+                            MyContorlUtil.getStringAttribute(menu, "tooltip");
+                        String imageURL =
+                            MyContorlUtil.getStringAttribute(menu, "image");
+                        menuBar.add(Box.createGlue());
+                        JLabel label =
+                            new JLabel(MyContorlUtil.getImageIcon(imageURL));
+                        label.setBorder(
+                            BorderFactory.createEmptyBorder(0, 5, 0, 5));
+                        label.setToolTipText(tooltip);
+                        menuBar.add(label);
                     }
                 }
             }
@@ -366,44 +373,59 @@ public class MyContorlUtil {
         } catch (Exception ex) {
             ex.printStackTrace();
         }
-
     }
 
-    public static void loadToolsRoad(String xml, UIFrame main) {
+    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();
-            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")) {
-                            String toolName =
-                                MyContorlUtil.getStringAttribute(menu,
-                                    "toolName");
-                            String filePath =
-                                MyContorlUtil.getStringAttribute(menu,
-                                    "filePath");
-                            String para =
-                                MyContorlUtil.getStringAttribute(menu, "para");
-
-                            try {
-                                Class<?> clazz =
-                                    Class.forName("toolsconfig." + toolName);
-                                Object obj = clazz.getDeclaredConstructor()
-                                    .newInstance();
-                                ToolsRegistry.getTool(toolName)
-                                    .init(filePath, para, main);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
+
+            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;
                 }
+                try {
+                    Class<?> clazz = Class.forName("toolsconfig." + toolName);
+                    Object obj = clazz.getDeclaredConstructor().newInstance();
+                    ToolsRegistry.getTool(toolName).init(filePath, para, ui);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                menuItem = new MyMenuItem();
+                menuItem.setText(toolName);
+                menuItem.setToolTipText(toolName);
+                menuItem.setActionCommand(toolName);
+
+                menuItem.addActionListener(action);
+                checkBar.add(menuItem);
             }
+
+            checkBar.setText("检测工具");
+            ui.mymenubar.add(checkBar, 1);
         } catch (Exception ex) {
             ex.printStackTrace();
         }