提交: f430af4474148ef1f60c1cd29d54671edf26b3be - TextKeyMatcher (git)

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

Commit MetaInfo

• 修訂: f430af4474148ef1f60c1cd29d54671edf26b3be (tree)
• 時間: 2011-11-06 03:26:26
• 作者: seraphy <seraphy@dime...>
• Commiter: seraphy

Log Message

・ データのマージ

Change Summary

• modified: src/textkeymatcher/entity/KeyMatchedRowMap.java
• add: src/textkeymatcher/service/LineDataListMergeService.java
• modified: src/textkeymatcher/ui/TextKeyMatcherView.form
• modified: src/textkeymatcher/ui/TextKeyMatcherView.java
• modified: src/textkeymatcher/ui/model/DataViewTableModel.java
• modified: src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
• modified: src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP.properties

差異

--- a/src/textkeymatcher/entity/KeyMatchedRowMap.java
+++ b/src/textkeymatcher/entity/KeyMatchedRowMap.java
@@ -94,6 +94,19 @@ public class KeyMatchedRowMap extends AbstractMap<RowKey, RowValues> {
     public LineDataList getLineDataList(int idx) {
         return lineDataLists.get(idx);
     }
+    
+    /**
+     * 指定されたインデックスのデータソースを設定する.<br>
+     * インデックスは既存のデータの範囲内でなければなりません.<br>
+     * @param idx インデックス
+     * @param lineDataList データソース
+     */
+    public void setLineDataList(int idx, LineDataList lineDataList) {
+        if (lineDataList == null) {
+            throw new IllegalArgumentException();
+        }
+        lineDataLists.set(idx, lineDataList);
+    }
 
     /**
      * データソースのタイトルを取得する.<br>

--- /dev/null
+++ b/src/textkeymatcher/service/LineDataListMergeService.java
@@ -0,0 +1,54 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package textkeymatcher.service;
+
+import java.util.ArrayList;
+import textkeymatcher.entity.AbstractLineDataList;
+import textkeymatcher.entity.LineData;
+import textkeymatcher.entity.LineDataList;
+
+/**
+ * データソースをマージします.<br>
+ * @author seraphy
+ */
+public class LineDataListMergeService {
+    
+    /**
+     * ベースとなるデータソースに、指定したデータソースの内容をマージした結果を返します.<br>
+     * 元となるデータは変更されません.<br>
+     * @param base マージされるデータ
+     * @param source マージするデータ、nullの場合は空とみなす.
+     */
+    public LineDataList merge(final LineDataList base, final LineDataList source) {
+        if (base == null) {
+            throw new IllegalArgumentException();
+        }
+
+        final ArrayList<LineData> results = new ArrayList<LineData>();
+
+        results.addAll(base);
+        if (source != null) {
+            results.addAll(source);
+        }
+        
+        return new AbstractLineDataList() {
+            @Override
+            public String getTitle() {
+                return base.getTitle();
+            }
+
+            @Override
+            public LineData get(int index) {
+                return results.get(index);
+            }
+            
+            @Override
+            public int size() {
+                return results.size();
+            }
+        };
+    }
+    
+}

--- a/src/textkeymatcher/ui/TextKeyMatcherView.form
+++ b/src/textkeymatcher/ui/TextKeyMatcherView.form
@@ -142,7 +142,9 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="mergeMenuItem">
               <Properties>
-                <Property name="mnemonic" type="int" value="77"/>
+                <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+                  <action class="textkeymatcher.ui.TextKeyMatcherView" id="onMergeColumn" methodName="onMergeColumn"/>
+                </Property>
                 <Property name="text" type="java.lang.String" resourceKey="mergeMenuItem.text"/>
                 <Property name="name" type="java.lang.String" value="mergeMenuItem" noResource="true"/>
               </Properties>
@@ -470,6 +472,115 @@
         </Component>
       </SubComponents>
     </Container>
+    <Container class="javax.swing.JPanel" name="confirmMergeColumnPanel">
+      <Properties>
+        <Property name="name" type="java.lang.String" value="confirmMergeColumnPanel" noResource="true"/>
+      </Properties>
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" attributes="0">
+                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Component id="baseColumnCombo" pref="189" max="32767" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                          <Group type="103" groupAlignment="0" attributes="0">
+                              <Component id="removeAfterMergedCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="replaceBaseCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                              <Component id="mergeColumnCombo" alignment="1" pref="195" max="32767" attributes="0"/>
+                          </Group>
+                      </Group>
+                  </Group>
+                  <EmptySpace min="-2" pref="14" max="-2" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="baseColumnCombo" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="replaceBaseCheckBox" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace pref="6" max="32767" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="mergeColumnCombo" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="removeAfterMergedCheckbox" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="jLabel1">
+          <Properties>
+            <Property name="text" type="java.lang.String" resourceKey="jLabel1.text"/>
+            <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel2">
+          <Properties>
+            <Property name="text" type="java.lang.String" resourceKey="jLabel2.text"/>
+            <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="baseColumnCombo">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="4">
+                <StringItem index="0" value="Item 1"/>
+                <StringItem index="1" value="Item 2"/>
+                <StringItem index="2" value="Item 3"/>
+                <StringItem index="3" value="Item 4"/>
+              </StringArray>
+            </Property>
+            <Property name="name" type="java.lang.String" value="baseColumnCombo" noResource="true"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="mergeColumnCombo">
+          <Properties>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
+              <StringArray count="4">
+                <StringItem index="0" value="Item 1"/>
+                <StringItem index="1" value="Item 2"/>
+                <StringItem index="2" value="Item 3"/>
+                <StringItem index="3" value="Item 4"/>
+              </StringArray>
+            </Property>
+            <Property name="name" type="java.lang.String" value="mergeColumnCombo" noResource="true"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JCheckBox" name="removeAfterMergedCheckbox">
+          <Properties>
+            <Property name="selected" type="boolean" value="true"/>
+            <Property name="text" type="java.lang.String" resourceKey="removeAfterMergedCheckbox.text"/>
+            <Property name="name" type="java.lang.String" value="removeAfterMergedCheckbox" noResource="true"/>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JCheckBox" name="replaceBaseCheckBox">
+          <Properties>
+            <Property name="selected" type="boolean" value="true"/>
+            <Property name="text" type="java.lang.String" resourceKey="replaceBaseCheckBox.text"/>
+            <Property name="name" type="java.lang.String" value="replaceBaseCheckBox" noResource="true"/>
+          </Properties>
+        </Component>
+      </SubComponents>
+    </Container>
+    <Component class="textkeymatcher.service.LineDataListMergeService" name="lineDataListMergeService">
+    </Component>
   </NonVisualComponents>
   <Properties>
     <Property name="component" type="javax.swing.JComponent" editor="org.netbeans.modules.form.ComponentChooserEditor">

--- a/src/textkeymatcher/ui/TextKeyMatcherView.java
+++ b/src/textkeymatcher/ui/TextKeyMatcherView.java
@@ -23,6 +23,7 @@ import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.DefaultComboBoxModel;
@@ -347,6 +348,14 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         confirmRemoveColumnPanel = new javax.swing.JPanel();
         removeColumnLabel = new javax.swing.JLabel();
         removeColumnComboBox = new javax.swing.JComboBox();
+        confirmMergeColumnPanel = new javax.swing.JPanel();
+        jLabel1 = new javax.swing.JLabel();
+        jLabel2 = new javax.swing.JLabel();
+        baseColumnCombo = new javax.swing.JComboBox();
+        mergeColumnCombo = new javax.swing.JComboBox();
+        removeAfterMergedCheckbox = new javax.swing.JCheckBox();
+        replaceBaseCheckBox = new javax.swing.JCheckBox();
+        lineDataListMergeService = new textkeymatcher.service.LineDataListMergeService();
 
         mainPanel.setName("mainPanel"); // NOI18N
 
@@ -418,7 +427,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         removeMenuItem.setName("removeMenuItem"); // NOI18N
         dataMenu.add(removeMenuItem);
 
-        mergeMenuItem.setMnemonic('M');
+        mergeMenuItem.setAction(actionMap.get("onMergeColumn")); // NOI18N
         mergeMenuItem.setText(resourceMap.getString("mergeMenuItem.text")); // NOI18N
         mergeMenuItem.setName("mergeMenuItem"); // NOI18N
         dataMenu.add(mergeMenuItem);
@@ -582,7 +591,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         statusPanelLayout.setHorizontalGroup(
             statusPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, statusPanelLayout.createSequentialGroup()
-                .addComponent(statusMessageLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 225, Short.MAX_VALUE)
+                .addComponent(statusMessageLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 235, Short.MAX_VALUE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(progressBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -615,6 +624,66 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         removeColumnComboBox.setName("removeColumnComboBox"); // NOI18N
         confirmRemoveColumnPanel.add(removeColumnComboBox, java.awt.BorderLayout.CENTER);
 
+        confirmMergeColumnPanel.setName("confirmMergeColumnPanel"); // NOI18N
+
+        jLabel1.setText(resourceMap.getString("jLabel1.text")); // NOI18N
+        jLabel1.setName("jLabel1"); // NOI18N
+
+        jLabel2.setText(resourceMap.getString("jLabel2.text")); // NOI18N
+        jLabel2.setName("jLabel2"); // NOI18N
+
+        baseColumnCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        baseColumnCombo.setName("baseColumnCombo"); // NOI18N
+
+        mergeColumnCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        mergeColumnCombo.setName("mergeColumnCombo"); // NOI18N
+
+        removeAfterMergedCheckbox.setSelected(true);
+        removeAfterMergedCheckbox.setText(resourceMap.getString("removeAfterMergedCheckbox.text")); // NOI18N
+        removeAfterMergedCheckbox.setName("removeAfterMergedCheckbox"); // NOI18N
+
+        replaceBaseCheckBox.setSelected(true);
+        replaceBaseCheckBox.setText(resourceMap.getString("replaceBaseCheckBox.text")); // NOI18N
+        replaceBaseCheckBox.setName("replaceBaseCheckBox"); // NOI18N
+
+        javax.swing.GroupLayout confirmMergeColumnPanelLayout = new javax.swing.GroupLayout(confirmMergeColumnPanel);
+        confirmMergeColumnPanel.setLayout(confirmMergeColumnPanelLayout);
+        confirmMergeColumnPanelLayout.setHorizontalGroup(
+            confirmMergeColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(confirmMergeColumnPanelLayout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(confirmMergeColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(confirmMergeColumnPanelLayout.createSequentialGroup()
+                        .addComponent(jLabel1)
+                        .addGap(18, 18, 18)
+                        .addComponent(baseColumnCombo, 0, 189, Short.MAX_VALUE))
+                    .addGroup(confirmMergeColumnPanelLayout.createSequentialGroup()
+                        .addComponent(jLabel2)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addGroup(confirmMergeColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(removeAfterMergedCheckbox)
+                            .addComponent(replaceBaseCheckBox)
+                            .addComponent(mergeColumnCombo, javax.swing.GroupLayout.Alignment.TRAILING, 0, 195, Short.MAX_VALUE))))
+                .addGap(14, 14, 14))
+        );
+        confirmMergeColumnPanelLayout.setVerticalGroup(
+            confirmMergeColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(confirmMergeColumnPanelLayout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(confirmMergeColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(baseColumnCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(replaceBaseCheckBox)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 6, Short.MAX_VALUE)
+                .addGroup(confirmMergeColumnPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(mergeColumnCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(removeAfterMergedCheckbox)
+                .addGap(10, 10, 10))
+        );
+
         setComponent(mainPanel);
         setMenuBar(menuBar);
         setStatusBar(statusPanel);
@@ -735,6 +804,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
             checkEnableSave();
             checkEnableNew();
             checkEnableRemoveColumn();
+            checkEnableMergeColumn();
             statusMessageLabel.setText("done.");
         }
     }
@@ -801,6 +871,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         checkEnableSave();
         checkEnableNew();
         checkEnableRemoveColumn();
+        checkEnableMergeColumn();
 
         statusMessageLabel.setText("initialized.");
     }
@@ -845,6 +916,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         checkEnableSave();
         checkEnableNew();
         checkEnableRemoveColumn();
+        checkEnableMergeColumn();
     }
 
 
@@ -898,20 +970,11 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         @Override
         String toString();
     }
-
-    /**
-     * カラムの削除アクション
-     */
-    @Action(enabledProperty = "enableRemoveColumn")
-    public void onRemoveColumn() {
-        int mx = dataViewTableModel.getNumOfLineDataLists();
-        if (mx <= 1) {
-            // 最低2列以上なければ削除できない.
-            return;
-        }
-        
+    
+    private List<LineDataListItemDisplay> getAllColumns() {
         // カラム一覧を作成する.
-        ArrayList<Object> items = new ArrayList<Object>();
+        ArrayList<LineDataListItemDisplay> items = new ArrayList<LineDataListItemDisplay>();
+        int mx = dataViewTableModel.getNumOfLineDataLists();
         for (int idx = 0; idx < mx; idx++) {
             final LineDataList lineDataList = dataViewTableModel.getLineDataList(idx);
             final int selIdx = idx;
@@ -934,8 +997,22 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
             };
             items.add(item);
         }
+        return items;
+    }
+
+    /**
+     * カラムの削除アクション
+     */
+    @Action(enabledProperty = "enableRemoveColumn")
+    public void onRemoveColumn() {
+        int mx = dataViewTableModel.getNumOfLineDataLists();
+        if (mx <= 1) {
+            // 最低2列以上なければ削除できない.
+            return;
+        }
         
         // ドロップダウンコンボの表示
+        List<LineDataListItemDisplay> items = getAllColumns();
         DefaultComboBoxModel comboboxModel = new DefaultComboBoxModel(
                 items.toArray(new Object[items.size()]));
 
@@ -946,7 +1023,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
                 JOptionPane.PLAIN_MESSAGE,
                 JOptionPane.YES_NO_OPTION
                 );
-        JDialog dlg = optionPane.createDialog(getFrame(), "CONFIRM");
+        JDialog dlg = optionPane.createDialog(getFrame(), "REMOVE");
         dlg.setResizable(true);
         dlg.setModal(true);
         dlg.setVisible(true);
@@ -975,6 +1052,93 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         checkEnableSave();
         checkEnableNew();
         checkEnableRemoveColumn();
+        checkEnableMergeColumn();
+    }
+
+    /**
+     * カラムのマージアクション
+     */
+    @Action(enabledProperty = "enableMergeColumn")
+    public void onMergeColumn() {
+        int mx = dataViewTableModel.getNumOfLineDataLists();
+        if (mx < 1) {
+            // 最低1列以上なければ削除できない.
+            return;
+        }
+        
+        // ドロップダウンコンボの表示
+        List<LineDataListItemDisplay> items = getAllColumns();
+
+        DefaultComboBoxModel baseColumnComboModel = new DefaultComboBoxModel(
+                items.toArray(new Object[items.size()]));
+        baseColumnCombo.setModel(baseColumnComboModel);
+
+        DefaultComboBoxModel mergeColumnComboModel = new DefaultComboBoxModel(
+                items.toArray(new Object[items.size()]));
+        mergeColumnCombo.setModel(mergeColumnComboModel);
+
+        JOptionPane optionPane = new JOptionPane(
+                confirmMergeColumnPanel,
+                JOptionPane.PLAIN_MESSAGE,
+                JOptionPane.YES_NO_OPTION
+                );
+        JDialog dlg = optionPane.createDialog(getFrame(), "MERGE");
+        dlg.setResizable(true);
+        dlg.setModal(true);
+        dlg.setVisible(true);
+        
+        Number ret = (Number) optionPane.getValue();
+        if (ret == null || ret.intValue() != JOptionPane.YES_OPTION) {
+            // キャンセルされた場合
+            return;
+        }
+        
+        // ドロップダウンで選択されたデータソースの取得
+        LineDataListItemDisplay selBaseItem =
+                (LineDataListItemDisplay) baseColumnCombo.getSelectedItem();
+        LineDataListItemDisplay selMergeItem =
+                (LineDataListItemDisplay) mergeColumnCombo.getSelectedItem();
+        if (selBaseItem == null || selMergeItem == null) {
+            return;
+        }
+
+        boolean replace = replaceBaseCheckBox.isSelected();
+        boolean remove = removeAfterMergedCheckbox.isSelected();
+
+        int baseColumnIdx = selBaseItem.getIndex();
+        int mergeColumnIdx = selMergeItem.getIndex();
+
+        // マージする.
+        LineDataList baseColumn = selBaseItem.get();
+        LineDataList mergeColumn = selBaseItem.get();
+        
+        LineDataList merged = lineDataListMergeService.merge(baseColumn, mergeColumn);
+        
+        // マージ結果の更新(置換する場合)
+        if (replace) {
+            dataViewTableModel.setLineDataList(baseColumnIdx, merged);
+        }
+
+        // モデルからカラムの削除
+        if (remove) {
+            if (!replace || (baseColumnIdx != mergeColumnIdx)) {
+                // 同じカラム同士の場合はカラムの削除をしない.
+                // (ただし元カラムがコピーされる場合は除く)
+                dataViewTableModel.removeLineDataList(mergeColumnIdx);
+            }
+        }
+        
+        // マージ結果の追加(追加の場合)
+        // (削除時のインデックスがずれないように最後に追加する.)
+        if (!replace) {
+            dataViewTableModel.addLineDataList(merged);
+        }
+        
+        // メニューの更新
+        checkEnableSave();
+        checkEnableNew();
+        checkEnableRemoveColumn();
+        checkEnableMergeColumn();
     }
 
     private void checkEnableSave() {
@@ -988,6 +1152,11 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
     }
     
     private void checkEnableRemoveColumn() {
+        boolean hasDataSource = dataViewTableModel.getNumOfLineDataLists() > 0;
+        setEnableMergeColumn(hasDataSource);
+    }
+
+    private void checkEnableMergeColumn() {
         // key/valueはペアであるため、最低1列は残す必要があるため、2以上の場合のみ削除可能.
         boolean hasDataSource = dataViewTableModel.getNumOfLineDataLists() > 1;
         setEnableRemoveColumn(hasDataSource);
@@ -1026,8 +1195,21 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         firePropertyChange("enableRemoveColumn", old, isEnableRemoveColumn());
     }
 
+    private boolean enableMergeColumn = false;
+    public boolean isEnableMergeColumn() {
+        return enableMergeColumn;
+    }
+
+    public void setEnableMergeColumn(boolean b) {
+        boolean old = isEnableMergeColumn();
+        this.enableMergeColumn = b;
+        firePropertyChange("enableMergeColumn", old, isEnableMergeColumn());
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JRadioButtonMenuItem allRadioButtonMenuItem;
+    private javax.swing.JComboBox baseColumnCombo;
+    private javax.swing.JPanel confirmMergeColumnPanel;
     private javax.swing.JPanel confirmRemoveColumnPanel;
     private javax.swing.JMenu dataMenu;
     private javax.swing.JTable dataViewTable;
@@ -1036,6 +1218,8 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
     private textkeymatcher.ui.model.DisplayModeBinder displayModeBinder;
     private javax.swing.JRadioButtonMenuItem existsLeftRadioButtonMenuItem;
     private javax.swing.JMenu helpMenu;
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLabel jLabel2;
     private javax.swing.JRadioButtonMenuItem jRadioButtonMenuItem1;
     private javax.swing.JRadioButtonMenuItem jRadioButtonMenuItem2;
     private javax.swing.JPopupMenu.Separator jSeparator1;
@@ -1043,19 +1227,23 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
     private javax.swing.ButtonGroup keyButtonGroup;
     private textkeymatcher.ui.model.KeyMatcherBinder keyMatcherBinder;
     private javax.swing.JMenu keyMenu;
+    private textkeymatcher.service.LineDataListMergeService lineDataListMergeService;
     private javax.swing.JMenuItem loadDataMenuItem;
     private javax.swing.JPanel mainPanel;
     private javax.swing.JRadioButtonMenuItem matchedRadioButtonMenuItem;
     private javax.swing.JMenuBar menuBar;
+    private javax.swing.JComboBox mergeColumnCombo;
     private javax.swing.JMenuItem mergeMenuItem;
     private javax.swing.JRadioButtonMenuItem missingLeftRadioButtonMenuItem;
     private javax.swing.JMenuItem newMenuItem;
     private javax.swing.JRadioButtonMenuItem numberRadioButtonMenuItem;
     private javax.swing.JMenuItem openMenuItem;
     private javax.swing.JProgressBar progressBar;
+    private javax.swing.JCheckBox removeAfterMergedCheckbox;
     private javax.swing.JComboBox removeColumnComboBox;
     private javax.swing.JLabel removeColumnLabel;
     private javax.swing.JMenuItem removeMenuItem;
+    private javax.swing.JCheckBox replaceBaseCheckBox;
     private javax.swing.JMenuItem saveMenuItem;
     private javax.swing.JLabel statusAnimationLabel;
     private javax.swing.JLabel statusMessageLabel;

--- a/src/textkeymatcher/ui/model/DataViewTableModel.java
+++ b/src/textkeymatcher/ui/model/DataViewTableModel.java
@@ -149,6 +149,23 @@ public class DataViewTableModel extends KeyMatchedRowView implements TextKeyMatc
     }
     
     /**
+     * 指定したインデックスのデータソースを設定する.<br>
+     * インデックスは既存のデータの範囲内でなければなりません.<br>
+     * @param index インデックス
+     * @param lineDataList データソース
+     */
+    public void setLineDataList(int index, LineDataList lineDataList) {
+        if (lineDataList == null) {
+            throw new IllegalArgumentException();
+        }
+        rowMap.setLineDataList(index, lineDataList);
+        rowMap.remap();
+
+        renumbering(rowMap);
+        setDirty(true);
+    }
+    
+    /**
      * 指定したインデックスのデータソースを削除する.
      * @param index インデックス
      */

--- a/src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
+++ b/src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
@@ -72,3 +72,9 @@ jRadioButtonMenuItem2.text=Ununique (Strict)
 onRemoveColumn.Action.text=
 onRemoveColumn.Action.shortDescription=
 removeColumnLabel.text=Choose the Remove Column
+onMergeColumn.Action.text=
+onMergeColumn.Action.shortDescription=
+jLabel1.text=Base Column
+jLabel2.text=Merge Column
+removeAfterMergedCheckbox.text=Remove after merged.
+replaceBaseCheckBox.text=Replace

--- a/src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP.properties
+++ b/src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP.properties
@@ -61,3 +61,7 @@ ununiqueRadioButtonMenuItem.text=\u975e\u30e6\u30cb\u30fc\u30af(D)
 jRadioButtonMenuItem1.text=\u30e6\u30cb\u30fc\u30af(\u81ea\u5217\u3082\u5bfe\u8c61)
 jRadioButtonMenuItem2.text=\u975e\u30e6\u30cb\u30fc\u30af(\u81ea\u5217\u3082\u5bfe\u8c61)
 removeColumnLabel.text=\u524a\u9664\u3059\u308b\u5217\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+jLabel1.text=\u30de\u30fc\u30b8\u5148\u30ab\u30e9\u30e0
+jLabel2.text=\u30de\u30fc\u30b8\u5143\u30ab\u30e9\u30e0
+replaceBaseCheckBox.text=\u30de\u30fc\u30b8\u7d50\u679c\u3067\u7f6e\u63db\u3059\u308b
+removeAfterMergedCheckbox.text=\u30de\u30fc\u30b8\u5f8c\u306b\u524a\u9664\u3059\u308b