From d139cbe3c57c83aec776928b029966301e65c8f2 Mon Sep 17 00:00:00 2001 From: yangsuiyu Date: Fri, 28 Aug 2020 23:20:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8DIDEA=E4=B8=AD=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=8A=A0=E8=BD=BDresources=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E7=9A=84Bug=EF=BC=9B2.=E4=BF=AE=E6=94=B9=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80Demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 6 ++--- README.md | 6 ++--- pom.xml | 26 +++++++++++++++---- .../ChineseController.java | 4 +-- .../EnglishController.java | 4 +-- .../KoreanController.java | 4 +-- .../LanguageDemo.java | 4 +-- .../edu/scau/biubiusuisui/utils/FileUtil.java | 8 ++++-- .../scau/biubiusuisui/utils/StringUtil.java | 6 ++--- .../langDemo.fxml} | 0 .../langDemo_en.properties} | 0 .../langDemo_ko.properties} | 0 .../langDemo_zh_CN.properties} | 0 .../fxml/lifeDemo/dialog_zh_CN.properties | 2 +- .../fxml/lifeDemo/subBar_zh_CN.properties | 2 +- 15 files changed, 46 insertions(+), 26 deletions(-) rename src/main/java/cn/edu/scau/biubiusuisui/example/{languageDemo => langDemo}/ChineseController.java (84%) rename src/main/java/cn/edu/scau/biubiusuisui/example/{languageDemo => langDemo}/EnglishController.java (85%) rename src/main/java/cn/edu/scau/biubiusuisui/example/{languageDemo => langDemo}/KoreanController.java (85%) rename src/main/java/cn/edu/scau/biubiusuisui/example/{languageDemo => langDemo}/LanguageDemo.java (79%) rename src/main/resources/fxml/{languageDemo/languageDemo.fxml => langDemo/langDemo.fxml} (100%) rename src/main/resources/fxml/{languageDemo/languageDemo_en.properties => langDemo/langDemo_en.properties} (100%) rename src/main/resources/fxml/{languageDemo/languageDemo_ko.properties => langDemo/langDemo_ko.properties} (100%) rename src/main/resources/fxml/{languageDemo/languageDemo_zh_CN.properties => langDemo/langDemo_zh_CN.properties} (100%) diff --git a/README.en.md b/README.en.md index 6ce9901..3409f70 100644 --- a/README.en.md +++ b/README.en.md @@ -936,7 +936,7 @@ When an FXController needs to be internationalized and localized, you need to ad ```java @FXWindow(mainStage = true, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.SIMPLIFIED_CHINESE) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.SIMPLIFIED_CHINESE) public class ChineseController extends FXBaseController { @FXML public void clickToOtherLanguage() { @@ -952,7 +952,7 @@ public class ChineseController extends FXBaseController { ```java @FXWindow(mainStage = false, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.ENGLISH) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.ENGLISH) public class EnglishController extends FXBaseController { @FXML public void clickToOtherLanguage() { @@ -1024,7 +1024,7 @@ register.email=\u90ae\u7bb1 #### Example -The sample code is in `cn.edu.scau.biubiusuisui.example.languageDemo`, the running result as follows: +The sample code is in `cn.edu.scau.biubiusuisui.example.langDemo`, the running result as follows: ![language_demo](README.en/language_demo.gif) diff --git a/README.md b/README.md index 3a852f3..a35f6b0 100644 --- a/README.md +++ b/README.md @@ -962,7 +962,7 @@ public enum FXPlusLocale { ```java @FXWindow(mainStage = true, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.SIMPLIFIED_CHINESE) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.SIMPLIFIED_CHINESE) public class ChineseController extends FXBaseController { @FXML public void clickToOtherLanguage() { @@ -978,7 +978,7 @@ public class ChineseController extends FXBaseController { ```java @FXWindow(mainStage = false, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.ENGLISH) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.ENGLISH) public class EnglishController extends FXBaseController { @FXML public void clickToOtherLanguage() { @@ -1050,7 +1050,7 @@ register.email=\u90ae\u7bb1 #### 示例演示 -示例代码在`cn.edu.scau.biubiusuisui.example.languageDemo`中，运行可得： +示例代码在`cn.edu.scau.biubiusuisui.example.langDemo`中，运行可得： ![language_demo](README/language_demo.gif) diff --git a/pom.xml b/pom.xml index 9f91cb2..541a3ef 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,8 @@ com.gitee.Biubiuyuyu javafx-plus 1.2.0-RELEASE - pom - + + org.sonatype.oss @@ -31,13 +31,14 @@ - + cglib cglib 3.1 + junit junit @@ -45,7 +46,7 @@ test - + org.slf4j slf4j-log4j12 @@ -56,10 +57,24 @@ tomcat-embed-core 9.0.29 - + + + + src/main/resources + + + src/main/java + + **/*.properties + **/*.xml + **/*.fxml + + true + + org.apache.maven.plugins @@ -67,6 +82,7 @@ 1.8 1.8 + UTF-8 -Xlint:deprecation diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/ChineseController.java b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/ChineseController.java similarity index 84% rename from src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/ChineseController.java rename to src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/ChineseController.java index d8f05fe..c1dd03e 100644 --- a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/ChineseController.java +++ b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/ChineseController.java @@ -1,4 +1,4 @@ -package cn.edu.scau.biubiusuisui.example.languageDemo; +package cn.edu.scau.biubiusuisui.example.langDemo; import cn.edu.scau.biubiusuisui.annotation.FXController; import cn.edu.scau.biubiusuisui.annotation.FXRedirect; @@ -15,7 +15,7 @@ import javafx.fxml.FXML; * @since JDK1.8 */ @FXWindow(mainStage = true, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.SIMPLIFIED_CHINESE) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.SIMPLIFIED_CHINESE) public class ChineseController extends FXBaseController { @FXML public void clickToChinese() { diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/EnglishController.java b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/EnglishController.java similarity index 85% rename from src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/EnglishController.java rename to src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/EnglishController.java index 1ee96a2..95ef72f 100644 --- a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/EnglishController.java +++ b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/EnglishController.java @@ -1,4 +1,4 @@ -package cn.edu.scau.biubiusuisui.example.languageDemo; +package cn.edu.scau.biubiusuisui.example.langDemo; import cn.edu.scau.biubiusuisui.annotation.FXController; import cn.edu.scau.biubiusuisui.annotation.FXRedirect; @@ -14,7 +14,7 @@ import javafx.fxml.FXML; * @since JDK1.8 */ @FXWindow(mainStage = false, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.ENGLISH) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.ENGLISH) public class EnglishController extends FXBaseController { @FXML public void clickToChinese() { diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/KoreanController.java b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/KoreanController.java similarity index 85% rename from src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/KoreanController.java rename to src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/KoreanController.java index e45c5df..373f08b 100644 --- a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/KoreanController.java +++ b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/KoreanController.java @@ -1,4 +1,4 @@ -package cn.edu.scau.biubiusuisui.example.languageDemo; +package cn.edu.scau.biubiusuisui.example.langDemo; import cn.edu.scau.biubiusuisui.annotation.FXController; import cn.edu.scau.biubiusuisui.annotation.FXRedirect; @@ -14,7 +14,7 @@ import javafx.fxml.FXML; * @since JDK1.8 */ @FXWindow(mainStage = false, title = "languageDemo") -@FXController(path = "fxml/languageDemo/languageDemo.fxml", locale = FXPlusLocale.KOREAN) +@FXController(path = "fxml/langDemo/langDemo.fxml", locale = FXPlusLocale.KOREAN) public class KoreanController extends FXBaseController { @FXML public void clickToChinese() { diff --git a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/LanguageDemo.java b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/LanguageDemo.java similarity index 79% rename from src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/LanguageDemo.java rename to src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/LanguageDemo.java index b239ce1..d610437 100644 --- a/src/main/java/cn/edu/scau/biubiusuisui/example/languageDemo/LanguageDemo.java +++ b/src/main/java/cn/edu/scau/biubiusuisui/example/langDemo/LanguageDemo.java @@ -1,4 +1,4 @@ -package cn.edu.scau.biubiusuisui.example.languageDemo; +package cn.edu.scau.biubiusuisui.example.langDemo; import cn.edu.scau.biubiusuisui.annotation.FXScan; import cn.edu.scau.biubiusuisui.config.FXPlusApplication; @@ -11,7 +11,7 @@ import javafx.stage.Stage; * @date 2020/5/3 09:57 * @since JDK1.8 */ -@FXScan(base = "cn.edu.scau.biubiusuisui.example.languageDemo") +@FXScan(base = "cn.edu.scau.biubiusuisui.example.langDemo") public class LanguageDemo extends Application { @Override public void start(Stage primaryStage) throws Exception { diff --git a/src/main/java/cn/edu/scau/biubiusuisui/utils/FileUtil.java b/src/main/java/cn/edu/scau/biubiusuisui/utils/FileUtil.java index 42033d2..7bd00e9 100644 --- a/src/main/java/cn/edu/scau/biubiusuisui/utils/FileUtil.java +++ b/src/main/java/cn/edu/scau/biubiusuisui/utils/FileUtil.java @@ -34,8 +34,12 @@ public class FileUtil { * @description 读取resources文件夹下的file，相对于resources的文件路径，如 resources/config.conf 则只需 config.conf */ public static String readFileFromResources(String filePath) { - String path = StringUtil.getRootPath(FileUtil.class.getClassLoader().getResource(filePath)); - return readFile(path); + URL url = FileUtil.class.getClassLoader().getResource(filePath); + if (url != null) { + String path = StringUtil.getRootPath(url); + return readFile(path); + } + return ""; } /** diff --git a/src/main/java/cn/edu/scau/biubiusuisui/utils/StringUtil.java b/src/main/java/cn/edu/scau/biubiusuisui/utils/StringUtil.java index 92dd7a6..5047fb0 100644 --- a/src/main/java/cn/edu/scau/biubiusuisui/utils/StringUtil.java +++ b/src/main/java/cn/edu/scau/biubiusuisui/utils/StringUtil.java @@ -119,7 +119,7 @@ public class StringUtil { } /** - * cn/edu/scau/biubiusuisui/resources/fxml/languageDemo/languageDemo.fxml -> fxml/languageDemo/languageDemo.fxml + * cn/edu/scau/biubiusuisui/resources/fxml/languageDemo/langDemo.fxml -> fxml/languageDemo/langDemo.fxml * * @param name * @return @@ -135,7 +135,7 @@ public class StringUtil { } /** - * cn/edu/scau/biubiusuisui/resources/fxml/languageDemo/languageDemo.fxml -> languageDemo + * cn/edu/scau/biubiusuisui/resources/fxml/languageDemo/langDemo.fxml -> languageDemo * * @param name 文件名 * @return @@ -144,7 +144,7 @@ public class StringUtil { public static String getFileBaseName(String name) { String result = ""; String[] tempStrs = name.split("/"); - if (1 == tempStrs.length) { //只有文件名，即name: languageDemo.fxml + if (1 == tempStrs.length) { //只有文件名，即name: langDemo.fxml result = StringUtil.trimExtension(name); } else { result = StringUtil.trimExtension(tempStrs[tempStrs.length - 1]); diff --git a/src/main/resources/fxml/languageDemo/languageDemo.fxml b/src/main/resources/fxml/langDemo/langDemo.fxml similarity index 100% rename from src/main/resources/fxml/languageDemo/languageDemo.fxml rename to src/main/resources/fxml/langDemo/langDemo.fxml diff --git a/src/main/resources/fxml/languageDemo/languageDemo_en.properties b/src/main/resources/fxml/langDemo/langDemo_en.properties similarity index 100% rename from src/main/resources/fxml/languageDemo/languageDemo_en.properties rename to src/main/resources/fxml/langDemo/langDemo_en.properties diff --git a/src/main/resources/fxml/languageDemo/languageDemo_ko.properties b/src/main/resources/fxml/langDemo/langDemo_ko.properties similarity index 100% rename from src/main/resources/fxml/languageDemo/languageDemo_ko.properties rename to src/main/resources/fxml/langDemo/langDemo_ko.properties diff --git a/src/main/resources/fxml/languageDemo/languageDemo_zh_CN.properties b/src/main/resources/fxml/langDemo/langDemo_zh_CN.properties similarity index 100% rename from src/main/resources/fxml/languageDemo/languageDemo_zh_CN.properties rename to src/main/resources/fxml/langDemo/langDemo_zh_CN.properties diff --git a/src/main/resources/fxml/lifeDemo/dialog_zh_CN.properties b/src/main/resources/fxml/lifeDemo/dialog_zh_CN.properties index 6cbaf6e..e8840a3 100644 --- a/src/main/resources/fxml/lifeDemo/dialog_zh_CN.properties +++ b/src/main/resources/fxml/lifeDemo/dialog_zh_CN.properties @@ -1 +1 @@ -dialog=弹窗 \ No newline at end of file +dialog=\u5f39\u7a97 \ No newline at end of file diff --git a/src/main/resources/fxml/lifeDemo/subBar_zh_CN.properties b/src/main/resources/fxml/lifeDemo/subBar_zh_CN.properties index 384e36b..f7126ad 100644 --- a/src/main/resources/fxml/lifeDemo/subBar_zh_CN.properties +++ b/src/main/resources/fxml/lifeDemo/subBar_zh_CN.properties @@ -1 +1 @@ -childrenController=子组件 \ No newline at end of file +childrenController=\u5b50\u7ec4\u4ef6 \ No newline at end of file