1 files changed, 30 insertions, 29 deletions

diff --git a/src/cppcheckplus/control/Main.java b/src/cppcheckplus/control/Main.java
index 4c84eac..2759e2f 100644
--- a/src/cppcheckplus/control/Main.java
+++ b/src/cppcheckplus/control/Main.java
@@ -64,6 +64,7 @@ public class Main extends JFrame {
     private final MyMenuBar menubar;
     private final JFileChooser jfc = new JFileChooser();// 文件选择器
     private final JFileChooser jfsettings = new JFileChooser();// 配置设定
+    private final String projectPath;
     public MyTabPanel tabPanel;
     // 编辑代码的面板
     public MyTextPanel testCode;
@@ -101,7 +102,6 @@ public class Main extends JFrame {
     //private static String inputResult = "inputResult.txt";
     //private static String errorResult = "errorResult.txt";
     private Main ui;
-    private final String projectPath;
 
     // 构造函数：初始化各个组件，加载配置文件，建立界面布局
     public Main() {
@@ -124,29 +124,28 @@ public class Main extends JFrame {
             public void actionPerformed(ActionEvent e) {
                 String command = e.getActionCommand();
                 switch (command) {
-                    case "OnMenuOpen":
+                    case "onMenuOpen":
                         // 打开文件
-                        jfc.setFileSelectionMode(0);// 设定只能选择到文件
-                        int state = jfc.showOpenDialog(null);
-                        if (state == 1) {
-                            return; // 撤销选择则返回
-                        } else {
-                            result = jfc.getSelectedFile();// result为选择到的文件
-                            src = result.getAbsolutePath();
-                            // 读取文件内容并显示到代码区
-                            textCode.setText(FileTools.readFile(result));
-                            // 如果代码标签页不存在，则创建一个
-                            if (!tabPanel.isSelectTabComponents("代码")) {
-                                tabPanel.addTab("代码", testCode);
-                                tabPanel.isSelectTabComponents("代码");
-                            }
+                        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));
+                        // 如果代码标签页不存在，则创建一个
+                        if (!tabPanel.isSelectTabComponents("代码")) {
+                            tabPanel.addTab("代码", testCode);
+                            tabPanel.isSelectTabComponents("代码");
                         }
                         break;
                     case "onMenuLoad":
                         // 加载目录：选择目录并更新目录树
-                        jfc.setFileSelectionMode(1);// 只能选择到文件夹
-//                    int state = jfc.showOpenDialog(null);
-                        if (jfc.showOpenDialog(null) == 1) {
+                        jfc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                        if (jfc.showOpenDialog(null) ==
+                            JFileChooser.CANCEL_OPTION) {
                             return;
                         }
                         direct = jfc.getSelectedFile();// 选择到的目录
@@ -293,18 +292,19 @@ public class Main extends JFrame {
                         break;
                     case "onSetFlawfinderRoad":
                         // flawfinder路径
-                        jfsettings.setFileSelectionMode(0);// 设定只能选择到文件
+                        jfsettings.setFileSelectionMode(
+                            JFileChooser.FILES_ONLY);// 设定只能选择到文件
 //                    int state = jfsettings.showOpenDialog(null);
-                        if (jfsettings.showOpenDialog(null) == 1) {
+                        if (jfsettings.showOpenDialog(null) ==
+                            JFileChooser.CANCEL_OPTION) {
                             return;// 撤销则返回
-                        } else {
-                            File flawfinderFile = jfsettings.getSelectedFile();
-                            String flawfinderPathTemp =
-                                flawfinderFile.getAbsolutePath();
-                            MyContorlUtil.fixSettingPath(settingsXML,
-                                "flawfinder", flawfinderPathTemp);
-                            changedpathflaw = true;
                         }
+                        File flawfinderFile = jfsettings.getSelectedFile();
+                        String flawfinderPathTemp =
+                            flawfinderFile.getAbsolutePath();
+                        MyContorlUtil.fixSettingPath(settingsXML, "flawfinder",
+                            flawfinderPathTemp);
+                        changedpathflaw = true;
                         break;
                 }
             }
@@ -331,6 +331,7 @@ public class Main extends JFrame {
     }
 
     private void execute(String src, String para) {
+        System.out.println("cppcheckPath:" + cppcheckPath);
         if (changedpathcpp) {
             MyContorlUtil.loadToolsRoad(settingsXML, this);
             changedpathcpp = false;
@@ -618,6 +619,7 @@ public class Main extends JFrame {
     }
 
     private void execute3(String src, String para, String tmpFileName) {
+        System.out.println("flawfinderPath:" + flawfinderPath);
         // flawfinder
         if (changedpathflaw) {
             MyContorlUtil.loadToolsRoad(settingsXML, this);
@@ -792,7 +794,6 @@ public class Main extends JFrame {
                 String command = e.getActionCommand();
                 System.out.println("Head:" + command);
             }
-
         }, new ListSelectionListener() {
             @Override
             public void valueChanged(ListSelectionEvent e) {