1 files changed, 44 insertions, 104 deletions

diff --git a/src/cppcheckplus/control/UIFrame.java b/src/cppcheckplus/control/UIFrame.java
index bb15707..499d056 100644
--- a/src/cppcheckplus/control/UIFrame.java
+++ b/src/cppcheckplus/control/UIFrame.java
@@ -34,19 +34,19 @@ import javax.swing.JTextArea;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.plaf.TabbedPaneUI;
+import toolsconfig.ToolsConfig;
 import toolsconfig.ToolsRegistry;
 
-
 // 构造界面
 public class UIFrame extends JFrame {
+    public final MyMenuBar mymenubar;
     // XML配置文件路径
-    private final String menuBarXML;
-    private final String outlookPanelXML;
-    private final String settingsXML;
-    private final String stdclangXML;
+    private final String menuBarXML = "cppcheckplus/control/menubar.xml";
+    private final String outlookPanelXML = "cppcheckplus/control/outlook.xml";
+    private final String settingsXML = "toolsconfig/settings.xml";
+    private final String stdclangXML = "cppcheckplus/control/stdclang.xml";
     // 界面组件
     private final MyContentPanel contentPanel;
-    private final MyMenuBar menubar;
     private final JFileChooser jfc = new JFileChooser();// 文件选择器
     private final JFileChooser jfsettings = new JFileChooser();// 配置设定
     private final String projectPath;
@@ -57,50 +57,39 @@ public class UIFrame extends JFrame {
     public creatTable ct = new creatTable(); // 生成表格
     public TextArea textCheck;// 显示检查进度输出
     private MyOutlookPanel outlookPanel;
-    private MyTabPanel1 footTabPanel;
+    private MyTabPanel1 footTabPanel; // 底部标签页
     private MyShortcutPanel shortcutPanel;
     private MyTree tree;
     private MyTextPanel1 testPanel;
     private ViewPanel viewPanel;
-    // 显示代码和检查进程的文本区域
     private JTextArea textCode;// 显示代码内容
-    // 文件操作相关
-    private File result; // 存储打开的文件
+
     private File report; // 导出报告时选择的文件
-    private File dir;  // 存储打开的目录
 
-    // 构造函数：初始化各个组件，加载配置文件，建立界面布局
     public UIFrame() {
         projectPath = System.getProperty("user.dir");
         // 文件选择器初始目录
         jfc.setCurrentDirectory(new File("d://"));
         jfsettings.setCurrentDirectory(new File("d://"));
 
-        // 配置文件路径
-        menuBarXML = "cppcheckplus/control/menubar.xml";
-        outlookPanelXML = "cppcheckplus/control/outlook.xml";
-        settingsXML = "toolsconfig/settings.xml";
-        stdclangXML = "cppcheckplus/control/stdclang.xml";
-
-        MyContorlUtil.loadToolsRoad(settingsXML, this);// 加载工具路径设置到当前对象中
         ct.initSTDClang(stdclangXML);// 设置clang配置
 
         // 加载菜单栏，注册事件监听
-        menubar = MyContorlUtil.loadMenuBar(menuBarXML, new ActionListener() {
+        mymenubar = MyContorlUtil.loadMenuBar(menuBarXML, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 String command = e.getActionCommand();
+                File res = null;
                 switch (command) {
                     case "onMenuOpen":
-                        // 打开文件
                         jfc.setFileSelectionMode(JFileChooser.FILES_ONLY);
                         if (jfc.showOpenDialog(null) ==
                             JFileChooser.CANCEL_OPTION) {
                             return;
                         }
-                        result = jfc.getSelectedFile();// result为选择到的文件
-                        src = result.getAbsolutePath();
-                        // 读取文件内容并显示到代码区
-                        textCode.setText(FileTools.readFile(result));
+                        res = jfc.getSelectedFile();
+                        src = res.getAbsolutePath();
+                        textCode.setText(
+                            FileTools.readFile(res)); // 读取文件内容并显示到代码区
                         // 如果代码标签页不存在，则创建一个
                         if (!centerTabPanel.isSelectTabComponents("代码")) {
                             centerTabPanel.addTab("代码", testCode);
@@ -114,14 +103,15 @@ public class UIFrame extends JFrame {
                             JFileChooser.CANCEL_OPTION) {
                             return;
                         }
-                        dir = jfc.getSelectedFile();// 选择到的目录
-                        src = dir.getAbsolutePath();
-                        tree.setRootDir(dir);// 更新目录树
+                        res = jfc.getSelectedFile();
+                        src = res.getAbsolutePath();
+                        tree.setRootDir(res);// 更新目录树
                         break;
                     case "onMenuSave":
-                        // 保存文件
-                        if (result != null) {
-                            FileTools.writeFile(result, textCode.getText());
+                        if (res != null && res.isFile()) {
+                            FileTools.writeFile(res, textCode.getText());
+                            JOptionPane.showMessageDialog(null, "保存成功",
+                                "提示", 2);
                         }
                         break;
                     case "onMenuClose":
@@ -148,51 +138,10 @@ public class UIFrame extends JFrame {
                         if (r == JFileChooser.APPROVE_OPTION) {
                             report = dialog.getSelectedFile();
                             FileTools.writeFile(report, ct.results);
-                        } else {
-                            JOptionPane.showMessageDialog(null, "路径错误",
+                            JOptionPane.showMessageDialog(null, "导出成功",
                                 "提示", 2);
-                        }
-                        break;
-                    case "onCppcheck":
-                        // cppcheck检查
-                        if (src != null && src.length() != 0) {
-                            new Thread() {
-                                public void run() {
-                                    ToolsRegistry.executeTool("cppcheck", src);
-                                    viewResult("cppcheck");
-                                }
-                            }.start();
                         } else {
-                            JOptionPane.showMessageDialog(null, "目标路径错误",
-                                "提示", 2);
-                        }
-                        break;
-                    case "onClang":
-                        // clang/clang-tidy检查
-                        if (src != null && src.length() != 0) {
-                            new Thread() {
-                                public void run() {
-                                    ToolsRegistry.executeTool("clangTidy", src);
-                                    viewResult("clangTidy");
-                                }
-                            }.start();
-                        } else {
-                            JOptionPane.showMessageDialog(null, "目标路径错误",
-                                "提示", 2);
-                        }
-                        break;
-                    case "onFlawfinder":
-                        // flawfinder检查
-                        if (src != null && src.length() != 0) {
-                            new Thread() {
-                                public void run() {
-                                    ToolsRegistry.executeTool("flawfinder",
-                                        src);
-                                    viewResult("flawfinder");
-                                }
-                            }.start();
-                        } else {
-                            JOptionPane.showMessageDialog(null, "目标路径错误",
+                            JOptionPane.showMessageDialog(null, "路径错误",
                                 "提示", 2);
                         }
                         break;
@@ -240,37 +189,28 @@ public class UIFrame extends JFrame {
                             viewPanel.update(ct.results);
                         }
                         break;
-                    case "onSetCppcheckRoad":
-                        // cppcheck路径
-                        jfsettings.setFileSelectionMode(
-                            JFileChooser.FILES_ONLY);
-                        if (jfsettings.showOpenDialog(null) ==
-                            JFileChooser.CANCEL_OPTION) {
-                            return;
-                        } else {
-                            File cppcheckFile = jfsettings.getSelectedFile();
-                            String cppcheckPathTemp =
-                                cppcheckFile.getAbsolutePath();
-                            MyContorlUtil.fixSettingPath(settingsXML,
-                                "cppcheck", cppcheckPathTemp);
-//                            changedpathcpp = true;
-                        }
+                    default:
+                        System.out.println("未知命令");
                         break;
-                    case "onSetFlawfinderRoad":
-                        // flawfinder路径
-                        jfsettings.setFileSelectionMode(
-                            JFileChooser.FILES_ONLY);
-                        if (jfsettings.showOpenDialog(null) ==
-                            JFileChooser.CANCEL_OPTION) {
-                            return;// 撤销则返回
+                }
+            }
+        });
+
+        MyContorlUtil.loadToolsRoad(settingsXML, this, new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String toolName = e.getActionCommand();
+                if (src != null && src.length() != 0) {
+                    new Thread() {
+                        public void run() {
+                            ct.clearall();
+                            ToolsRegistry.executeTool(toolName, src);
+                            viewResult(toolName);
                         }
-                        File flawfinderFile = jfsettings.getSelectedFile();
-                        String flawfinderPathTemp =
-                            flawfinderFile.getAbsolutePath();
-                        MyContorlUtil.fixSettingPath(settingsXML, "flawfinder",
-                            flawfinderPathTemp);
-//                        changedpathflaw = true;
-                        break;
+                    }.start();
+                } else {
+                    JOptionPane.showMessageDialog(null, "目标路径错误", "提示",
+                        2);
                 }
             }
         });
@@ -293,7 +233,7 @@ public class UIFrame extends JFrame {
         setIconImage(MyContorlUtil.getImage("control/images/logo2.png"));
         setContentPane(contentPanel);
         // 菜单栏在最上方
-        contentPanel.add(menubar, "North");
+        contentPanel.add(mymenubar, "North");
 
         // 除却菜单栏之外的面板
         //JPanel centerPane = new JPanel(new BorderLayout());