优化跨平台性。

Author: xuxiaoyan

src/main/java/com/xwintop/xJavaFxTool/controller/littleTools/LinuxPathToWindowsPathController.java

@@ -4,6 +4,7 @@
 import java.net.URL;
 import java.util.ResourceBundle;
 
+import com.sun.jna.Platform;
 import org.apache.commons.io.FileUtils;
 
 import com.xwintop.xcore.util.javafx.AlertUtil;
@@ -27,59 +28,63 @@
  */
 
 public class LinuxPathToWindowsPathController implements Initializable {
-	@FXML
-	private TextField textFieldLinuxPath;
-	@FXML
-	private ChoiceBox<String> choiceBoxChooseLUN;
-	@FXML
-	private Button buttonCreateWindowsPath;
-	@FXML
-	private TextField textFieldWindowsPath;
-	@FXML
-	private Button buttonCreateLinuxPath;
+    @FXML
+    private TextField textFieldLinuxPath;
+    @FXML
+    private ChoiceBox<String> choiceBoxChooseLUN;
+    @FXML
+    private Button buttonCreateWindowsPath;
+    @FXML
+    private TextField textFieldWindowsPath;
+    @FXML
+    private Button buttonCreateLinuxPath;
 
-	@Override
-	public void initialize(URL location, ResourceBundle resources) {
-		initView();
-		initEvent();
-	}
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        initView();
+        initEvent();
+    }
 
-	private void initView() {
-		ObservableList<String> observableList = choiceBoxChooseLUN.getItems();
-		for (char c = 'A'; c <= 'Z'; c++) {
-			String dirName = c + ":/";
-			File win = new File(dirName);
-			if (win.exists()) {
-				observableList.add(dirName);
-			}
-		}
-		choiceBoxChooseLUN.setValue(observableList.get(0));
-	}
-	
-	private void initEvent() {
-		textFieldLinuxPath.setOnKeyReleased(new EventHandler<KeyEvent>() {
-			@Override
-			public void handle(KeyEvent event) {
-				if(event.getCode() == KeyCode.ENTER){
-					createWindowsPath(null);
-		        }
-			}
-		});
-	}
+    private void initView() {
+        if (Platform.isWindows()) {
+            ObservableList<String> observableList = choiceBoxChooseLUN.getItems();
+            for (char c = 'A'; c <= 'Z'; c++) {
+                String dirName = c + ":/";
+                File win = new File(dirName);
+                if (win.exists()) {
+                    observableList.add(dirName);
+                }
+            }
+        } else {
+            choiceBoxChooseLUN.getItems().add("/");
+        }
+        choiceBoxChooseLUN.setValue(choiceBoxChooseLUN.getItems().get(0));
+    }
 
-	@FXML
-	private void createWindowsPath(ActionEvent event){
-		try {
-			String folderPath = choiceBoxChooseLUN.getValue()+textFieldLinuxPath.getText();
-			FileUtils.forceMkdir(new File(folderPath));
-			textFieldWindowsPath.setText(folderPath);
-		} catch (Exception e) {
-			AlertUtil.showWarnAlert("转换异常，请检查路径。");
-		}
-	}
+    private void initEvent() {
+        textFieldLinuxPath.setOnKeyReleased(new EventHandler<KeyEvent>() {
+            @Override
+            public void handle(KeyEvent event) {
+                if (event.getCode() == KeyCode.ENTER) {
+                    createWindowsPath(null);
+                }
+            }
+        });
+    }
 
-	@FXML
-	private void createLinuxPath(ActionEvent event) {
-	}
+    @FXML
+    private void createWindowsPath(ActionEvent event) {
+        try {
+            String folderPath = choiceBoxChooseLUN.getValue() + textFieldLinuxPath.getText();
+            FileUtils.forceMkdir(new File(folderPath));
+            textFieldWindowsPath.setText(folderPath);
+        } catch (Exception e) {
+            AlertUtil.showWarnAlert("转换异常，请检查路径。");
+        }
+    }
+
+    @FXML
+    private void createLinuxPath(ActionEvent event) {
+    }
 
 }

src/main/java/com/xwintop/xJavaFxTool/utils/JavaFxViewUtil.java

@@ -34,6 +34,7 @@
 import org.apache.commons.lang3.reflect.MethodUtils;
 
 import java.awt.*;
+import java.lang.reflect.Method;
 import java.text.DecimalFormat;
 import java.util.HashMap;
 import java.util.Map;
@@ -140,9 +141,12 @@ public static Stage getNewStage(String title, String iconUrl, FXMLLoader fXMLLoa
     //设置窗口移除前回调
     public static void setControllerOnCloseRequest(Object controller, Event event) {
         try {
-            MethodUtils.invokeMethod(controller, "onCloseRequest", event);
+            Method method = MethodUtils.getAccessibleMethod(controller.getClass(), "onCloseRequest", event.getClass());
+            if (method != null) {
+                MethodUtils.invokeMethod(controller, "onCloseRequest", event);
+            }
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error("执行onCloseRequest方法失败", e);
         }
     }
 

src/main/java/com/xwintop/xJavaFxTool/utils/XJavaFxSystemUtil.java

@@ -1,6 +1,7 @@
 package com.xwintop.xJavaFxTool.utils;
 
 import com.xwintop.xJavaFxTool.model.ToolFxmlLoaderConfiguration;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
@@ -35,9 +36,8 @@
  * @author: xufeng
  * @date: 2017年11月10日 下午4:35:17
  */
+@Slf4j
 public class XJavaFxSystemUtil {
-    private static Logger log = Logger.getLogger(XJavaFxSystemUtil.class);
-
     /**
      * @Title: initSystemLocal
      * @Description: 初始化本地语言