From bc2e37c5f7d8801a343575f48dcfff3727c2b489 Mon Sep 17 00:00:00 2001
From: Joe Nahm <joenahm@yeah.net>
Date: Fri, 8 Jun 2018 11:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                         | 106 +++++++++++---------
 out/artifacts/fileBlender/fileBlender.jar   | Bin 38996 -> 38970 bytes
 out/production/fileBlender/Controller.class | Bin 6066 -> 6076 bytes
 out/production/fileBlender/Launcher.class   | Bin 517 -> 519 bytes
 src/Controller.java                         |   4 +-
 src/Launcher.java                           |   2 +-
 6 files changed, 59 insertions(+), 53 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 49e7f23..288071e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,34 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f7300846-e7b3-4d19-af89-ae95824bf5ca" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/artifacts/fileBlender.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/fileBlender.iml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller$AddFile.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller$Blend.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller$ExportFile.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller$OpenLink.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller$SetEncoding.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller$UpdateBlockNum.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/out/production/fileBlender/Launcher.class" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Controller.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Launcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/META-INF/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/META-INF/MANIFEST.MF" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/out/artifacts/fileBlender/fileBlender.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/fileBlender/fileBlender.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm$AddFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm$Blend.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm$ExportFile.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm$OpenLink.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm$SetEncoding.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm$UpdateLines.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/mainForm.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/fileBlender/mainForm.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mainForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/mainForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/mainForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/mainForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/Controller.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/fileBlender/Controller.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/fileBlender/Launcher.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/fileBlender/Launcher.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Controller.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Controller.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Launcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Launcher.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -54,11 +32,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Launcher.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Launcher.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Launcher.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="6" selection-start-line="6" selection-end-line="6" />
+            <state relative-caret-position="57">
+              <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -66,8 +44,8 @@
       <file leaf-file-name="Controller.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Controller.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="323">
-              <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+            <state relative-caret-position="361">
+              <caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -75,7 +53,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="mainForm.form" pinned="false" current-in-tab="true">
+      <file leaf-file-name="mainForm.form" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/mainForm.form">
           <provider selected="true" editor-type-id="ui-designer" />
         </entry>
@@ -95,10 +73,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/Launcher.java" />
         <option value="$PROJECT_DIR$/src/mainForm.java" />
-        <option value="$PROJECT_DIR$/src/Controller.java" />
         <option value="$PROJECT_DIR$/src/mainForm.form" />
+        <option value="$PROJECT_DIR$/src/Controller.java" />
+        <option value="$PROJECT_DIR$/src/Launcher.java" />
       </list>
     </option>
   </component>
@@ -122,8 +100,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="AndroidView" />
-      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -141,6 +117,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -234,11 +212,12 @@
       <workItem from="1528418028264" duration="3942000" />
       <workItem from="1528422009932" duration="266000" />
       <workItem from="1528422293706" duration="116000" />
+      <workItem from="1528427293344" duration="112000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4324000" />
+    <option name="totallyTimeSpent" value="4436000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1920" height="1034" extended-state="6" />
@@ -257,7 +236,7 @@
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.3295325" />
       <window_info id="Capture Tool" order="2" />
       <window_info id="Designer" order="2" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1076759" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.108742006" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -333,6 +312,33 @@
     <entry file="file://$PROJECT_DIR$/src/mainForm.form">
       <provider selected="true" editor-type-id="ui-designer" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/mainForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="380">
+          <caret line="20" column="35" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Launcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Controller.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/mainForm.form">
+      <provider selected="true" editor-type-id="ui-designer" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/mainForm.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -360,13 +366,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Launcher.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/mainForm.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="380">
@@ -374,18 +373,25 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/mainForm.form">
+      <provider selected="true" editor-type-id="ui-designer" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/Controller.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+        <state relative-caret-position="361">
+          <caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/mainForm.form">
-      <provider selected="true" editor-type-id="ui-designer" />
+    <entry file="file://$PROJECT_DIR$/src/Launcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="57">
+          <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
+        </state>
+      </provider>
     </entry>
   </component>
   <component name="masterDetails">
diff --git a/out/artifacts/fileBlender/fileBlender.jar b/out/artifacts/fileBlender/fileBlender.jar
index 30864b20191942de047811816e833dd99a362e09..dd35b7a7d8eb93229c0081292b1525526e0631cc 100644
GIT binary patch
delta 3763
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
Z&Th<I!ba2@21586C6vrb@*wWo_kUe6<TU^Q

delta 3812
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
Rrb&{6Wlra#Kqj5%{RfsN@m>G`

diff --git a/out/production/fileBlender/Controller.class b/out/production/fileBlender/Controller.class
index ce993b98f3445e5f50f370ae372478abaf70480b..27ebb91fa0cdb2b948b632325352e4609e0a92d7 100644
GIT binary patch
delta 478
zcmdm_zej(<16eKxV}|P-3^zC#0vK*`0f}4e47a%$&N5sD%541W!Nhobvm0|Ji#h`j
zqdcPmBLgEB52GTZG!H{1Llq-~KvrT|qJB<dUb=p8Nl|8A`sQowLM)Tjc$6l;<hI@H
z&hv{oqJ)8&fsKKIp+TBu0fV~M76vt6AfdC3L03p`8-xB#1`Z*E<qTX<F~8*uDnO<-
zNR1&DH6SrRE$QtHMw9ym#KerPSR`4Pfrgm`FK6Hd(Yo6hOegOakgL~ZFl5kUFk<jx
zFk=X0FlPv3uwaN`uw+PLuwuwyux2P`uw|%aZ~*cd7}6NHfKZ+xhas1Ni9rqM;yj>Q
zW`;;0&SxlKU;*mjhO&S@VMu030qO#=3K@zR7=iW#LG^-c1M8Im8V=JO$e<6ju84t^
wp#-SOih*<T3?bRc69t_e$PEFwPep{TG8#>OCG?z8Z}KH!V@8wBY$9uz0kFVmv;Y7A

delta 500
zcmZXQxi3Uf6vltod(Sh^NO&mhOC}P-7{)$AG?u~^8ihzKkr4Z!^&g1jRaClZ6c`x|
zwMuDM==cLPgv5Cau@v_^=iKjn=iK`p2M>aq_XQpXxU>YWOs*}?IJc<bCWTvx`)}Pz
z>N?h`P3wlTysF4KHuIB<Rf&Swg=y=K$J^#Srk2LKz0cbE3>wM6TAsc`ssE6&UV+Lu
zfm2fKswh^X?2A$)X@yG%f75Q+=g&K$y1~dcw(+R29>te!$jB`HgqpCPqiZrVG!!Mx
zje$6|?&aRPtkxJ4Y#>cAfI$@&L45M1azeBV(?ugaG%-js!-N^7g=t!e2s<vSDN$JD
zGRquEl*q(+Mg;riEU<_!iqu3VUuA+xQMp;i63ZxA)SD2y>psPiZ*iAACn9|YD<TTx
zc_qhWwbNwn1?`ngXCq^vy)I7u)<4gDKRvVm^n4ii<%d&fpQ~!;$$n6E&Ru4$3dPd1
GcC~km>1JO5

diff --git a/out/production/fileBlender/Launcher.class b/out/production/fileBlender/Launcher.class
index 7b360fb7da13551b771f7394f0cadc2ea87b8a73..770bd66ed3b026be29997bb888d47eb397633480 100644
GIT binary patch
delta 35
tcmV+;0NnqD1cwB$0Ra~l=9Y)#ySC=Hx8;zC<(a4;b}%k7E-{l90q-6h58(g+

delta 33
rcmV++0N($H1cd~!0Ra^h=9Y)#ySC=Hx8;zC<(a4;b}%k7lNbT-|JDzH

diff --git a/src/Controller.java b/src/Controller.java
index cf97041..c628d61 100644
--- 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
index b21021c..b512f43 100644
--- 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");
     }
 }