• 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

Revision103 (tree)
Time2014-12-09 00:58:18
Authortuna_p

Log Message

(empty log message)

Change Summary

Incremental Difference

--- branches/b3/WebScraping/src/Form/HtmlSearch.java (revision 102)
+++ branches/b3/WebScraping/src/Form/HtmlSearch.java (revision 103)
@@ -23,6 +23,7 @@
2323
2424 import WebScraping.HtmlParser;
2525 import WebScraping.SearchData;
26+import java.awt.Color;
2627 import java.awt.Desktop;
2728 import java.io.File;
2829 import java.io.IOException;
@@ -63,6 +64,7 @@
6364 jFileChooser1.addChoosableFileFilter(filter1);
6465 jFileChooser1.addChoosableFileFilter(filter2);
6566 jFileChooser1.setFileFilter(filter1);
67+
6668 }
6769
6870 public List getSerachDataList() {
@@ -84,17 +86,24 @@
8486 bindingGroup = new org.jdesktop.beansbinding.BindingGroup();
8587
8688 jFileChooser1 = new javax.swing.JFileChooser();
89+ jRadioButton1 = new javax.swing.JRadioButton();
8790 jLabel1 = new javax.swing.JLabel();
8891 jTxtUrl = new javax.swing.JTextField();
8992 jBtnSearch = new javax.swing.JButton();
90- jPanel1 = new javax.swing.JPanel();
93+ jTabbedPane1 = new javax.swing.JTabbedPane();
94+ jPanelTab1 = new javax.swing.JPanel();
9195 jScrollPane1 = new javax.swing.JScrollPane();
9296 jTable1 = new javax.swing.JTable();
9397 jBtnRowIns = new javax.swing.JButton();
9498 jBtnRowDel = new javax.swing.JButton();
9599 jBtnRowCpy = new javax.swing.JButton();
96- jPanel2 = new javax.swing.JPanel();
97- jScrollPane2 = new javax.swing.JScrollPane();
100+ jPanelTab2 = new javax.swing.JPanel();
101+ jScrollPaneLabel = new javax.swing.JScrollPane();
102+ jTxtLabel = new javax.swing.JTextArea();
103+ jScrollPane404msg = new javax.swing.JScrollPane();
104+ jTxt404msg = new javax.swing.JTextArea();
105+ jPanelRtn = new javax.swing.JPanel();
106+ jScrollPaneRtn = new javax.swing.JScrollPane();
98107 jTxtRtn = new javax.swing.JTextArea();
99108 jMenuBar1 = new javax.swing.JMenuBar();
100109 jMenu1 = new javax.swing.JMenu();
@@ -107,6 +116,8 @@
107116 jFileChooser1.setCurrentDirectory(null);
108117 jFileChooser1.setDialogTitle("");
109118
119+ jRadioButton1.setText("jRadioButton1");
120+
110121 setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
111122 setTitle("タグ検索");
112123
@@ -119,7 +130,7 @@
119130 }
120131 });
121132
122- jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("検索情報"));
133+ jPanelTab1.setBorder(javax.swing.BorderFactory.createTitledBorder("検索情報"));
123134
124135 jTable1.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
125136 jTable1.getTableHeader().setReorderingAllowed(false);
@@ -169,11 +180,11 @@
169180 }
170181 });
171182
172- javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
173- jPanel1.setLayout(jPanel1Layout);
174- jPanel1Layout.setHorizontalGroup(
175- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
176- .addGroup(jPanel1Layout.createSequentialGroup()
183+ javax.swing.GroupLayout jPanelTab1Layout = new javax.swing.GroupLayout(jPanelTab1);
184+ jPanelTab1.setLayout(jPanelTab1Layout);
185+ jPanelTab1Layout.setHorizontalGroup(
186+ jPanelTab1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
187+ .addGroup(jPanelTab1Layout.createSequentialGroup()
177188 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
178189 .addComponent(jBtnRowCpy)
179190 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -182,32 +193,82 @@
182193 .addComponent(jBtnRowIns))
183194 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
184195 );
185- jPanel1Layout.setVerticalGroup(
186- jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
187- .addGroup(jPanel1Layout.createSequentialGroup()
188- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
196+ jPanelTab1Layout.setVerticalGroup(
197+ jPanelTab1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
198+ .addGroup(jPanelTab1Layout.createSequentialGroup()
199+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 143, Short.MAX_VALUE)
189200 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
190- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
201+ .addGroup(jPanelTab1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
191202 .addComponent(jBtnRowDel)
192203 .addComponent(jBtnRowIns)
193204 .addComponent(jBtnRowCpy)))
194205 );
195206
196- jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("検索結果"));
207+ jTabbedPane1.addTab("キー設定", jPanelTab1);
197208
209+ jPanelTab2.setBorder(javax.swing.BorderFactory.createTitledBorder("メッセージ"));
210+
211+ jScrollPaneLabel.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
212+ jScrollPaneLabel.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
213+
214+ jTxtLabel.setEditable(false);
215+ jTxtLabel.setBackground(java.awt.Color.lightGray);
216+ jTxtLabel.setColumns(20);
217+ jTxtLabel.setFont(new java.awt.Font("MS UI Gothic", 0, 12)); // NOI18N
218+ jTxtLabel.setLineWrap(true);
219+ jTxtLabel.setRows(2);
220+ jTxtLabel.setText("取得ページに以下のメッセージが含まれていた場合、対象データが取得出来なかったと通知します。");
221+ jTxtLabel.setAutoscrolls(false);
222+ jTxtLabel.setBorder(null);
223+ jTxtLabel.setCursor(new java.awt.Cursor(java.awt.Cursor.DEFAULT_CURSOR));
224+ jTxtLabel.setFocusable(false);
225+ jTxtLabel.setHighlighter(null);
226+ jTxtLabel.setKeymap(null);
227+ jTxtLabel.setOpaque(false);
228+ jTxtLabel.setRequestFocusEnabled(false);
229+ jTxtLabel.setVerifyInputWhenFocusTarget(false);
230+ jScrollPaneLabel.setViewportView(jTxtLabel);
231+
232+ jTxt404msg.setColumns(20);
233+ jTxt404msg.setRows(3);
234+ jTxt404msg.setText("一致する銘柄は見つかりませんでした\n");
235+ jScrollPane404msg.setViewportView(jTxt404msg);
236+
237+ javax.swing.GroupLayout jPanelTab2Layout = new javax.swing.GroupLayout(jPanelTab2);
238+ jPanelTab2.setLayout(jPanelTab2Layout);
239+ jPanelTab2Layout.setHorizontalGroup(
240+ jPanelTab2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
241+ .addComponent(jScrollPane404msg)
242+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanelTab2Layout.createSequentialGroup()
243+ .addContainerGap()
244+ .addComponent(jScrollPaneLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 359, Short.MAX_VALUE)
245+ .addContainerGap())
246+ );
247+ jPanelTab2Layout.setVerticalGroup(
248+ jPanelTab2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
249+ .addGroup(jPanelTab2Layout.createSequentialGroup()
250+ .addComponent(jScrollPaneLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE)
251+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
252+ .addComponent(jScrollPane404msg))
253+ );
254+
255+ jTabbedPane1.addTab("結果無し判定", jPanelTab2);
256+
257+ jPanelRtn.setBorder(javax.swing.BorderFactory.createTitledBorder("検索結果"));
258+
198259 jTxtRtn.setColumns(20);
199260 jTxtRtn.setRows(5);
200- jScrollPane2.setViewportView(jTxtRtn);
261+ jScrollPaneRtn.setViewportView(jTxtRtn);
201262
202- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
203- jPanel2.setLayout(jPanel2Layout);
204- jPanel2Layout.setHorizontalGroup(
205- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
206- .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 532, Short.MAX_VALUE)
263+ javax.swing.GroupLayout jPanelRtnLayout = new javax.swing.GroupLayout(jPanelRtn);
264+ jPanelRtn.setLayout(jPanelRtnLayout);
265+ jPanelRtnLayout.setHorizontalGroup(
266+ jPanelRtnLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
267+ .addComponent(jScrollPaneRtn)
207268 );
208- jPanel2Layout.setVerticalGroup(
209- jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
210- .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
269+ jPanelRtnLayout.setVerticalGroup(
270+ jPanelRtnLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
271+ .addComponent(jScrollPaneRtn, javax.swing.GroupLayout.DEFAULT_SIZE, 157, Short.MAX_VALUE)
211272 );
212273
213274 jMenu1.setText("ファイル");
@@ -256,6 +317,7 @@
256317 getContentPane().setLayout(layout);
257318 layout.setHorizontalGroup(
258319 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
320+ .addComponent(jPanelRtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
259321 .addGroup(layout.createSequentialGroup()
260322 .addComponent(jLabel1)
261323 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -262,8 +324,7 @@
262324 .addComponent(jTxtUrl)
263325 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
264326 .addComponent(jBtnSearch))
265- .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
266- .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
327+ .addComponent(jTabbedPane1)
267328 );
268329 layout.setVerticalGroup(
269330 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -273,9 +334,10 @@
273334 .addComponent(jTxtUrl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
274335 .addComponent(jBtnSearch))
275336 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
276- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
337+ .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
277338 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
278- .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
339+ .addComponent(jPanelRtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
340+ .addContainerGap())
279341 );
280342
281343 bindingGroup.bind();
@@ -325,23 +387,7 @@
325387 }//GEN-LAST:event_jMenuSaveActionPerformed
326388
327389 private void jMenu2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenu2MouseClicked
328- jTxtRtn.setText(null);
329- HtmlParser par = new HtmlParser(jTxtUrl.getText());
330-
331- String strdata = par.getStringPageData();
332- String strsearch = "一致する銘柄は見つかりませんでした";
333- if(check404(strdata, strsearch)) {
334- jTxtRtn.append(strsearch);
335- return;
336- }
337-
338- for (Object slist1 : slist) {
339- SearchData sdata = (SearchData)slist1;
340- String ans = sdata.getitem();
341- String rtn = par.search(sdata);
342- jTxtRtn.append(ans + "\t" + rtn + "\r\n");
343- }
344- jTxtRtn.setCaretPosition(0);
390+ Search_execution();
345391 }//GEN-LAST:event_jMenu2MouseClicked
346392
347393 private void jBtnRowCpyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnRowCpyActionPerformed
@@ -354,23 +400,7 @@
354400 }//GEN-LAST:event_jBtnRowCpyActionPerformed
355401
356402 private void jBtnSearchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnSearchActionPerformed
357- jTxtRtn.setText(null);
358- HtmlParser par = new HtmlParser(jTxtUrl.getText());
359-
360- String strdata = par.getStringPageData();
361- String strsearch = "一致する銘柄は見つかりませんでした";
362- if(check404(strdata, strsearch)) {
363- jTxtRtn.append(strsearch);
364- return;
365- }
366-
367- for (Object slist1 : slist) {
368- SearchData sdata = (SearchData)slist1;
369- String ans = sdata.getitem();
370- String rtn = par.search(sdata);
371- jTxtRtn.append(ans + "\t" + rtn + "\r\n");
372- }
373- jTxtRtn.setCaretPosition(0);
403+ Search_execution();
374404 }//GEN-LAST:event_jBtnSearchActionPerformed
375405
376406 private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed
@@ -385,11 +415,32 @@
385415 }
386416 }//GEN-LAST:event_jMenuItem1ActionPerformed
387417
388- boolean check404(String strdata, String strsearch) {
389- if(strdata.contains(strsearch)) {
390- return true;
418+ /**
419+ * 検索実行.
420+ */
421+ void Search_execution() {
422+ jTxtRtn.setText(null);
423+ HtmlParser par = new HtmlParser(jTxtUrl.getText());
424+
425+ // データ無し(404)判定
426+ String strdata = par.getStringPageData();
427+ String text = jTxt404msg.getText();
428+ String[] strsearch = text.split("\n");
429+ for(String strsearch1 : strsearch) {
430+ if(strdata.contains(strsearch1)) {
431+ jTxtRtn.append(strsearch1);
432+ return;
433+ }
391434 }
392- return false;
435+
436+ // 検索結果
437+ for (Object slist1 : slist) {
438+ SearchData sdata = (SearchData)slist1;
439+ String ans = sdata.getitem();
440+ String rtn = par.search(sdata);
441+ jTxtRtn.append(ans + "\t" + rtn + "\r\n");
442+ }
443+ jTxtRtn.setCaretPosition(0);
393444 }
394445
395446 /**
@@ -418,6 +469,9 @@
418469 java.util.logging.Logger.getLogger(HtmlSearch.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
419470 }
420471 //</editor-fold>
472+ //</editor-fold>
473+ //</editor-fold>
474+ //</editor-fold>
421475
422476 /* Create and display the form */
423477 java.awt.EventQueue.invokeLater(new Runnable() {
@@ -442,11 +496,18 @@
442496 private javax.swing.JMenuItem jMenuItem1;
443497 private javax.swing.JMenuItem jMenuLoad;
444498 private javax.swing.JMenuItem jMenuSave;
445- private javax.swing.JPanel jPanel1;
446- private javax.swing.JPanel jPanel2;
499+ private javax.swing.JPanel jPanelRtn;
500+ private javax.swing.JPanel jPanelTab1;
501+ private javax.swing.JPanel jPanelTab2;
502+ private javax.swing.JRadioButton jRadioButton1;
447503 private javax.swing.JScrollPane jScrollPane1;
448- private javax.swing.JScrollPane jScrollPane2;
504+ private javax.swing.JScrollPane jScrollPane404msg;
505+ private javax.swing.JScrollPane jScrollPaneLabel;
506+ private javax.swing.JScrollPane jScrollPaneRtn;
507+ private javax.swing.JTabbedPane jTabbedPane1;
449508 private javax.swing.JTable jTable1;
509+ private javax.swing.JTextArea jTxt404msg;
510+ private javax.swing.JTextArea jTxtLabel;
450511 private javax.swing.JTextArea jTxtRtn;
451512 private javax.swing.JTextField jTxtUrl;
452513 private org.jdesktop.beansbinding.BindingGroup bindingGroup;