提交: fc17f353d1b02377d0ee332359e3e65c3c7a6334 - TextKeyMatcher (git)

テキストの各行をキーと値に分離し、複数テキストファイルを読み込み、キーを突き合わせ照合し、その結果を表示するGUIユーテリティです。

Commit MetaInfo

• 修訂: fc17f353d1b02377d0ee332359e3e65c3c7a6334 (tree)
• 時間: 2011-10-12 23:50:11
• 作者: seraphy <seraphy@192....>
• Commiter: seraphy

Log Message

リファクタリングとコメント

Change Summary

• add: src/textkeymatcher/entity/KeyMatchedRowView.java
• delete: src/textkeymatcher/entity/{KeyMatchedDataModel.java => KeyMatchedRowMap.java}
• modified: src/textkeymatcher/ui/ImportDataDialog.form
• modified: src/textkeymatcher/ui/ImportDataDialog.java
• modified: src/textkeymatcher/ui/model/DataViewTableModel.java
• modified: src/textkeymatcher/ui/model/ImportDataDialogModel.java
• modified: src/textkeymatcher/ui/resources/ImportDataDialog.properties
• modified: src/textkeymatcher/ui/resources/ImportDataDialog_ja_JP.properties

差異

--- a/src/textkeymatcher/entity/KeyMatchedDataModel.java
+++ b/src/textkeymatcher/entity/KeyMatchedRowMap.java
@@ -4,27 +4,45 @@
  */
 package textkeymatcher.entity;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 import java.util.TreeMap;
+import textkeymatcher.entity.KeyMatchedRowMap.RowKey;
+import textkeymatcher.entity.KeyMatchedRowMap.RowValues;
 import textkeymatcher.service.KeyMatcher;
 
 /**
- *
+ * 各カラムデータと、キーによるマッチングを行い、キーと値リストの組にする.<br>
  * @author seraphy
  */
-public class KeyMatchedDataModel {
+public class KeyMatchedRowMap extends AbstractMap<RowKey, RowValues> {
 
+    /**
+     * データソースのコレクション.<br>
+     */
     private ArrayList<LineDataList> lineDataLists = new ArrayList<LineDataList>();
     
     
+    /**
+     * 行のキー表現
+     */
     public static class RowKey implements Comparable<RowKey> {
         
+        /**
+         * キー判定方法
+         */
         private final KeyMatcher keyMatcher;
         
+        /**
+         * キーの生データ
+         */
         private final String key;
+
         
         public RowKey(KeyMatcher keyMatcher, String key) {
             if (keyMatcher == null) {
@@ -65,6 +83,10 @@ public class KeyMatchedDataModel {
             return false;
         }
         
+        /**
+         * キーのマッチング法に従った文字列表現
+         * @return 文字列表現
+         */
         @Override
         public String toString() {
             return keyMatcher.getNormalize(key);
@@ -72,14 +94,41 @@ public class KeyMatchedDataModel {
     }
     
     
+    /**
+     * データソースごとの値のリスト.<br>
+     */
     public static class RowValues {
         
+        /**
+         * データソースごとのデータを入れる配列.<br>
+         * データソースごとに添字を指定する.<br>
+         * 単一データであれば文字列が入り、複数データであれば文字列のリストオブジェクトが入る.<br>
+         * 該当がなければ、nullとなる.<br>
+         */
         private Object[] datas;
-        
+
+        /**
+         * データソース数を指定して構築する.
+         * @param dataWidth データソース数
+         */
         public RowValues(int dataWidth) {
             this.datas = new Object[dataWidth];
         }
         
+        /**
+         * データソース数を取得する
+         * @return データソース数
+         */
+        public int getDataWidth() {
+            return datas.length;
+        }
+        
+        /**
+         * データソースと、値を指定してデータをセットする.<br>
+         * 同じデータソースですでにデータがある場合はリストとして追加される.<br>
+         * @param column データソース添字
+         * @param value データ、nullは空文字として登録される
+         */
         public void add(int column, String value) {
             if (value == null) {
                 value = "";
@@ -104,6 +153,11 @@ public class KeyMatchedDataModel {
             }
         }
         
+        /**
+         * 各データソースの中の最大のデータ数.<br>
+         * すべてのデータソースにひとつもデータがなければ0となる.<br>
+         * @return 最大のデータ数
+         */
         public int getMaxCount() {
             int mx = 0;
             int dataWidth = datas.length;
@@ -116,6 +170,11 @@ public class KeyMatchedDataModel {
             return mx;
         }
         
+        /**
+         * 指定したデータソースのデータの個数を返す.
+         * @param column 添字
+         * @return データの個数、未登録ならば0
+         */
         public int getCount(int column) {
             if (column < 0 || column >= datas.length) {
                 // 範囲外、データがないので0を返す.
@@ -128,10 +187,21 @@ public class KeyMatchedDataModel {
                 List<String> lst = (List<String>) datas[column];
                 return lst.size();
             }
-            // リストでなければ単一要素なので1を返す
-            return 1;
+            // 非nullで、リストでなければ単一要素なので1を返す
+            if (data != null) {
+                return 1;
+            }
+            // nullであればデータは未設定なので0
+            return 0;
         }
         
+        /**
+         * 指定したデータソースの指定した番号のデータを取り出す.<br>
+         * 範囲外、もしくはデータ未登録である場合は空文字が返される.<br>
+         * @param column データソース番号
+         * @param rowIndex データのインデックス、getCountで得られる個数分
+         * @return データ、無し、もしくは範囲外の場合は空文字
+         */
         public String get(int column, int rowIndex) {
             if (column < 0 || column >= datas.length) {
                 return "";
@@ -161,8 +231,16 @@ public class KeyMatchedDataModel {
     }
     
     
+    /**
+     * キーの判定方法を示すキーマッチャ
+     */
     private KeyMatcher keyMatcher = KeyMatcher.TEXT;
     
+    /**
+     * キーの判定方法を設定する.<br>
+     * 設定後は{@link #remap() }を呼び出して再構築しないかぎり反映されない.<br>
+     * @param keyMatcher 
+     */
     public void setKeyMatcher(KeyMatcher keyMatcher) {
         if (keyMatcher == null) {
             throw new IllegalArgumentException();
@@ -171,16 +249,28 @@ public class KeyMatchedDataModel {
         this.keyMatcher = keyMatcher;
     }
     
+    /**
+     * キーの判定方法を取得する.
+     * @return 
+     */
     public KeyMatcher getKeyMatcher() {
         return keyMatcher;
     }
 
     
     
+    /**
+     * データソース数を返す.<br>
+     * @return データソース数
+     */
     public int getNumOfLineDataLists() {
         return lineDataLists.size();
     }
-    
+
+    /**
+     * データソースを追加する.
+     * @param lineDataList データソース 
+     */
     public void addLineDataList(LineDataList lineDataList) {
         if (lineDataList == null) {
             throw new IllegalArgumentException();
@@ -188,42 +278,44 @@ public class KeyMatchedDataModel {
         lineDataLists.add(lineDataList);
     }
     
+    /**
+     * データソースを削除する.
+     * @param idx データソース
+     */
     public void removeLineDataList(int idx) {
         lineDataLists.remove(idx);
     }
-    
+
+    /**
+     * 指定されたインデックスのデータソースを取得する
+     * @param idx インデックス
+     * @return データソース
+     */
     public LineDataList getLineDataList(int idx) {
         return lineDataLists.get(idx);
     }
-    
+
+    /**
+     * データソースのタイトルを取得する.<br>
+     * タイトル自身はデータソースが保持しているため、これはアクセスヘルパである.<br>
+     * @param columnIndex データソースのインデックス
+     * @return タイトル
+     */
     public String getTitle(int columnIndex) {
         return getLineDataList(columnIndex).getTitle();
     }
     
-    public int getRowCount() {
-        return rowNumMaps.size();
-    }
-    
-    public String getKeyAt(int rowIndex) {
-        if (rowIndex < 0 || rowIndex >= rowNumMaps.size()) {
-            return null;
-        }
-        return rowNumMaps.get(rowIndex).getRowKey().toString();
-    }
-    
-    public String getValueAt(int rowIndex, int columnIndex) {
-        if (rowIndex < 0 || rowIndex >= rowNumMaps.size()) {
-            return null;
-        }
-        RowNumMap rowNumMap = rowNumMaps.get(rowIndex);
-        RowValues rowValues = rowNumMap.getRowValues();
-        int rowNumber = rowNumMap.getRowNumber();
-        return rowValues.get(columnIndex, rowNumber);
-    }
     
 
+    /**
+     * キーと値のリストに選別されたデータ表現
+     */
     private Map<RowKey, RowValues> dataMap = Collections.emptyMap();
     
+    
+    /**
+     * データソースをキーに従って分類しマッピングする.<br>
+     */
     public void remap() {
         TreeMap<RowKey, RowValues> map = new TreeMap<RowKey, RowValues>();
         
@@ -257,45 +349,14 @@ public class KeyMatchedDataModel {
         this.dataMap = map;
     }
 
-    private static class RowNumMap {
-        
-        private final RowKey rowKey;
-        
-        private final RowValues rowValues;
-        
-        private final int rowNumber;
-        
-        public RowNumMap(RowKey rowKey, RowValues rowValues, int rowNumber) {
-            this.rowKey = rowKey;
-            this.rowValues = rowValues;
-            this.rowNumber = rowNumber;
-        }
-        
-        public RowKey getRowKey() {
-            return rowKey;
-        }
-        
-        public RowValues getRowValues() {
-            return rowValues;
-        }
-        
-        public int getRowNumber() {
-            return rowNumber;
-        }
-    }
-    
-    private List<RowNumMap> rowNumMaps = Collections.emptyList();
     
-    public void renumber() {
-        ArrayList<RowNumMap> rows = new ArrayList<RowNumMap>();
-        for (Map.Entry<RowKey, RowValues> entry : dataMap.entrySet()) {
-            RowKey rowKey = entry.getKey();
-            RowValues rowValues = entry.getValue();
-            int numOfRows = rowValues.getMaxCount();
-            for (int rowNumber = 0; rowNumber < numOfRows; rowNumber++) {
-                rows.add(new RowNumMap(rowKey, rowValues, rowNumber));
-            }
-        }
-        this.rowNumMaps = rows;
+    @Override
+    public Set<Entry<RowKey, RowValues>> entrySet() {
+        return dataMap.entrySet();
+    }
+
+    @Override
+    public int size() {
+        return dataMap.size();
     }
 }

--- /dev/null
+++ b/src/textkeymatcher/entity/KeyMatchedRowView.java
@@ -0,0 +1,189 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package textkeymatcher.entity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import javax.swing.table.AbstractTableModel;
+import textkeymatcher.entity.KeyMatchedRowMap.RowKey;
+import textkeymatcher.entity.KeyMatchedRowMap.RowValues;
+
+/**
+ * データソースをキーと値に分解し、キーごとに集約されたデータマップから、
+ * テーブル形式のグリッド状態にデータを展開する.<br>
+ * ひとつのキーに複数の値がある場合、同じキーの行が個数分だけ展開されます.<br>
+ * 列はキーと各データソース分となります.<br>
+ * @author seraphy
+ */
+public class KeyMatchedRowView extends AbstractTableModel {
+      
+    /**
+     * RowKeyとRowValuesへのアクセス方法を示すオブジェクト.<br>
+     */
+    private static class RowNumMap {
+
+        /**
+         * キー｀
+         */
+        private final RowKey rowKey;
+        
+        /**
+         * 各データソースごとの値のセット
+         */
+        private final RowValues rowValues;
+        
+        /**
+         * 値が複数行ある場合の行番号(0ベース)
+         * 単一であれば0となる.
+         */
+        private final int rowNumber;
+        
+
+        public RowNumMap(RowKey rowKey, RowValues rowValues, int rowNumber) {
+            this.rowKey = rowKey;
+            this.rowValues = rowValues;
+            this.rowNumber = rowNumber;
+        }
+        
+        public RowKey getRowKey() {
+            return rowKey;
+        }
+        
+        public RowValues getRowValues() {
+            return rowValues;
+        }
+        
+        public int getRowNumber() {
+            return rowNumber;
+        }
+    }
+    
+    
+    /**
+     * 行データのリスト.<br>
+     * 各要素に列データへのアクセス方法が格納されている.<br>
+     */
+    private List<RowNumMap> rowNumMaps = Collections.emptyList();
+    
+    /**
+     * 列数
+     */
+    private int numOfColumns;
+    
+
+    /**
+     * 行数
+     * @return 
+     */
+    @Override
+    public int getRowCount() {
+        return rowNumMaps.size();
+    }
+
+    /**
+     * 指定した行のキーデータ(キー判定方法による文字列表現)を取得します.<br>
+     * @param rowIndex 行
+     * @return キーデータ｀
+     */
+    public String getKeyAt(int rowIndex) {
+        if (rowIndex < 0 || rowIndex >= rowNumMaps.size()) {
+            return null;
+        }
+        return rowNumMaps.get(rowIndex).getRowKey().toString();
+    }
+    
+    /**
+     * 指定した行のデータ部を取得します.<br>
+     * @param rowIndex 行
+     * @param columnIndex データ列
+     * @return データ、なければ空文字
+     */
+    public String getDataAt(int rowIndex, int columnIndex) {
+        if (rowIndex < 0 || rowIndex >= rowNumMaps.size()) {
+            return null;
+        }
+        RowNumMap rowNumMap = rowNumMaps.get(rowIndex);
+        RowValues rowValues = rowNumMap.getRowValues();
+        int rowNumber = rowNumMap.getRowNumber();
+        return rowValues.get(columnIndex, rowNumber);
+    }
+
+    /**
+     * 第一列をキー、それ以降をデータ列として1つのテーブルのカラムとしてアクセスする.<br>
+     * @param rowIndex 行
+     * @param columnIndex 列、0はキー、それ以降はデータ列
+     * @return キーまたはデータの文字列、該当ない場合は空文字
+     */
+    @Override
+    public String getValueAt(int rowIndex, int columnIndex) {
+        if (rowIndex < 0 || rowIndex >= rowNumMaps.size()) {
+            return null;
+        }
+        if (columnIndex == 0) {
+            return getKeyAt(rowIndex);
+        }
+        return getDataAt(rowIndex, columnIndex - 1);
+    }
+
+    /**
+     * キーおよび列のデータ型.<br>
+     * すべてStringである.<br>
+     * @param i 列、0列はキー、それ以降はデータ列
+     * @return 列のデータ形式
+     */
+    @Override
+    public Class<?> getColumnClass(int i) {
+        return String.class;
+    }
+
+    /**
+     * キー列 + データ列数を返す.<br>
+     * @return 列数
+     */
+    @Override
+    public int getColumnCount() {
+        return 1 + numOfColumns;
+    }
+    
+
+    /**
+     * データマップに従って、あらたしくグリッドを生成しなおします.<br>
+     * @param dataMap データマップ
+     */
+    public void renumbering(Map<RowKey, RowValues> dataMap) {
+        if (dataMap == null) {
+            throw new IllegalArgumentException();
+        }
+
+        int numOfMaxColumns = 0;
+        ArrayList<RowNumMap> rows = new ArrayList<RowNumMap>();
+        for (Map.Entry<RowKey, RowValues> entry : dataMap.entrySet()) {
+            RowKey rowKey = entry.getKey();
+            RowValues rowValues = entry.getValue();
+
+            // このキーに対していくつのデータソースが存在するのか?
+            // (最大列数の決定のため)
+            int dataWidth = rowValues.getDataWidth();
+            if (numOfMaxColumns < dataWidth) {
+                numOfMaxColumns = dataWidth;
+            }
+
+            // このキーに対して最大何行のデータがついているか?
+            int numOfRows = rowValues.getMaxCount();
+            
+            // 行数分だけ同じキーを繰り返す.
+            for (int rowNumber = 0; rowNumber < numOfRows; rowNumber++) {
+                rows.add(new RowNumMap(rowKey, rowValues, rowNumber));
+            }
+        }
+        
+        this.rowNumMaps = rows;
+        this.numOfColumns = numOfMaxColumns;
+        
+        fireTableStructureChanged();
+    }
+}

--- a/src/textkeymatcher/ui/ImportDataDialog.form
+++ b/src/textkeymatcher/ui/ImportDataDialog.form
@@ -39,34 +39,33 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
+          <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="titleTextField" pref="343" max="32767" attributes="0"/>
+              <Component id="titleTextField" pref="356" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
-          <Component id="inputSourcePanel" alignment="0" max="32767" attributes="1"/>
+          <Component id="btnPanel" alignment="0" pref="475" max="32767" attributes="0"/>
+          <Component id="KeyValueColumnPanel" alignment="0" max="32767" attributes="0"/>
           <Component id="dataFormatPanel" alignment="0" max="32767" attributes="1"/>
-          <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
-          <Component id="btnPanel" alignment="0" pref="462" max="32767" attributes="0"/>
+          <Component id="inputSourcePanel" alignment="0" max="32767" attributes="1"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="1" attributes="0">
-              <EmptySpace max="32767" attributes="0"/>
+          <Group type="102" alignment="0" attributes="0">
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="titleTextField" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="inputSourcePanel" min="-2" pref="206" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="inputSourcePanel" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="dataFormatPanel" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="KeyValueColumnPanel" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="btnPanel" min="-2" max="-2" attributes="0"/>
           </Group>
       </Group>
@@ -93,7 +92,7 @@
                   <Group type="103" groupAlignment="0" attributes="0">
                       <Group type="102" alignment="1" attributes="0">
                           <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
-                          <Component id="directTextAreaSP" pref="384" max="32767" attributes="0"/>
+                          <Component id="directTextAreaSP" pref="397" max="32767" attributes="0"/>
                       </Group>
                       <Component id="loadTextRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Group type="102" alignment="0" attributes="0">
@@ -102,9 +101,9 @@
                               <Group type="102" alignment="0" attributes="0">
                                   <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace type="separate" max="-2" attributes="0"/>
-                                  <Component id="charsetComboBox" pref="213" max="32767" attributes="0"/>
+                                  <Component id="charsetComboBox" pref="226" max="32767" attributes="0"/>
                               </Group>
-                              <Component id="loadFileTextField" pref="300" max="32767" attributes="0"/>
+                              <Component id="loadFileTextField" pref="313" max="32767" attributes="0"/>
                           </Group>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="loadFileButton" min="-2" max="-2" attributes="0"/>
@@ -132,8 +131,8 @@
                   <EmptySpace type="unrelated" max="-2" attributes="0"/>
                   <Component id="directRadioButton" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="directTextAreaSP" min="-2" pref="48" max="-2" attributes="0"/>
-                  <EmptySpace pref="10" max="32767" attributes="0"/>
+                  <Component id="directTextAreaSP" max="32767" attributes="0"/>
+                  <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -163,6 +162,9 @@
         </Component>
         <Component class="javax.swing.JButton" name="loadFileButton">
           <Properties>
+            <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+              <action class="textkeymatcher.ui.ImportDataDialog" id="onBrowseFile" methodName="onBrowseFile"/>
+            </Property>
             <Property name="text" type="java.lang.String" resourceKey="loadFileButton.text"/>
             <Property name="name" type="java.lang.String" value="loadFileButton" noResource="true"/>
           </Properties>
@@ -242,14 +244,14 @@
                               <Group type="102" alignment="0" attributes="0">
                                   <Component id="simpleSplitRadioButton" min="-2" max="-2" attributes="0"/>
                                   <EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
-                                  <Component id="simpleSplitComboBox" pref="265" max="32767" attributes="0"/>
+                                  <Component id="simpleSplitComboBox" pref="278" max="32767" attributes="0"/>
                               </Group>
                               <Component id="regularExpRadioButton" alignment="0" min="-2" max="-2" attributes="0"/>
                           </Group>
                       </Group>
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="-2" pref="39" max="-2" attributes="0"/>
-                          <Component id="regularExpTextField" pref="391" max="32767" attributes="0"/>
+                          <Component id="regularExpTextField" pref="404" max="32767" attributes="0"/>
                       </Group>
                   </Group>
                   <EmptySpace max="-2" attributes="0"/>
@@ -381,16 +383,16 @@
         </Component>
       </SubComponents>
     </Container>
-    <Container class="javax.swing.JPanel" name="jPanel1">
+    <Container class="javax.swing.JPanel" name="KeyValueColumnPanel">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-            <TitledBorder title="&#x30ad;&#x30fc;&#x30fb;&#x30c7;&#x30fc;&#x30bf;&#x5217;&#x306e;&#x6307;&#x5b9a;">
-              <Property name="titleX" resourceKey="jPanel1.border.title"/>
+            <TitledBorder title="&#x30ad;&#x30fc;&#x30fb;&#x5024;&#x306e;&#x30ab;&#x30e9;&#x30e0;">
+              <Property name="titleX" resourceKey="KeyValueColumnPanel.border.title"/>
             </TitledBorder>
           </Border>
         </Property>
-        <Property name="name" type="java.lang.String" value="jPanel1" noResource="true"/>
+        <Property name="name" type="java.lang.String" value="KeyValueColumnPanel" noResource="true"/>
       </Properties>
 
       <Layout>
@@ -400,14 +402,14 @@
                   <EmptySpace max="-2" attributes="0"/>
                   <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                   <EmptySpace type="separate" max="-2" attributes="0"/>
-                  <Component id="keyColumnSpinner" pref="77" max="32767" attributes="0"/>
-                  <EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
-                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                  <Component id="valueColumnSpinner" pref="77" max="32767" attributes="0"/>
+                  <Component id="keyColumnSpinner" min="-2" pref="63" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
+                  <Component id="valueColumnSpinner" min="-2" pref="58" max="-2" attributes="0"/>
+                  <EmptySpace type="separate" max="-2" attributes="0"/>
                   <Component id="fullLineCheckBox" min="-2" max="-2" attributes="0"/>
-                  <EmptySpace pref="36" max="32767" attributes="0"/>
+                  <EmptySpace pref="104" max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -420,8 +422,8 @@
                           <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="fullLineCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <Component id="valueColumnSpinner" alignment="0" min="-2" max="-2" attributes="0"/>
                       <Component id="keyColumnSpinner" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Component id="valueColumnSpinner" alignment="0" min="-2" max="-2" attributes="0"/>
                   </Group>
                   <EmptySpace max="32767" attributes="0"/>
               </Group>

--- a/src/textkeymatcher/ui/ImportDataDialog.java
+++ b/src/textkeymatcher/ui/ImportDataDialog.java
@@ -13,6 +13,7 @@ package textkeymatcher.ui;
 import java.awt.Component;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
+import java.io.File;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
@@ -22,10 +23,12 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.InputMap;
 import javax.swing.JComponent;
+import javax.swing.JFileChooser;
 import javax.swing.JList;
 import javax.swing.JRootPane;
 import javax.swing.KeyStroke;
 import javax.swing.ListCellRenderer;
+import javax.swing.filechooser.FileFilter;
 import org.apache.commons.lang3.StringUtils;
 import org.jdesktop.application.Action;
 import textkeymatcher.service.PredefinedSimpleSplitCharColumnSplitter;
@@ -131,7 +134,7 @@ public class ImportDataDialog extends javax.swing.JDialog {
         filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 0));
         cancelButton = new javax.swing.JButton();
         importButton = new javax.swing.JButton();
-        jPanel1 = new javax.swing.JPanel();
+        KeyValueColumnPanel = new javax.swing.JPanel();
         jLabel1 = new javax.swing.JLabel();
         jLabel2 = new javax.swing.JLabel();
         fullLineCheckBox = new javax.swing.JCheckBox();
@@ -172,6 +175,8 @@ public class ImportDataDialog extends javax.swing.JDialog {
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, importDataDialogModel, org.jdesktop.beansbinding.ELProperty.create("${sourceFile}"), loadFileTextField, org.jdesktop.beansbinding.BeanProperty.create("text"));
         bindingGroup.addBinding(binding);
 
+        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(textkeymatcher.TextKeyMatcherApp.class).getContext().getActionMap(ImportDataDialog.class, this);
+        loadFileButton.setAction(actionMap.get("onBrowseFile")); // NOI18N
         loadFileButton.setText(resourceMap.getString("loadFileButton.text")); // NOI18N
         loadFileButton.setName("loadFileButton"); // NOI18N
 
@@ -211,7 +216,7 @@ public class ImportDataDialog extends javax.swing.JDialog {
                 .addGroup(inputSourcePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, inputSourcePanelLayout.createSequentialGroup()
                         .addGap(29, 29, 29)
-                        .addComponent(directTextAreaSP, javax.swing.GroupLayout.DEFAULT_SIZE, 384, Short.MAX_VALUE))
+                        .addComponent(directTextAreaSP, javax.swing.GroupLayout.DEFAULT_SIZE, 397, Short.MAX_VALUE))
                     .addComponent(loadTextRadioButton)
                     .addGroup(inputSourcePanelLayout.createSequentialGroup()
                         .addGap(29, 29, 29)
@@ -219,8 +224,8 @@ public class ImportDataDialog extends javax.swing.JDialog {
                             .addGroup(javax.swing.GroupLayout.Alignment.LEADING, inputSourcePanelLayout.createSequentialGroup()
                                 .addComponent(jLabel3)
                                 .addGap(18, 18, 18)
-                                .addComponent(charsetComboBox, 0, 213, Short.MAX_VALUE))
-                            .addComponent(loadFileTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE))
+                                .addComponent(charsetComboBox, 0, 226, Short.MAX_VALUE))
+                            .addComponent(loadFileTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 313, Short.MAX_VALUE))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(loadFileButton))
                     .addComponent(directRadioButton))
@@ -241,8 +246,8 @@ public class ImportDataDialog extends javax.swing.JDialog {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(directRadioButton)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(directTextAreaSP, javax.swing.GroupLayout.PREFERRED_SIZE, 48, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(10, Short.MAX_VALUE))
+                .addComponent(directTextAreaSP)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         dataFormatPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(resourceMap.getString("dataFormatPanel.border.title"))); // NOI18N
@@ -286,11 +291,11 @@ public class ImportDataDialog extends javax.swing.JDialog {
                             .addGroup(dataFormatPanelLayout.createSequentialGroup()
                                 .addComponent(simpleSplitRadioButton)
                                 .addGap(38, 38, 38)
-                                .addComponent(simpleSplitComboBox, 0, 265, Short.MAX_VALUE))
+                                .addComponent(simpleSplitComboBox, 0, 278, Short.MAX_VALUE))
                             .addComponent(regularExpRadioButton)))
                     .addGroup(dataFormatPanelLayout.createSequentialGroup()
                         .addGap(39, 39, 39)
-                        .addComponent(regularExpTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 391, Short.MAX_VALUE)))
+                        .addComponent(regularExpTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 404, Short.MAX_VALUE)))
                 .addContainerGap())
         );
         dataFormatPanelLayout.setVerticalGroup(
@@ -317,7 +322,6 @@ public class ImportDataDialog extends javax.swing.JDialog {
         gridBagConstraints.weightx = 1.0;
         btnPanel.add(filler1, gridBagConstraints);
 
-        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(textkeymatcher.TextKeyMatcherApp.class).getContext().getActionMap(ImportDataDialog.class, this);
         cancelButton.setAction(actionMap.get("onCancel")); // NOI18N
         cancelButton.setText(resourceMap.getString("cancelButton.text")); // NOI18N
         cancelButton.setName("cancelButton"); // NOI18N
@@ -334,8 +338,8 @@ public class ImportDataDialog extends javax.swing.JDialog {
         gridBagConstraints.gridy = 0;
         btnPanel.add(importButton, gridBagConstraints);
 
-        jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(resourceMap.getString("jPanel1.border.title"))); // NOI18N
-        jPanel1.setName("jPanel1"); // NOI18N
+        KeyValueColumnPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(resourceMap.getString("KeyValueColumnPanel.border.title"))); // NOI18N
+        KeyValueColumnPanel.setName("KeyValueColumnPanel"); // NOI18N
 
         jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
@@ -361,33 +365,33 @@ public class ImportDataDialog extends javax.swing.JDialog {
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, importDataDialogModel, org.jdesktop.beansbinding.ELProperty.create("${valueColumn}"), valueColumnSpinner, org.jdesktop.beansbinding.BeanProperty.create("value"));
         bindingGroup.addBinding(binding);
 
-        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
-        jPanel1.setLayout(jPanel1Layout);
-        jPanel1Layout.setHorizontalGroup(
-            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel1Layout.createSequentialGroup()
+        javax.swing.GroupLayout KeyValueColumnPanelLayout = new javax.swing.GroupLayout(KeyValueColumnPanel);
+        KeyValueColumnPanel.setLayout(KeyValueColumnPanelLayout);
+        KeyValueColumnPanelLayout.setHorizontalGroup(
+            KeyValueColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(KeyValueColumnPanelLayout.createSequentialGroup()
                 .addContainerGap()
                 .addComponent(jLabel1)
                 .addGap(18, 18, 18)
-                .addComponent(keyColumnSpinner, javax.swing.GroupLayout.DEFAULT_SIZE, 77, Short.MAX_VALUE)
-                .addGap(32, 32, 32)
-                .addComponent(jLabel2)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(valueColumnSpinner, javax.swing.GroupLayout.DEFAULT_SIZE, 77, Short.MAX_VALUE)
+                .addComponent(keyColumnSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel2)
+                .addGap(2, 2, 2)
+                .addComponent(valueColumnSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, 58, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(18, 18, 18)
                 .addComponent(fullLineCheckBox)
-                .addContainerGap(36, Short.MAX_VALUE))
+                .addContainerGap(104, Short.MAX_VALUE))
         );
-        jPanel1Layout.setVerticalGroup(
-            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel1Layout.createSequentialGroup()
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+        KeyValueColumnPanelLayout.setVerticalGroup(
+            KeyValueColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(KeyValueColumnPanelLayout.createSequentialGroup()
+                .addGroup(KeyValueColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(KeyValueColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                         .addComponent(jLabel1)
                         .addComponent(jLabel2)
                         .addComponent(fullLineCheckBox))
-                    .addComponent(valueColumnSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(keyColumnSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(keyColumnSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(valueColumnSpinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
@@ -407,27 +411,26 @@ public class ImportDataDialog extends javax.swing.JDialog {
                 .addContainerGap()
                 .addComponent(jLabel4)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(titleTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)
+                .addComponent(titleTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 356, Short.MAX_VALUE)
                 .addContainerGap())
-            .addComponent(inputSourcePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(btnPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 475, Short.MAX_VALUE)
+            .addComponent(KeyValueColumnPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .addComponent(dataFormatPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(btnPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 462, Short.MAX_VALUE)
+            .addComponent(inputSourcePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(jLabel4)
                     .addComponent(titleTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(inputSourcePanel, javax.swing.GroupLayout.PREFERRED_SIZE, 206, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(inputSourcePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(dataFormatPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(KeyValueColumnPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(btnPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
 
@@ -504,7 +507,63 @@ public class ImportDataDialog extends javax.swing.JDialog {
         firePropertyChange("enableAccept", old, isEnableAccept());
     }
 
+    
+    /**
+     * テキストファイル拡張子フィルタ
+     */
+    private static final FileFilter TEXT_FILE_FILTER = new FileFilter() {
+
+        @Override
+        public boolean accept(File file) {
+            if (file.isDirectory()) {
+                return true;
+            }
+            String name = file.getName();
+            return name.toLowerCase().endsWith(".txt");
+        }
+
+        @Override
+        public String getDescription() {
+            return "Text (*.txt)";
+        }
+    };
+    
+    /**
+     * 最後に使用したディレクトリ
+     */
+    private File lastUseDirectory;
+    
+    public File getLastUseDirectory() {
+        return lastUseDirectory;
+    }
+    
+    public void setLastUseDirectory(File lastUseDirectory) {
+        this.lastUseDirectory = lastUseDirectory;
+    }
+
+    /**
+     * ファイルを選択する
+     */
+    @Action
+    public void onBrowseFile() {
+        JFileChooser fileChooser = new JFileChooser(lastUseDirectory);
+        fileChooser.setAcceptAllFileFilterUsed(true);
+        fileChooser.addChoosableFileFilter(TEXT_FILE_FILTER);
+        fileChooser.setFileFilter(TEXT_FILE_FILTER);
+        int ret = fileChooser.showOpenDialog(this);
+        if (ret != JFileChooser.APPROVE_OPTION) {
+            // cancel
+            return;
+        }
+        
+        File selectedFile = fileChooser.getSelectedFile();
+        lastUseDirectory = selectedFile.getParentFile();
+
+        importDataDialogModel.setSourceFile(selectedFile.getPath());
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JPanel KeyValueColumnPanel;
     private javax.swing.JPanel btnPanel;
     private javax.swing.JButton cancelButton;
     private javax.swing.JComboBox charsetComboBox;
@@ -523,7 +582,6 @@ public class ImportDataDialog extends javax.swing.JDialog {
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
     private javax.swing.JLabel jLabel4;
-    private javax.swing.JPanel jPanel1;
     private javax.swing.JSpinner keyColumnSpinner;
     private javax.swing.JButton loadFileButton;
     private javax.swing.JTextField loadFileTextField;

--- a/src/textkeymatcher/ui/model/DataViewTableModel.java
+++ b/src/textkeymatcher/ui/model/DataViewTableModel.java
@@ -4,60 +4,34 @@
  */
 package textkeymatcher.ui.model;
 
-import javax.swing.table.AbstractTableModel;
-import textkeymatcher.entity.KeyMatchedDataModel;
+import textkeymatcher.entity.KeyMatchedRowMap;
+import textkeymatcher.entity.KeyMatchedRowView;
 import textkeymatcher.entity.LineDataList;
 
 /**
  *
  * @author seraphy
  */
-public class DataViewTableModel extends AbstractTableModel {
-
-    private KeyMatchedDataModel dataModel = new KeyMatchedDataModel();
+public class DataViewTableModel extends KeyMatchedRowView {
 
+    private KeyMatchedRowMap rowMap = new KeyMatchedRowMap();
+    
     public void addLineDataList(LineDataList lineDataList) {
         if (lineDataList == null) {
             throw new IllegalArgumentException();
         }
-        dataModel.addLineDataList(lineDataList);
-        dataModel.remap();
-        dataModel.renumber();
-        fireTableStructureChanged();
-    }
-    
-    @Override
-    public int getColumnCount() {
-        return 1 + dataModel.getNumOfLineDataLists();
-    }
+        rowMap.addLineDataList(lineDataList);
+        rowMap.remap();
 
-    @Override
-    public Class<?> getColumnClass(int i) {
-        return String.class;
+        renumbering(rowMap);
     }
-
+    
     @Override
     public String getColumnName(int i) {
         if (i == 0) {
             return "Key";
         }
-        int column = i - 1;
-        return dataModel.getTitle(column);
+        int column = i - 1; // 左端はキーカラム固定
+        return rowMap.getTitle(column);
     }
-
-    @Override
-    public int getRowCount() {
-        return dataModel.getRowCount();
-    }
-
-    @Override
-    public Object getValueAt(int rowIndex, int columnIndex) {
-        if (columnIndex == 0) {
-            return dataModel.getKeyAt(rowIndex);
-
-        } else {
-            return dataModel.getValueAt(rowIndex, columnIndex - 1);
-        }
-    }
-    
 }

--- a/src/textkeymatcher/ui/model/ImportDataDialogModel.java
+++ b/src/textkeymatcher/ui/model/ImportDataDialogModel.java
@@ -11,7 +11,7 @@ import org.jdesktop.application.AbstractBean;
 import textkeymatcher.service.PredefinedSimpleSplitCharColumnSplitter;
 
 /**
- *
+ * データインポートダイアログのモデル
  * @author seraphy
  */
 public class ImportDataDialogModel extends AbstractBean {

--- a/src/textkeymatcher/ui/resources/ImportDataDialog.properties
+++ b/src/textkeymatcher/ui/resources/ImportDataDialog.properties
@@ -19,9 +19,11 @@ SIMPLE_SEMICOLON_SPLIT.text=SemiColon
 SIMPLE_ASTER_SPLIT.text=Asterisk
 SINGLE_SPACE_SPLIT.text=Space
 SPACES_SPLIT.text=Spaces
-jPanel1.border.title=\u30ad\u30fc\u30fb\u30c7\u30fc\u30bf\u5217\u306e\u6307\u5b9a
-jLabel1.text=jLabel1
-jLabel2.text=jLabel2
-fullLineCheckBox.text=\u884c\u5168\u4f53
-jLabel3.text=jLabel3
-jLabel4.text=jLabel4
+jLabel1.text=Key
+jLabel2.text=Data
+fullLineCheckBox.text=Line
+jLabel3.text=Charset
+jLabel4.text=Name
+KeyValueColumnPanel.border.title=Columns
+onBrowseFile.Action.shortDescription=
+onBrowseFile.Action.text=

--- a/src/textkeymatcher/ui/resources/ImportDataDialog_ja_JP.properties
+++ b/src/textkeymatcher/ui/resources/ImportDataDialog_ja_JP.properties
@@ -19,9 +19,11 @@ SIMPLE_SEMICOLON_SPLIT.text=\u30bb\u30df\u30b3\u30ed\u30f3\u533a\u5207\u308a
 SIMPLE_ASTER_SPLIT.text=\u30a2\u30b9\u30bf\u30ea\u30b9\u30af\u533a\u5207\u308a
 SINGLE_SPACE_SPLIT.text=\u7a7a\u767d\u533a\u5207\u308a(\u5358\u4e00\u7a7a\u767d)
 SPACES_SPLIT.text=\u7a7a\u767d\u533a\u5207\u308a
-jPanel1.border.title=\u30ad\u30fc\u30fb\u30c7\u30fc\u30bf\u5217\u306e\u6307\u5b9a
 jLabel1.text=\u30ad\u30fc\u5217:
 jLabel2.text=\u30c7\u30fc\u30bf\u5217:
 fullLineCheckBox.text=\u884c\u5168\u4f53
 jLabel3.text=\u6587\u5b57\u30b3\u30fc\u30c9:
 jLabel4.text=\u30c7\u30fc\u30bf\u5217\u540d:
+KeyValueColumnPanel.border.title=\u30ad\u30fc\u30fb\u5024\u306e\u30ab\u30e9\u30e0
+onBrowseFile.Action.text=
+onBrowseFile.Action.shortDescription=