Commit: 57 - testroom1 (svn)

作業部屋の使い方を試しています。

Commit MetaInfo

• Revision: 57 (tree)
• Time: 2014-07-29 13:59:32
• Author: tuna_p

Log Message

HTML属性の取得方法を考える。

Change Summary

• modified: branches/HtmlTest2-b1/src/Form/HtmlSearch.java
• modified: branches/HtmlTest2-b1/src/Form/HtmlSearch.form
• normal: branches/HtmlTest2-b1/src/Lib/AttributeData.java
• modified: branches/HtmlTest2-b1/src/Lib/HtmlParserCallback.java

Incremental Difference

--- branches/HtmlTest2-b1/src/Form/HtmlSearch.java	(revision 56)
+++ branches/HtmlTest2-b1/src/Form/HtmlSearch.java	(revision 57)
@@ -183,11 +183,11 @@
         jPanel2.setLayout(jPanel2Layout);
         jPanel2Layout.setHorizontalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 387, Short.MAX_VALUE)
+            .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 532, Short.MAX_VALUE)
         );
         jPanel2Layout.setVerticalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
+            .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
         );
 
         jMenu1.setText("ファイル");

--- branches/HtmlTest2-b1/src/Lib/AttributeData.java	(revision 56)
+++ branches/HtmlTest2-b1/src/Lib/AttributeData.java	(revision 57)

Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property

--- branches/HtmlTest2-b1/src/Lib/HtmlParserCallback.java	(revision 56)
+++ branches/HtmlTest2-b1/src/Lib/HtmlParserCallback.java	(revision 57)
@@ -29,14 +29,14 @@
 import javax.swing.text.html.HTMLEditorKit;
 
 /**
- *
+ * ＨＴＭＬパーサ部品.
  * @author kgto
  */
 public class HtmlParserCallback extends HTMLEditorKit.ParserCallback {
 
     // デバック情報表示フラグ
-    //final boolean DEBUG = false;
-    final boolean DEBUG = true;
+    final boolean DEBUG = false;
+    //final boolean DEBUG = true;
     
     // Tag毎の階層
     HashMap<HTML.Tag,Integer> tagMap = new HashMap<>();
@@ -49,7 +49,6 @@
     // serach key と一致時の情報退避
     int bufCount = 0;
     HTML.Tag bufTag = null;
-    MutableAttributeSet bufAttr = null;
     // serach key と一致時の情報格納ワーク
     StringBuilder bufText;
     
@@ -104,13 +103,12 @@
         
         if(bufCount == 0) {
             if(tag.toString().equals(keytag)) {
-                if(serachAttribute(attr)) {
+                //if(serachAttribute(attr)) {
+                if(serachAttribute(tag, handleStartattrdata)) {    
                     bufCount = count;
                     bufTag   = tag;
-                    bufAttr  = attr;
+                    attrdata = new AttributeData();
                     bufText  = new StringBuilder();
-                    
-                    attrdata = new AttributeData();
                 }
             }
         }
@@ -155,7 +153,6 @@
             // 退避したserach keyとの一致情報クリア
             bufCount = 0;
             bufTag   = null;
-            bufAttr  = null;
             bufText  = null;
         }
 
@@ -244,4 +241,28 @@
         
         return false;
     }
+
+    /**
+     * ページ内のID/CLASS値と検索キーを比較する.
+     * @param tag
+     * @param attrdata
+     * @return boolean 検索キーと一致の時、true
+     */
+    public boolean serachAttribute(HTML.Tag tag, AttributeData attrdata) {
+        // ID と CLASS の両方にキー入力有りの場合
+        if(keyid.isEmpty() == false && keyclass.isEmpty() == false) {
+            if(attrdata.searchId(tag, keyid) && attrdata.searchClass(tag, keyclass)) {
+                return true;
+            }
+        }
+        // ID のキーチェック
+        if(keyid.isEmpty() == false) {
+            return attrdata.searchId(tag, keyid);
+        }
+        // CLASS のキーチェック
+        if(keyclass.isEmpty() == false) {
+            return attrdata.searchClass(tag, keyclass);
+        }
+        return false;
+    }
 }