修复小bug

Adream-Studio · Jun 8, 2018 · bc2e37c · bc2e37c
1 parent 92cb0a8
commit bc2e37c
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 53 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/out/artifacts/fileBlender/fileBlender.jar b/out/artifacts/fileBlender/fileBlender.jar
diff --git a/out/production/fileBlender/Controller.class b/out/production/fileBlender/Controller.class
diff --git a/out/production/fileBlender/Launcher.class b/out/production/fileBlender/Launcher.class
diff --git a/src/Controller.java b/src/Controller.java
@@ -44,10 +44,10 @@ private String[] getBlocks(int type){
         String splitter;
         if( type == 1 ){
             textArea = text1;
-            splitter = splitter1.getText()==null ? "\n" : splitter1.getText();
+            splitter = splitter1.getText().equals("") ? "\n" : splitter1.getText();
         }else{
             textArea = text2;
-            splitter = splitter2.getText()==null ? "\n" : splitter2.getText();
+            splitter = splitter2.getText().equals("") ? "\n" : splitter2.getText();
         }
 
         String[] temp;

diff --git a/src/Launcher.java b/src/Launcher.java
@@ -1,6 +1,6 @@
 public class Launcher {
     public static void main(String[] args){
         Controller fileBlender = new Controller();
-        fileBlender.start("文件混合器 v0.2");
+        fileBlender.start("文件混合器 v0.2.1");
     }
 }