• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revision113 (tree)
Time2015-01-02 17:54:20
Authortuna_p

Log Message

[作業途中]クラスSearchData内で複数データ保持するように変更

Change Summary

Incremental Difference

--- branches/b3/WebScraping/src/WebScraping/core/SearchData.java (revision 112)
+++ branches/b3/WebScraping/src/WebScraping/core/SearchData.java (revision 113)
@@ -22,12 +22,16 @@
2222
2323 package webScraping.core;
2424
25+import java.util.ArrayList;
26+
2527 /**
26- * 検索データ.
28+ * タグ検索データ.
2729 * @author kgto
2830 */
2931 public class SearchData {
30-
32+ /* ---------------------------------------------------------------------- *
33+ * フィールド
34+ * ---------------------------------------------------------------------- */
3135 private String item;
3236 private String htmltag;
3337 private String htmlid;
@@ -35,6 +39,83 @@
3539 private String around;
3640 private String regexp;
3741
42+ /* ---------------------------------------------------------------------- *
43+ * static 処理
44+ * ---------------------------------------------------------------------- */
45+ /**
46+ * データ属性 情報.
47+ */
48+ public static String[] columnName = {
49+ /* 0 */ "項目名",
50+ /* 1 */ "タグ",
51+ /* 2 */ "ID",
52+ /* 3 */ "クラス",
53+ /* 4 */ "位置",
54+ /* 5 */ "抽出条件"
55+ };
56+
57+ public static Class[] columnClass = {
58+ /* 0 */ String.class,
59+ /* 1 */ String.class,
60+ /* 2 */ String.class,
61+ /* 3 */ String.class,
62+ /* 4 */ String.class,
63+ /* 5 */ String.class
64+ };
65+
66+ /* ---------------------------------------------------------------------- */
67+ private static ArrayList<SearchData> slist = new ArrayList<>();
68+
69+ public static void addSearchData(
70+ String item, String htmltag, String htmlid,
71+ String htmlclass, String around, String regexp) {
72+ SearchData sdat = new SearchData();
73+ sdat.setitem(item);
74+ sdat.setHtmltag(htmltag);
75+ sdat.setHtmlid(htmlid);
76+ sdat.setHtmlclass(htmlclass);
77+ sdat.setaround(around);
78+ sdat.setregexp(regexp);
79+
80+ slist.add(sdat);
81+ }
82+
83+ public static void add(SearchData sdat) {
84+ slist.add(sdat);
85+ }
86+
87+ public static SearchData get(int i) {
88+ return slist.get(i);
89+ }
90+
91+ public static Object[] getObjData(int i) {
92+ SearchData sdat = get(i);
93+ Object[] obj = new Object[] {
94+ sdat.getitem(),
95+ sdat.getHtmltag(),
96+ sdat.getHtmlid(),
97+ sdat.getHtmlclass(),
98+ sdat.getaround(),
99+ sdat.getregexp()
100+ };
101+ return obj;
102+ }
103+
104+ public static int size() {
105+ return slist.size();
106+ }
107+
108+ public static SearchData remove(int index) {
109+ return slist.remove(index);
110+ }
111+
112+ public static void clear() {
113+ slist.clear();
114+ }
115+
116+ /* ---------------------------------------------------------------------- *
117+ * コンストラクタ
118+ * ---------------------------------------------------------------------- */
38119 public SearchData() {
39120 initialize();
40121 }
@@ -48,19 +129,9 @@
48129 this.regexp = dat.getregexp();
49130 }
50131
51- /**
52- * データ初期化.
53- */
54- public final void initialize() {
55- this.item = "";
56- this.htmltag = "";
57- this.htmlid = "";
58- this.htmlclass = "";
59- this.around = "";
60- this.regexp = "";
61- }
62-
63- // Setter
132+ /* ---------------------------------------------------------------------- *
133+ * Setter
134+ * ---------------------------------------------------------------------- */
64135 public void setitem(String item) {
65136 this.item = item;
66137 }
@@ -85,7 +156,9 @@
85156 this.regexp = regexp;
86157 }
87158
88- // Getter
159+ /* ---------------------------------------------------------------------- *
160+ * Getter
161+ * ---------------------------------------------------------------------- */
89162 public String getitem() {
90163 return item;
91164 }
@@ -110,4 +183,19 @@
110183 return regexp;
111184 }
112185
186+ /* ---------------------------------------------------------------------- *
187+ * メソッド
188+ * ---------------------------------------------------------------------- */
189+ /**
190+ * データ初期化.
191+ */
192+ public final void initialize() {
193+ this.item = "";
194+ this.htmltag = "";
195+ this.htmlid = "";
196+ this.htmlclass = "";
197+ this.around = "";
198+ this.regexp = "";
199+ }
200+
113201 }
--- branches/b3/WebScraping/src/WebScraping/utility/SearchDataRW.java (revision 112)
+++ branches/b3/WebScraping/src/WebScraping/utility/SearchDataRW.java (revision 113)
@@ -352,7 +352,7 @@
352352 return urladdress;
353353 }
354354
355- ArrayList<SearchData> loadSearchList() {
355+ public ArrayList<SearchData> loadSearchList() {
356356 ArrayList<SearchData> sdatlst = new ArrayList<>();
357357
358358 NodeList nodelist = root.getElementsByTagName("searchlist");
@@ -410,7 +410,7 @@
410410 return sdatlst;
411411 }
412412
413- String loadMsg404() {
413+ public String loadMsg404() {
414414 StringBuilder strbuf = new StringBuilder();
415415 NodeList nodelist = root.getElementsByTagName("msg404");
416416 for(int i = 0; i < nodelist.getLength(); i++) {
--- branches/b3/WebScraping/src/WebScraping/utility/HtmlSearch.java (revision 112)
+++ branches/b3/WebScraping/src/WebScraping/utility/HtmlSearch.java (revision 113)
@@ -34,6 +34,7 @@
3434 import javax.swing.JFileChooser;
3535 import javax.swing.filechooser.FileFilter;
3636 import javax.swing.filechooser.FileNameExtensionFilter;
37+import javax.swing.table.DefaultTableModel;
3738 import org.jdesktop.observablecollections.ObservableCollections;
3839
3940 /**
@@ -46,10 +47,14 @@
4647 private ArrayList slist = new ArrayList();
4748 private List serachDataList = ObservableCollections.observableList(slist);
4849
50+ SearchDataTableModel model;
51+
4952 /**
5053 * Creates new form Frame1
5154 */
5255 public HtmlSearch() {
56+ model = new SearchDataTableModel();
57+
5358 initComponents();
5459
5560 // カレントディレクトリ取得
@@ -445,6 +450,13 @@
445450 jTxtRtn.setCaretPosition(0);
446451 }
447452
453+ private void list2model() {
454+ model.setRowCount(0);
455+ for(int i = 0; i < SearchData.size(); i++) {
456+ model.addRow(SearchData.getObjData(i));
457+ }
458+ }
459+
448460 /**
449461 * @param args the command line arguments
450462 */
@@ -509,3 +521,22 @@
509521 private org.jdesktop.beansbinding.BindingGroup bindingGroup;
510522 // End of variables declaration//GEN-END:variables
511523 }
524+
525+class SearchDataTableModel extends DefaultTableModel {
526+
527+ @Override
528+ public String getColumnName(int modelIndex) {
529+ return SearchData.columnName[modelIndex];
530+ }
531+
532+ @Override
533+ public Class<?> getColumnClass(int modelIndex) {
534+ return SearchData.columnClass[modelIndex];
535+ }
536+
537+ @Override
538+ public int getColumnCount() {
539+ return SearchData.columnName.length;
540+ }
541+
542+}
\ No newline at end of file