コミット: 913f2b1ea4931337db081ebf515f62cd365693cb - TextKeyMatcher (git)

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

コミットメタ情報

• リビジョン: 913f2b1ea4931337db081ebf515f62cd365693cb (tree)
• 日時: 2011-10-24 02:27:18
• 作者: seraphy <seraphy@192....>
• コミッター: seraphy

ログメッセージ

・カラム削除の実装中

変更サマリ

• 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

差分

--- a/src/textkeymatcher/ui/TextKeyMatcherView.form
+++ b/src/textkeymatcher/ui/TextKeyMatcherView.form
@@ -133,6 +133,9 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="removeMenuItem">
               <Properties>
+                <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+                  <action class="textkeymatcher.ui.TextKeyMatcherView" id="onRemoveColumn" methodName="onRemoveColumn"/>
+                </Property>
                 <Property name="mnemonic" type="int" value="82"/>
                 <Property name="text" type="java.lang.String" resourceKey="removeMenuItem.text"/>
                 <Property name="name" type="java.lang.String" value="removeMenuItem" noResource="true"/>
@@ -428,6 +431,46 @@
         <AuxValue name="JavaCodeGenerator_InitCodePre" type="java.lang.String" value="displayModeBinder.bindDataViewTableModel(dataViewTableModel);"/>
       </AuxValues>
     </Component>
+    <Container class="javax.swing.JPanel" name="confirmRemoveColumnPanel">
+      <Properties>
+        <Property name="name" type="java.lang.String" value="confirmRemoveColumnPanel" noResource="true"/>
+      </Properties>
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="removeColumnLabel">
+          <Properties>
+            <Property name="horizontalAlignment" type="int" value="0"/>
+            <Property name="text" type="java.lang.String" resourceKey="removeColumnLabel.text"/>
+            <Property name="horizontalTextPosition" type="int" value="0"/>
+            <Property name="name" type="java.lang.String" value="removeColumnLabel" noResource="true"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="North"/>
+            </Constraint>
+          </Constraints>
+        </Component>
+        <Component class="javax.swing.JComboBox" name="removeColumnComboBox">
+          <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="removeColumnComboBox" noResource="true"/>
+          </Properties>
+          <Constraints>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+              <BorderConstraints direction="Center"/>
+            </Constraint>
+          </Constraints>
+        </Component>
+      </SubComponents>
+    </Container>
   </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
@@ -22,8 +22,10 @@ import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.Timer;
 import javax.swing.Icon;
 import javax.swing.InputMap;
@@ -39,6 +41,7 @@ import javax.swing.table.DefaultTableCellRenderer;
 import org.jdesktop.application.Application;
 import textkeymatcher.TextKeyMatcherApp;
 import textkeymatcher.entity.FilteredRowMap;
+import textkeymatcher.entity.LineDataList;
 import textkeymatcher.io.DocArchive;
 import textkeymatcher.io.FileDocArchive;
 import textkeymatcher.service.LineDataBuilder;
@@ -341,6 +344,9 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         dataViewTableModel = new textkeymatcher.ui.model.DataViewTableModel();
         keyMatcherBinder = new textkeymatcher.ui.model.KeyMatcherBinder();
         displayModeBinder = new textkeymatcher.ui.model.DisplayModeBinder();
+        confirmRemoveColumnPanel = new javax.swing.JPanel();
+        removeColumnLabel = new javax.swing.JLabel();
+        removeColumnComboBox = new javax.swing.JComboBox();
 
         mainPanel.setName("mainPanel"); // NOI18N
 
@@ -407,6 +413,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         jSeparator2.setName("jSeparator2"); // NOI18N
         dataMenu.add(jSeparator2);
 
+        removeMenuItem.setAction(actionMap.get("onRemoveColumn")); // NOI18N
         removeMenuItem.setMnemonic('R');
         removeMenuItem.setText(resourceMap.getString("removeMenuItem.text")); // NOI18N
         removeMenuItem.setName("removeMenuItem"); // NOI18N
@@ -596,6 +603,19 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
 
         displayModeBinder.bindDataViewTableModel(dataViewTableModel);
 
+        confirmRemoveColumnPanel.setName("confirmRemoveColumnPanel"); // NOI18N
+        confirmRemoveColumnPanel.setLayout(new java.awt.BorderLayout());
+
+        removeColumnLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+        removeColumnLabel.setText(resourceMap.getString("removeColumnLabel.text")); // NOI18N
+        removeColumnLabel.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+        removeColumnLabel.setName("removeColumnLabel"); // NOI18N
+        confirmRemoveColumnPanel.add(removeColumnLabel, java.awt.BorderLayout.NORTH);
+
+        removeColumnComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+        removeColumnComboBox.setName("removeColumnComboBox"); // NOI18N
+        confirmRemoveColumnPanel.add(removeColumnComboBox, java.awt.BorderLayout.CENTER);
+
         setComponent(mainPanel);
         setMenuBar(menuBar);
         setStatusBar(statusPanel);
@@ -715,6 +735,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
             dataViewTableModel.addLineDataList(collector);
             checkEnableSave();
             checkEnableNew();
+            checkEnableRemoveColumn();
             statusMessageLabel.setText("done.");
         }
     }
@@ -780,6 +801,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
 
         checkEnableSave();
         checkEnableNew();
+        checkEnableRemoveColumn();
 
         statusMessageLabel.setText("initialized.");
     }
@@ -823,6 +845,7 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
 
         checkEnableSave();
         checkEnableNew();
+        checkEnableRemoveColumn();
     }
 
 
@@ -851,17 +874,61 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         }
     }
 
+    /**
+     * カラムの削除アクション
+     */
+    @Action(enabledProperty = "enableRemoveColumn")
+    public void onRemoveColumn() {
+        int mx = dataViewTableModel.getNumOfLineDataLists();
+        if (mx <= 1) {
+            return;
+        }
+        
+        // カラム一覧を作成する.
+        ArrayList<Object> items = new ArrayList<Object>();
+        for (int idx = 0; idx < mx; idx++) {
+            final LineDataList lineDataList = dataViewTableModel.getLineDataList(idx);
+            Object item = new Object() {
+                @Override
+                public String toString() {
+                    return lineDataList.getTitle();
+                }
+            };
+            items.add(item);
+        }
+        
+        DefaultComboBoxModel comboboxModel = new DefaultComboBoxModel(
+                items.toArray(new Object[items.size()]));
+
+        removeColumnComboBox.setModel(comboboxModel);
+        
+        JOptionPane optionPane = new JOptionPane();
+        
+//        .showConfirmDialog(
+//                getFrame(),
+//                confirmRemoveColumnPanel,
+//                "CONFIRM",
+//                JOptionPane.YES_NO_OPTION,
+//                JOptionPane.QUESTION_MESSAGE
+//                );
+    }
 
     private void checkEnableSave() {
-        boolean hasDataSource = dataViewTableModel.getDataListCount() > 0;
+        boolean hasDataSource = dataViewTableModel.getNumOfLineDataLists() > 0;
         setEnableSave(hasDataSource);
     }
     
     private void checkEnableNew() {
-        boolean hasDataSource = dataViewTableModel.getDataListCount() > 0;
+        boolean hasDataSource = dataViewTableModel.getNumOfLineDataLists() > 0;
         setEnableNew(hasDataSource);
     }
     
+    private void checkEnableRemoveColumn() {
+        // key/valueはペアであるため、最低1列は残す必要があるため、2以上の場合のみ削除可能.
+        boolean hasDataSource = dataViewTableModel.getNumOfLineDataLists() > 1;
+        setEnableRemoveColumn(hasDataSource);
+    }
+
     private boolean enableSave = false;
     public boolean isEnableSave() {
         return enableSave;
@@ -884,8 +951,20 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
         firePropertyChange("enableNew", old, isEnableNew());
     }
 
+    private boolean enableRemoveColumn = false;
+    public boolean isEnableRemoveColumn() {
+        return enableRemoveColumn;
+    }
+
+    public void setEnableRemoveColumn(boolean b) {
+        boolean old = isEnableRemoveColumn();
+        this.enableRemoveColumn = b;
+        firePropertyChange("enableRemoveColumn", old, isEnableRemoveColumn());
+    }
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JRadioButtonMenuItem allRadioButtonMenuItem;
+    private javax.swing.JPanel confirmRemoveColumnPanel;
     private javax.swing.JMenu dataMenu;
     private javax.swing.JTable dataViewTable;
     private textkeymatcher.ui.model.DataViewTableModel dataViewTableModel;
@@ -910,6 +989,8 @@ public class TextKeyMatcherView extends FrameView implements ExitListener {
     private javax.swing.JRadioButtonMenuItem numberRadioButtonMenuItem;
     private javax.swing.JMenuItem openMenuItem;
     private javax.swing.JProgressBar progressBar;
+    private javax.swing.JComboBox removeColumnComboBox;
+    private javax.swing.JLabel removeColumnLabel;
     private javax.swing.JMenuItem removeMenuItem;
     private javax.swing.JMenuItem saveMenuItem;
     private javax.swing.JLabel statusAnimationLabel;

--- a/src/textkeymatcher/ui/model/DataViewTableModel.java
+++ b/src/textkeymatcher/ui/model/DataViewTableModel.java
@@ -140,10 +140,31 @@ public class DataViewTableModel extends KeyMatchedRowView implements TextKeyMatc
     }
     
     /**
+     * 指定したインデックスのデータソースを取得する.
+     * @param index インデックス
+     * @return データソース
+     */
+    public LineDataList getLineDataList(int index) {
+        return rowMap.getLineDataList(index);
+    }
+    
+    /**
+     * 指定したインデックスのデータソースを削除する.
+     * @param index インデックス
+     */
+    public void removeLineDataList(int index) {
+        rowMap.removeLineDataList(index);
+        rowMap.remap();
+
+        renumbering(rowMap);
+        setDirty(true);
+    }
+    
+    /**
      * 保持しているデータソースの数を返す
      * @return データソースの数
      */
-    public int getDataListCount() {
+    public int getNumOfLineDataLists() {
         return rowMap.getNumOfLineDataLists();
     }
     

--- a/src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
+++ b/src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
@@ -69,3 +69,6 @@ uniqueRadioButtonMenuItem.text=Unique
 ununiqueRadioButtonMenuItem.text=Ununique
 jRadioButtonMenuItem1.text=Unique (Strict)
 jRadioButtonMenuItem2.text=Ununique (Strict)
+onRemoveColumn.Action.text=
+onRemoveColumn.Action.shortDescription=
+removeColumnLabel.text=Choose the Remove Column