提交: 9c045045f3fa1a98c7098f56885ca94dbdc93c71 - TextKeyMatcher (git)

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

Commit MetaInfo

• 修订版: 9c045045f3fa1a98c7098f56885ca94dbdc93c71 (tree)
• 时间: 2011-10-12 02:05:44
• 作者: seraphy <seraphy@192....>
• Commiter: seraphy

Log Message

ライブラリ追加、ソース修正

更改概述

• modified: .gitignore
• add: lib/AppleJavaExtensions.jar
• add: lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
• add: lib/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar
• add: lib/beans-binding/beansbinding-1.2.1-doc.zip
• add: lib/beans-binding/beansbinding-1.2.1.jar
• add: lib/commons-lang3-3.0.1.jar
• add: lib/nblibraries.properties
• add: lib/swing-app-framework/appframework-1.0.3-doc.zip
• add: lib/swing-app-framework/appframework-1.0.3.jar
• add: lib/swing-app-framework/swing-worker-1.1.jar
• add: lib/swing-layout/swing-layout-1.0.4-doc.zip
• add: lib/swing-layout/swing-layout-1.0.4-src.zip
• add: lib/swing-layout/swing-layout-1.0.4.jar
• modified: nbproject/build-impl.xml
• modified: nbproject/genfiles.properties
• modified: nbproject/project.properties
• modified: nbproject/project.xml
• modified: src/textkeymatcher/entity/KeyMatchedDataModel.java
• modified: src/textkeymatcher/service/KeyMatcher.java

差异

--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /build/
-/nbproject/private/
\ No newline at end of file
+/nbproject/private/
+/dist/
\ No newline at end of file

Binary files /dev/null and b/lib/AppleJavaExtensions.jar differ

Binary files /dev/null and b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar differ

Binary files /dev/null and b/lib/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar differ

Binary files /dev/null and b/lib/beans-binding/beansbinding-1.2.1-doc.zip differ

Binary files /dev/null and b/lib/beans-binding/beansbinding-1.2.1.jar differ

Binary files /dev/null and b/lib/commons-lang3-3.0.1.jar differ

--- /dev/null
+++ b/lib/nblibraries.properties
@@ -0,0 +1,19 @@
+libs.beans-binding.classpath=\
+    ${base}/beans-binding/beansbinding-1.2.1.jar
+libs.beans-binding.javadoc=\
+    ${base}/beans-binding/beansbinding-1.2.1-doc.zip
+libs.CopyLibs.classpath=\
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+libs.JWSAntTasks.classpath=\
+    ${base}/JWSAntTasks/org-netbeans-modules-javawebstart-anttasks.jar
+libs.swing-app-framework.classpath=\
+    ${base}/swing-app-framework/appframework-1.0.3.jar:\
+    ${base}/swing-app-framework/swing-worker-1.1.jar
+libs.swing-app-framework.javadoc=\
+    ${base}/swing-app-framework/appframework-1.0.3-doc.zip
+libs.swing-layout.classpath=\
+    ${base}/swing-layout/swing-layout-1.0.4.jar
+libs.swing-layout.javadoc=\
+    ${base}/swing-layout/swing-layout-1.0.4-doc.zip
+libs.swing-layout.src=\
+    ${base}/swing-layout/swing-layout-1.0.4-src.zip!/swing-layout-1.0.4/src/java/

Binary files /dev/null and b/lib/swing-app-framework/appframework-1.0.3-doc.zip differ

Binary files /dev/null and b/lib/swing-app-framework/appframework-1.0.3.jar differ

Binary files /dev/null and b/lib/swing-app-framework/swing-worker-1.1.jar differ

Binary files /dev/null and b/lib/swing-layout/swing-layout-1.0.4-doc.zip differ

Binary files /dev/null and b/lib/swing-layout/swing-layout-1.0.4-src.zip differ

Binary files /dev/null and b/lib/swing-layout/swing-layout-1.0.4.jar differ

--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -43,18 +43,43 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>
         <property file="nbproject/private/private.properties"/>
     </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
+    <target name="-pre-init-libraries">
+        <property location="./lib/nblibraries.properties" name="libraries.path"/>
+        <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
+        <pathconvert dirsep="/" property="libraries.dir">
+            <path path="${libraries.dir.nativedirsep}"/>
+        </pathconvert>
+        <basename file="${libraries.path}" property="libraries.basename" suffix=".properties"/>
+        <available file="${libraries.dir}/${libraries.basename}-private.properties" property="private.properties.available"/>
+    </target>
+    <target depends="-pre-init-libraries" if="private.properties.available" name="-init-private-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.dir}/${libraries.basename}-private.properties">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-private-libraries" name="-init-libraries">
+        <loadproperties encoding="ISO-8859-1" srcfile="${libraries.path}">
+            <filterchain>
+                <replacestring from="$${base}" to="${libraries.dir}"/>
+                <escapeunicode/>
+            </filterchain>
+        </loadproperties>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
         <property name="default.javac.source" value="1.4"/>
         <property name="default.javac.target" value="1.4"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -205,7 +230,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -556,7 +581,7 @@ is divided into following sections:
     <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
         <property name="ap.cmd.line.internal" value=""/>
     </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
     <!--
                 ===================
                 COMPILATION SECTION

--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=6bcbf639
+build.xml.data.CRC32=2c6ec66d
 build.xml.script.CRC32=269ca5bc
 build.xml.stylesheet.CRC32=28e38971@1.44.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=6bcbf639
-nbproject/build-impl.xml.script.CRC32=a933e583
+nbproject/build-impl.xml.data.CRC32=2c6ec66d
+nbproject/build-impl.xml.script.CRC32=550200f7
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45

--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -26,8 +26,8 @@ dist.jar=${dist.dir}/TextKeyMatcher.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.AppleJavaExtensions.jar=/Users/seraphy/Documents/workspace/CharacterManaJ/extlib/AppleJavaExtensions.jar
-file.reference.commons-lang3-3.0.1.jar=/archives/Libs/commons-lang3-3.0.1/commons-lang3-3.0.1.jar
+file.reference.AppleJavaExtensions.jar=lib/AppleJavaExtensions.jar
+file.reference.commons-lang3-3.0.1.jar=lib/commons-lang3-3.0.1.jar
 file.reference.javaws.jar=/System/Library/Frameworks/JavaVM.framework/Resources/Deploy.bundle/Contents/Home/lib/javaws.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -40,8 +40,8 @@ javac.classpath=\
     ${libs.swing-layout.classpath}:\
     ${file.reference.commons-lang3-3.0.1.jar}
 # Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
+javac.compilerargs=-Xlint:unchecked
+javac.deprecation=true
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.6

--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -18,6 +18,9 @@
                 <root id="test.src.dir"/>
             </test-roots>
         </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>./lib/nblibraries.properties</definitions>
+        </libraries>
         <swingapp xmlns="http://www.netbeans.org/ns/form-swingapp/1">
             <application-class name="textkeymatcher.TextKeyMatcherApp"/>
         </swingapp>

--- a/src/textkeymatcher/entity/KeyMatchedDataModel.java
+++ b/src/textkeymatcher/entity/KeyMatchedDataModel.java
@@ -90,7 +90,9 @@ public class KeyMatchedDataModel {
             
             } else if (datas[column] instanceof List) {
                 // すでに2要素以上ある場合
-                ((List<String>) datas[column]).add(value);
+                @SuppressWarnings("unchecked")
+                List<String> lst = (List<String>) datas[column];
+                lst.add(value);
             
             } else {
                 // すでに存在する場合はリストにつめ直す.
@@ -122,7 +124,9 @@ public class KeyMatchedDataModel {
             Object data = datas[column];
             if (data != null && data instanceof List) {
                 // リスト格納であれば、要素数を返す
-                return ((List<String>) data).size();
+                @SuppressWarnings("unchecked")
+                List<String> lst = (List<String>) datas[column];
+                return lst.size();
             }
             // リストでなければ単一要素なので1を返す
             return 1;
@@ -137,6 +141,7 @@ public class KeyMatchedDataModel {
                 return "";
             }
             if (data instanceof List) {
+                @SuppressWarnings("unchecked")
                 List<String> lst = ((List<String>) data);
                 if (rowIndex >= 0 && rowIndex < lst.size()) {
                     // 複数データならば存在する行分だけ

--- a/src/textkeymatcher/service/KeyMatcher.java
+++ b/src/textkeymatcher/service/KeyMatcher.java
@@ -5,14 +5,13 @@
 package textkeymatcher.service;
 
 import java.math.BigDecimal;
-import java.util.Comparator;
 import org.apache.commons.lang3.StringUtils;
 
 /**
  *
  * @author seraphy
  */
-public enum KeyMatcher implements Comparator<String> {
+public enum KeyMatcher {
 
     TEXT(){
         @Override
@@ -120,7 +119,8 @@ public enum KeyMatcher implements Comparator<String> {
             return val.hashCode();
         }
     },;
-    
+
+    public abstract int compare(String k1, String k2);
     
     public abstract String getNormalize(String org);