コミット: 56a1f7d5b6b43d1736a44c3343206d03143197ee - TextKeyMatcher (git)

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

コミットメタ情報

• リビジョン: 56a1f7d5b6b43d1736a44c3343206d03143197ee (tree)
• 日時: 2011-10-18 03:04:51
• 作者: seraphy <seraphy@192....>
• コミッター: seraphy

ログメッセージ

・テーブルの偶数行の背景色対応

変更サマリ

• modified: nbproject/project.properties
• modified: src/textkeymatcher/entity/KeyMatchedRowView.java
• modified: src/textkeymatcher/ui/TextKeyMatcherView.form
• modified: src/textkeymatcher/ui/TextKeyMatcherView.java
• modified: src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
• modified: src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP.properties
• modified: src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP_MAC.properties

差分

--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -82,7 +82,7 @@ run.classpath=\
 # Space-separated list of JVM arguments used when running the project
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
+run.jvmargs=-ea
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}

--- a/src/textkeymatcher/entity/KeyMatchedRowView.java
+++ b/src/textkeymatcher/entity/KeyMatchedRowView.java
@@ -42,11 +42,17 @@ public class KeyMatchedRowView extends AbstractTableModel {
          */
         private final int rowNumber;
         
+        /**
+         * キーごとの連番
+         */
+        private final int rowGroupSerialNo;
+        
 
-        public RowNumMap(RowKey rowKey, RowValues rowValues, int rowNumber) {
+        public RowNumMap(RowKey rowKey, RowValues rowValues, int rowNumber, int rowGroupSerialNo) {
             this.rowKey = rowKey;
             this.rowValues = rowValues;
             this.rowNumber = rowNumber;
+            this.rowGroupSerialNo = rowGroupSerialNo;
         }
         
         public RowKey getRowKey() {
@@ -60,6 +66,10 @@ public class KeyMatchedRowView extends AbstractTableModel {
         public int getRowNumber() {
             return rowNumber;
         }
+        
+        public int getRowGroupSerialNo() {
+            return rowGroupSerialNo;
+        }
     }
     
     
@@ -113,6 +123,19 @@ public class KeyMatchedRowView extends AbstractTableModel {
     }
 
     /**
+     * 指定した行のキーごとの連番を取得する.
+     * @param rowIndex 行
+     * @return キーごとの連番、範囲外の場合は-1
+     */
+    public int getRowGroupSerialNo(int rowIndex) {
+        if (rowIndex < 0 || rowIndex >= rowNumMaps.size()) {
+            return -1;
+        }
+        RowNumMap rowNumMap = rowNumMaps.get(rowIndex);
+        return rowNumMap.getRowGroupSerialNo();
+    }
+
+    /**
      * 第一列をキー、それ以降をデータ列として1つのテーブルのカラムとしてアクセスする.<br>
      * @param rowIndex 行
      * @param columnIndex 列、0はキー、それ以降はデータ列
@@ -161,6 +184,7 @@ public class KeyMatchedRowView extends AbstractTableModel {
 
         int numOfMaxColumns = 0;
         ArrayList<RowNumMap> rows = new ArrayList<RowNumMap>();
+        int rowGroupSerialNo = 0;
         for (Map.Entry<RowKey, RowValues> entry : dataMap.entrySet()) {
             RowKey rowKey = entry.getKey();
             RowValues rowValues = entry.getValue();
@@ -177,8 +201,11 @@ public class KeyMatchedRowView extends AbstractTableModel {
             
             // 行数分だけ同じキーを繰り返す.
             for (int rowNumber = 0; rowNumber < numOfRows; rowNumber++) {
-                rows.add(new RowNumMap(rowKey, rowValues, rowNumber));
+                rows.add(new RowNumMap(rowKey, rowValues, rowNumber, rowGroupSerialNo));
             }
+            
+            // キーごとのシリアル番号をインクリメント
+            rowGroupSerialNo++;
         }
         
         this.rowNumMaps = rows;

--- a/src/textkeymatcher/ui/TextKeyMatcherView.form
+++ b/src/textkeymatcher/ui/TextKeyMatcherView.form
@@ -27,14 +27,14 @@
 
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
           <SubComponents>
-            <Component class="javax.swing.JTable" name="dateViewTable">
+            <Component class="javax.swing.JTable" name="dataViewTable">
               <Properties>
                 <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
                   <Connection component="dataViewTableModel" type="bean"/>
                 </Property>
                 <Property name="autoResizeMode" type="int" value="0"/>
-                <Property name="gridColor" type="java.awt.Color" resourceKey="dateViewTable.gridColor"/>
-                <Property name="name" type="java.lang.String" value="dateViewTable" noResource="true"/>
+                <Property name="gridColor" type="java.awt.Color" resourceKey="dataViewTable.gridColor"/>
+                <Property name="name" type="java.lang.String" value="dataViewTable" noResource="true"/>
                 <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
                   <TableHeader reorderingAllowed="true" resizingAllowed="true"/>
                 </Property>

--- a/src/textkeymatcher/ui/TextKeyMatcherView.java
+++ b/src/textkeymatcher/ui/TextKeyMatcherView.java
@@ -6,6 +6,8 @@ package textkeymatcher.ui;
 
 import com.apple.eawt.AboutHandler;
 import com.apple.eawt.AppEvent.AboutEvent;
+import java.awt.Color;
+import java.awt.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.jdesktop.application.Task;
 import org.jdesktop.application.Action;
@@ -29,7 +31,9 @@ import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JRootPane;
+import javax.swing.JTable;
 import javax.swing.KeyStroke;
+import javax.swing.table.DefaultTableCellRenderer;
 import org.jdesktop.application.Application;
 import textkeymatcher.TextKeyMatcherApp;
 import textkeymatcher.io.DocArchive;
@@ -50,6 +54,11 @@ public class TextKeyMatcherView extends FrameView {
      */
     private static final Logger logger = Logger.getLogger(TextKeyMatcherView.class.getName());
 
+    /**
+     * テーブルの偶数行のカラー
+     */
+    private Color evenColor = new Color(240, 240, 255);
+    
     
     public TextKeyMatcherView(SingleFrameApplication app) {
         super(app);
@@ -147,8 +156,59 @@ public class TextKeyMatcherView extends FrameView {
                 }
             });
         }
+        
+        // JTableのセルレンダー
+        DefaultTableCellRenderer cellRender = new DefaultTableCellRenderer() {
+
+            @Override
+            public Component getTableCellRendererComponent(JTable table, Object value,
+                    boolean isSelected, boolean hasFocus,
+                    int row, int column) {
+                super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
+                
+                if (isSelected) {
+                    setForeground(table.getSelectionForeground());
+                    setBackground(table.getSelectionBackground());
+
+                } else {
+                    setForeground(table.getForeground());
+                    int serialNo = dataViewTableModel.getRowGroupSerialNo(row);
+                    boolean even = (serialNo % 2 == 0);
+                    setBackground(even ? getEvenColor() : table.getBackground());
+                }
+                
+                setHorizontalAlignment((value instanceof Number) ? RIGHT : LEFT);
+                
+                return this;
+            }
+        };
+        dataViewTable.setDefaultRenderer(Object.class, cellRender);
     }
 
+    /**
+     * テーブルの偶数行の背景色を設定する.
+     * @param evenColor 背景色
+     */
+    public void setEvenColor(Color evenColor) {
+        if (evenColor == null) {
+            throw new IllegalArgumentException();
+        }
+        Color oldValue = this.evenColor;
+        this.evenColor = evenColor;
+        firePropertyChange("evenColor", oldValue, evenColor);
+    }
+    
+    /**
+     * テーブルの偶数行の背景色を取得する.
+     * @return 背景色
+     */
+    public Color getEvenColor() {
+        return this.evenColor;
+    }
+
+    /**
+     * アプリケーション情報ダイアログを表示する.
+     */
     @Action
     public void showAboutBox() {
         if (aboutBox == null) {
@@ -171,7 +231,7 @@ public class TextKeyMatcherView extends FrameView {
 
         mainPanel = new javax.swing.JPanel();
         dataViewTableSP = new javax.swing.JScrollPane();
-        dateViewTable = new javax.swing.JTable();
+        dataViewTable = new javax.swing.JTable();
         menuBar = new javax.swing.JMenuBar();
         javax.swing.JMenu fileMenu = new javax.swing.JMenu();
         newMenuItem = new javax.swing.JMenuItem();
@@ -209,12 +269,12 @@ public class TextKeyMatcherView extends FrameView {
 
         dataViewTableSP.setName("dataViewTableSP"); // NOI18N
 
-        dateViewTable.setModel(dataViewTableModel);
-        dateViewTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
+        dataViewTable.setModel(dataViewTableModel);
+        dataViewTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);
         org.jdesktop.application.ResourceMap resourceMap = org.jdesktop.application.Application.getInstance(textkeymatcher.TextKeyMatcherApp.class).getContext().getResourceMap(TextKeyMatcherView.class);
-        dateViewTable.setGridColor(resourceMap.getColor("dateViewTable.gridColor")); // NOI18N
-        dateViewTable.setName("dateViewTable"); // NOI18N
-        dataViewTableSP.setViewportView(dateViewTable);
+        dataViewTable.setGridColor(resourceMap.getColor("dataViewTable.gridColor")); // NOI18N
+        dataViewTable.setName("dataViewTable"); // NOI18N
+        dataViewTableSP.setViewportView(dataViewTable);
 
         javax.swing.GroupLayout mainPanelLayout = new javax.swing.GroupLayout(mainPanel);
         mainPanel.setLayout(mainPanelLayout);
@@ -410,6 +470,10 @@ public class TextKeyMatcherView extends FrameView {
         bindingGroup.bind();
     }// </editor-fold>//GEN-END:initComponents
 
+    /**
+     * インポート設定ダイアログのモデル.<br>
+     * 再表示時に前回使用したモデルが再利用される.<br>
+     */
     private ImportDataDialogModel importDataDialogModel;
 
     /**
@@ -654,9 +718,9 @@ public class TextKeyMatcherView extends FrameView {
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JRadioButtonMenuItem allRadioButtonMenuItem;
     private javax.swing.JMenu dataMenu;
+    private javax.swing.JTable dataViewTable;
     private textkeymatcher.ui.model.DataViewTableModel dataViewTableModel;
     private javax.swing.JScrollPane dataViewTableSP;
-    private javax.swing.JTable dateViewTable;
     private javax.swing.JRadioButtonMenuItem existsLeftRadioButtonMenuItem;
     private javax.swing.JMenu helpMenu;
     private javax.swing.JPopupMenu.Separator jSeparator1;

--- a/src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
+++ b/src/textkeymatcher/ui/resources/TextKeyMatcherView.properties
@@ -52,8 +52,6 @@ onImportData.BlockingDialog.optionPane.message=wait a moment
 onImportData.Action.accelerator=shortcut I
 onImportData.Action.shortDescription=import data
 onImportData.Action.text=
-#NOI18N
-dateViewTable.gridColor=153, 153, 153
 onSave.Action.text=
 onSave.Action.shortDescription=
 onLoad.Action.text=
@@ -66,3 +64,4 @@ onNew.Action.accelerator=shortcut N
 onLoad.Action.accelerator=shortcut O
 onSave.Action.accelerator=shortcut S
 aboutMenuItem.text=\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831...(A)
+dataViewTable.gridColor=153, 153, 153

--- a/src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP.properties
+++ b/src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP.properties
@@ -23,7 +23,6 @@ onImportData.BlockingDialog.title=\u30ed\u30fc\u30c9\u4e2d
 onImportData.BlockingDialog.optionPane.message=\u3057\u3070\u3089\u304f\u304a\u5f85\u3061\u304f\u3060\u3055\u3044
 onImportData.Action.accelerator=shortcut I
 onImportData.Action.shortDescription=\u30a4\u30f3\u30dd\u30fc\u30c8
-dateViewTable.gridColor=153, 153, 153
 showAboutBox.Action.text=\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831(&A)...
 showAboutBox.Action.shortDescription=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u60c5\u5831\u3092\u958b\u304f
 StatusBar.messageTimeout=5000
@@ -56,3 +55,4 @@ onNew.Action.accelerator=shortcut N
 onLoad.Action.accelerator=shortcut O
 onSave.Action.accelerator=shortcut S
 aboutMenuItem.text=\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831...(A)
+dataViewTable.gridColor=153, 153, 153

--- a/src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP_MAC.properties
+++ b/src/textkeymatcher/ui/resources/TextKeyMatcherView_ja_JP_MAC.properties
@@ -52,8 +52,6 @@ onImportData.BlockingDialog.optionPane.message=\u3057\u3070\u3089\u304f\u304a\u5
 onImportData.Action.accelerator=shortcut I
 onImportData.Action.shortDescription=\u30a4\u30f3\u30dd\u30fc\u30c8
 onImportData.Action.text=
-#NOI18N
-dateViewTable.gridColor=153, 153, 153
 onSave.Action.text=
 onSave.Action.shortDescription=
 onLoad.Action.text=