コミット: 52632cfd0bc6e346dd62cab5b7277c30ef1598ae - TextKeyMatcher (git)

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

コミットメタ情報

• リビジョン: 52632cfd0bc6e346dd62cab5b7277c30ef1598ae (tree)
• 日時: 2011-10-13 00:45:25
• 作者: seraphy <seraphy@192....>
• コミッター: seraphy

ログメッセージ

キーマッチング方法のメニューからの選択と、それによるテーブルの再構成

変更サマリ

• modified: src/textkeymatcher/ui/TextKeyMatcherView.form
• modified: src/textkeymatcher/ui/TextKeyMatcherView.java
• modified: src/textkeymatcher/ui/model/DataViewTableModel.java
• add: src/textkeymatcher/ui/model/KeyMatcherBinder.java

差分

--- a/src/textkeymatcher/ui/TextKeyMatcherView.form
+++ b/src/textkeymatcher/ui/TextKeyMatcherView.form
@@ -150,10 +150,12 @@
                 <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
                   <ComponentRef name="keyButtonGroup"/>
                 </Property>
-                <Property name="selected" type="boolean" value="true"/>
                 <Property name="text" type="java.lang.String" resourceKey="textNormalRadioButtonMenuItem.text"/>
                 <Property name="name" type="java.lang.String" value="textNormalRadioButtonMenuItem" noResource="true"/>
               </Properties>
+              <BindingProperties>
+                <BindingProperty name="selected" source="keyMatcherBinder" sourcePath="${text}" target="textNormalRadioButtonMenuItem" targetPath="selected" updateStrategy="0" immediately="false"/>
+              </BindingProperties>
             </MenuItem>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="textIgnoreCaseRadioButtonMenuItem">
               <Properties>
@@ -163,6 +165,9 @@
                 <Property name="text" type="java.lang.String" resourceKey="textIgnoreCaseRadioButtonMenuItem.text"/>
                 <Property name="name" type="java.lang.String" value="textIgnoreCaseRadioButtonMenuItem" noResource="true"/>
               </Properties>
+              <BindingProperties>
+                <BindingProperty name="selected" source="keyMatcherBinder" sourcePath="${textIgnoreCase}" target="textIgnoreCaseRadioButtonMenuItem" targetPath="selected" updateStrategy="0" immediately="false"/>
+              </BindingProperties>
             </MenuItem>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="numberRadioButtonMenuItem">
               <Properties>
@@ -172,14 +177,17 @@
                 <Property name="text" type="java.lang.String" resourceKey="numberRadioButtonMenuItem.text"/>
                 <Property name="name" type="java.lang.String" value="numberRadioButtonMenuItem" noResource="true"/>
               </Properties>
+              <BindingProperties>
+                <BindingProperty name="selected" source="keyMatcherBinder" sourcePath="${numeric}" target="numberRadioButtonMenuItem" targetPath="selected" updateStrategy="0" immediately="false"/>
+              </BindingProperties>
             </MenuItem>
           </SubComponents>
         </Menu>
         <Menu class="javax.swing.JMenu" name="viewMenu">
           <Properties>
             <Property name="mnemonic" type="int" value="86"/>
-            <Property name="name" type="java.lang.String" value="viewMenu" noResource="true"/>
             <Property name="text" type="java.lang.String" resourceKey="viewMenu.text"/>
+            <Property name="name" type="java.lang.String" value="viewMenu" noResource="true"/>
           </Properties>
           <SubComponents>
             <MenuItem class="javax.swing.JRadioButtonMenuItem" name="allRadioButtonMenuItem">
@@ -233,8 +241,8 @@
         <Menu class="javax.swing.JMenu" name="helpMenu">
           <Properties>
             <Property name="mnemonic" type="int" value="72"/>
-            <Property name="name" type="java.lang.String" value="helpMenu" noResource="true"/>
             <Property name="text" type="java.lang.String" resourceKey="helpMenu.text"/>
+            <Property name="name" type="java.lang.String" value="helpMenu" noResource="true"/>
           </Properties>
           <AuxValues>
             <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
@@ -343,6 +351,11 @@
     </Component>
     <Component class="textkeymatcher.ui.model.DataViewTableModel" name="dataViewTableModel">
     </Component>
+    <Component class="textkeymatcher.ui.model.KeyMatcherBinder" name="keyMatcherBinder">
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_InitCodePre" type="java.lang.String" value="keyMatcherBinder.bindDataViewTableModel(dataViewTableModel);"/>
+      </AuxValues>
+    </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
@@ -137,6 +137,7 @@ public class TextKeyMatcherView extends FrameView {
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
+        bindingGroup = new org.jdesktop.beansbinding.BindingGroup();
 
         mainPanel = new javax.swing.JPanel();
         dataViewTableSP = new javax.swing.JScrollPane();
@@ -173,6 +174,7 @@ public class TextKeyMatcherView extends FrameView {
         viewButtonGroup = new javax.swing.ButtonGroup();
         keyButtonGroup = new javax.swing.ButtonGroup();
         dataViewTableModel = new textkeymatcher.ui.model.DataViewTableModel();
+        keyMatcherBinder = new textkeymatcher.ui.model.KeyMatcherBinder();
 
         mainPanel.setName("mainPanel"); // NOI18N
 
@@ -253,26 +255,37 @@ public class TextKeyMatcherView extends FrameView {
         keyMenu.setName("keyMenu"); // NOI18N
 
         keyButtonGroup.add(textNormalRadioButtonMenuItem);
-        textNormalRadioButtonMenuItem.setSelected(true);
         textNormalRadioButtonMenuItem.setText(resourceMap.getString("textNormalRadioButtonMenuItem.text")); // NOI18N
         textNormalRadioButtonMenuItem.setName("textNormalRadioButtonMenuItem"); // NOI18N
+
+        org.jdesktop.beansbinding.Binding binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, keyMatcherBinder, org.jdesktop.beansbinding.ELProperty.create("${text}"), textNormalRadioButtonMenuItem, org.jdesktop.beansbinding.BeanProperty.create("selected"));
+        bindingGroup.addBinding(binding);
+
         keyMenu.add(textNormalRadioButtonMenuItem);
 
         keyButtonGroup.add(textIgnoreCaseRadioButtonMenuItem);
         textIgnoreCaseRadioButtonMenuItem.setText(resourceMap.getString("textIgnoreCaseRadioButtonMenuItem.text")); // NOI18N
         textIgnoreCaseRadioButtonMenuItem.setName("textIgnoreCaseRadioButtonMenuItem"); // NOI18N
+
+        binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, keyMatcherBinder, org.jdesktop.beansbinding.ELProperty.create("${textIgnoreCase}"), textIgnoreCaseRadioButtonMenuItem, org.jdesktop.beansbinding.BeanProperty.create("selected"));
+        bindingGroup.addBinding(binding);
+
         keyMenu.add(textIgnoreCaseRadioButtonMenuItem);
 
         keyButtonGroup.add(numberRadioButtonMenuItem);
         numberRadioButtonMenuItem.setText(resourceMap.getString("numberRadioButtonMenuItem.text")); // NOI18N
         numberRadioButtonMenuItem.setName("numberRadioButtonMenuItem"); // NOI18N
+
+        binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, keyMatcherBinder, org.jdesktop.beansbinding.ELProperty.create("${numeric}"), numberRadioButtonMenuItem, org.jdesktop.beansbinding.BeanProperty.create("selected"));
+        bindingGroup.addBinding(binding);
+
         keyMenu.add(numberRadioButtonMenuItem);
 
         menuBar.add(keyMenu);
 
         viewMenu.setMnemonic('V');
-        viewMenu.setName("viewMenu"); // NOI18N
         viewMenu.setText(resourceMap.getString("viewMenu.text")); // NOI18N
+        viewMenu.setName("viewMenu"); // NOI18N
 
         viewButtonGroup.add(allRadioButtonMenuItem);
         allRadioButtonMenuItem.setSelected(true);
@@ -303,8 +316,8 @@ public class TextKeyMatcherView extends FrameView {
         menuBar.add(viewMenu);
 
         helpMenu.setMnemonic('H');
-        helpMenu.setName("helpMenu"); // NOI18N
         helpMenu.setText(resourceMap.getString("helpMenu.text")); // NOI18N
+        helpMenu.setName("helpMenu"); // NOI18N
 
         aboutMenuItem.setAction(actionMap.get("showAboutBox")); // NOI18N
         aboutMenuItem.setName("aboutMenuItem"); // NOI18N
@@ -350,9 +363,13 @@ public class TextKeyMatcherView extends FrameView {
                 .addGap(3, 3, 3))
         );
 
+        keyMatcherBinder.bindDataViewTableModel(dataViewTableModel);
+
         setComponent(mainPanel);
         setMenuBar(menuBar);
         setStatusBar(statusPanel);
+
+        bindingGroup.bind();
     }// </editor-fold>//GEN-END:initComponents
 
     private ImportDataDialogModel importDataDialogModel;
@@ -448,6 +465,7 @@ public class TextKeyMatcherView extends FrameView {
     private javax.swing.JPopupMenu.Separator jSeparator1;
     private javax.swing.JPopupMenu.Separator jSeparator2;
     private javax.swing.ButtonGroup keyButtonGroup;
+    private textkeymatcher.ui.model.KeyMatcherBinder keyMatcherBinder;
     private javax.swing.JMenu keyMenu;
     private javax.swing.JMenuItem loadDataMenuItem;
     private javax.swing.JPanel mainPanel;
@@ -469,6 +487,7 @@ public class TextKeyMatcherView extends FrameView {
     private javax.swing.JRadioButtonMenuItem unmatchedRadioButtonMenuItem;
     private javax.swing.ButtonGroup viewButtonGroup;
     private javax.swing.JMenu viewMenu;
+    private org.jdesktop.beansbinding.BindingGroup bindingGroup;
     // End of variables declaration//GEN-END:variables
 
     private final Timer messageTimer;

--- a/src/textkeymatcher/ui/model/DataViewTableModel.java
+++ b/src/textkeymatcher/ui/model/DataViewTableModel.java
@@ -4,18 +4,66 @@
  */
 package textkeymatcher.ui.model;
 
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import org.apache.commons.lang3.StringUtils;
 import textkeymatcher.entity.KeyMatchedRowMap;
 import textkeymatcher.entity.KeyMatchedRowView;
 import textkeymatcher.entity.LineDataList;
+import textkeymatcher.service.KeyMatcher;
 
 /**
- *
+ * ビューに表示されるテーブルのモデル.<br>
  * @author seraphy
  */
 public class DataViewTableModel extends KeyMatchedRowView {
-
+    
+    /**
+     * プロパティ変更サポート
+     */
+    private PropertyChangeSupport propCng = new PropertyChangeSupport(this);
+    
+    /**
+     * キーマッチング方法のプロパティ名
+     */
+    public static final String PROPERTY_KEY_MATCHER = "keyMatcher";
+    
+    /**
+     * 取り込んだデータソースや、キーマッチングなどを決定している
+     * データマップ
+     */
     private KeyMatchedRowMap rowMap = new KeyMatchedRowMap();
     
+    
+    public void addPropertyChangeListener(PropertyChangeListener pl) {
+        propCng.addPropertyChangeListener(pl);
+    }
+
+    public void removePropertyChangeListener(PropertyChangeListener pl) {
+        propCng.removePropertyChangeListener(pl);
+    }
+
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        return propCng.getPropertyChangeListeners();
+    }
+
+    public void addPropertyChangeListener(String string, PropertyChangeListener pl) {
+        propCng.addPropertyChangeListener(pl);
+    }
+
+    public void removePropertyChangeListener(String string, PropertyChangeListener pl) {
+        propCng.removePropertyChangeListener(pl);
+    }
+
+    public PropertyChangeListener[] getPropertyChangeListeners(String string) {
+        return propCng.getPropertyChangeListeners(string);
+    }
+    
+    
+    /**
+     * データソースを追加する.
+     * @param lineDataList 
+     */
     public void addLineDataList(LineDataList lineDataList) {
         if (lineDataList == null) {
             throw new IllegalArgumentException();
@@ -26,12 +74,56 @@ public class DataViewTableModel extends KeyMatchedRowView {
         renumbering(rowMap);
     }
     
+    /**
+     * 現在適用されているキーマッチング方法を取得する.
+     * @return キーマッヂング方法
+     */
+    public KeyMatcher getKeyMatcher() {
+        return rowMap.getKeyMatcher();
+    }
+    
+    /**
+     * キーマッチング方法を設定する.<br>
+     * 必要に応じて表は再構成される.<br>
+     * @param keyMatcher キーマッチング方法
+     */
+    public void setKeyMatcher(KeyMatcher keyMatcher) {
+        if (keyMatcher == null) {
+            throw new IllegalArgumentException();
+        }
+        
+        KeyMatcher oldValue = getKeyMatcher();
+        if (oldValue != keyMatcher) {
+            // キータイプが変更される場合のみ
+            // キーを変更してマッチチングを再適用し、表を構成し直す.
+            rowMap.setKeyMatcher(keyMatcher);
+            rowMap.remap();
+
+            renumbering(rowMap);
+
+            propCng.firePropertyChange(PROPERTY_KEY_MATCHER, oldValue, keyMatcher);
+        }
+    }
+    
+    /**
+     * キーまたはデータソースのタイトルを返す.<br>
+     * 0列がキーで、それ以降はデータソースごとのタイトルが返される.<br>
+     * @param i
+     * @return 
+     */
     @Override
     public String getColumnName(int i) {
         if (i == 0) {
             return "Key";
         }
         int column = i - 1; // 左端はキーカラム固定
-        return rowMap.getTitle(column);
+        String title = rowMap.getTitle(column);
+
+        if (StringUtils.isBlank(title)) {
+            // 空の場合は列番号をつけて返す.
+            title = "(" + column + ")";
+        }
+        
+        return title;
     }
 }

--- /dev/null
+++ b/src/textkeymatcher/ui/model/KeyMatcherBinder.java
@@ -0,0 +1,127 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package textkeymatcher.ui.model;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.jdesktop.application.AbstractBean;
+import textkeymatcher.service.KeyMatcher;
+
+/**
+ * メニューのチェックボックス付きメニューアイテムでキーマッチングを切り替える場合に便利なようにバイントサポートするクラス.<br>
+ * setText/setTextIgnoreCase/setNumericでは、引数enableがtrueである場合のみ設定されます。
+ * 引数がfalseの場合は単に無視して解除しません.別のタイプがsetでenableされたときに変更されます.<br>
+ * @author seraphy
+ */
+public class KeyMatcherBinder extends AbstractBean {
+
+    /**
+     * ロガー｀
+     */
+    private static final Logger logger = Logger.getLogger(KeyMatcherBinder.class.getName());
+    
+    /**
+     * キーマッチャをもつ実体オブジェクト
+     */
+    private DataViewTableModel tableModel;
+    
+    
+    /**
+     * 実体オブジェクトを設定します.<br>
+     * プロパティ変更リスナーがセットアップされます.<br>
+     * @param tableModel 
+     */
+    public void bindDataViewTableModel(DataViewTableModel tableModel) {
+        if (tableModel == null) {
+            throw new IllegalArgumentException();
+        }
+        this.tableModel = tableModel;
+        this.tableModel.addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent pce) {
+                tableModelPropertyChanged(pce);
+            }
+        });
+    }
+
+    /**
+     * キーマッチャが変更されたことを通知される.<br>
+     * @param pce プロパティ変更イベント
+     */
+    protected void tableModelPropertyChanged(PropertyChangeEvent pce) {
+        String propertyName = pce.getPropertyName();
+        if (DataViewTableModel.PROPERTY_KEY_MATCHER.equals(propertyName)) {
+            changeKeyMatcher(
+                    (KeyMatcher) pce.getOldValue(),
+                    (KeyMatcher) pce.getNewValue()
+                    );
+        }
+    }
+    
+    protected KeyMatcher getKeyMatcher() {
+        if (tableModel == null) {
+            throw new IllegalStateException("先にsetDataViewTableModelで設定しておく必要があります.");
+        }
+        return tableModel.getKeyMatcher();
+    }
+    
+    protected void setKeyMatcher(KeyMatcher keyMatcher) {
+        if (tableModel == null) {
+            throw new IllegalStateException("先にsetDataViewTableModelで設定しておく必要があります.");
+        }
+        tableModel.setKeyMatcher(keyMatcher); // thisにも変更通知がくることを想定
+    }
+    
+    protected void changeKeyMatcher(KeyMatcher oldValue, KeyMatcher newValue) {
+        logger.log(Level.INFO, ">change: {0}->{1}", new Object[] {oldValue, newValue});
+
+        boolean oldText = oldValue == KeyMatcher.TEXT;
+        boolean oldTextIC = oldValue == KeyMatcher.TEXT_IGNORECASE;
+        boolean oldNumeric = oldValue == KeyMatcher.NUMERIC;
+        
+        boolean newText = newValue == KeyMatcher.TEXT;
+        boolean newTextIC = newValue == KeyMatcher.TEXT_IGNORECASE;
+        boolean newNumeric = newValue == KeyMatcher.NUMERIC;
+        
+        firePropertyChange("text", oldText, newText);
+        firePropertyChange("textIgnoreCase", oldTextIC, newTextIC);
+        firePropertyChange("numeric", oldNumeric, newNumeric);
+    }
+    
+    public boolean isText() {
+        return getKeyMatcher() == KeyMatcher.TEXT;
+    }
+    
+    public boolean isTextIgnoreCase() {
+        return getKeyMatcher() == KeyMatcher.TEXT_IGNORECASE;
+    }
+    
+    public boolean isNumeric() {
+        return getKeyMatcher() == KeyMatcher.NUMERIC;
+    }
+    
+    public void setText(boolean enable) {
+        logger.log(Level.INFO, "setText: {0}", enable);
+        if (enable) {
+            setKeyMatcher(KeyMatcher.TEXT);
+        }
+    }
+    
+    public void setTextIgnoreCase(boolean enable) {
+        logger.log(Level.INFO, "setTextIgnoreCase: {0}", enable);
+        if (enable) {
+            setKeyMatcher(KeyMatcher.TEXT_IGNORECASE);
+        }
+    }
+    
+    public void setNumeric(boolean enable) {
+        logger.log(Level.INFO, "setNumeric: {0}", enable);
+        if (enable) {
+            setKeyMatcher(KeyMatcher.NUMERIC);
+        }
+    }
+}