• 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

Revision29 (tree)
Time2014-06-25 19:32:38
Authortuna_p

Log Message

(empty log message)

Change Summary

Incremental Difference

--- HtmlTest2/src/test1/HtmlParser.java (revision 28)
+++ HtmlTest2/src/test1/HtmlParser.java (revision 29)
@@ -28,24 +28,35 @@
2828
2929 public HtmlParser(String UrlAdress) {
3030 this.UrlAdress = UrlAdress;
31+ getpageData();
3132 }
3233
3334 public void seturl(String UrlAdress) {
3435 this.UrlAdress = UrlAdress;
36+ getpageData();
3537 }
3638
3739 public String search(serachData skey) {
3840
41+ String item = skey.getitem();
3942 String htmltag = skey.getHtmltag();
4043 String htmlid = skey.getHtmlid();
4144 String htmlclass = skey.getHtmlclass();
45+ String around = skey.getaround();
46+ String regexp = skey.getregexp();
4247
43- getpageData();
48+ // 数値変換
49+ byte bAround = 0;
50+ if(around.length() > 0) {
51+ bAround = Byte.parseByte(around);
52+ }
53+
54+ //getpageData();
4455 serchpageData(skey);
45-
46- if(sData.size() > 0) {
47- String rtn = (String)sData.get(0);
48- return rtn;
56+
57+ if(bAround < sData.size()) {
58+ String rtn = (String)sData.get(bAround);
59+ return rtn;
4960 }
5061
5162 return null;
--- HtmlTest2/src/test1/Frame1.java (revision 28)
+++ HtmlTest2/src/test1/Frame1.java (revision 29)
@@ -20,7 +20,7 @@
2020
2121 private ArrayList slist = new ArrayList();
2222 private List serachDataList = ObservableCollections.observableList(slist);
23- serachDataIO sio = new serachDataIO();
23+ private serachDataIO sio = new serachDataIO();
2424
2525 /**
2626 * Creates new form Frame1
@@ -53,11 +53,12 @@
5353 jTable1 = new javax.swing.JTable();
5454 jBtnRowIns = new javax.swing.JButton();
5555 jBtnRowDel = new javax.swing.JButton();
56+ jBtnRowCpy = new javax.swing.JButton();
5657 jLabel1 = new javax.swing.JLabel();
5758 jTxtUrl = new javax.swing.JTextField();
5859 jPanel2 = new javax.swing.JPanel();
5960 jScrollPane2 = new javax.swing.JScrollPane();
60- jTextArea1 = new javax.swing.JTextArea();
61+ jTxtRtn = new javax.swing.JTextArea();
6162 jMenuBar1 = new javax.swing.JMenuBar();
6263 jMenu1 = new javax.swing.JMenu();
6364 jMenuLoad = new javax.swing.JMenuItem();
@@ -99,7 +100,7 @@
99100 jTableBinding.bind();
100101 jScrollPane1.setViewportView(jTable1);
101102
102- jBtnRowIns.setText("行追加");
103+ jBtnRowIns.setText("行挿入");
103104 jBtnRowIns.addActionListener(new java.awt.event.ActionListener() {
104105 public void actionPerformed(java.awt.event.ActionEvent evt) {
105106 jBtnRowInsActionPerformed(evt);
@@ -113,19 +114,25 @@
113114 }
114115 });
115116
117+ jBtnRowCpy.setText("行コピー");
118+ jBtnRowCpy.addActionListener(new java.awt.event.ActionListener() {
119+ public void actionPerformed(java.awt.event.ActionEvent evt) {
120+ jBtnRowCpyActionPerformed(evt);
121+ }
122+ });
123+
116124 javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
117125 jPanel1.setLayout(jPanel1Layout);
118126 jPanel1Layout.setHorizontalGroup(
119127 jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
120128 .addGroup(jPanel1Layout.createSequentialGroup()
121- .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
122- .addGroup(jPanel1Layout.createSequentialGroup()
123- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
124- .addComponent(jBtnRowDel)
125- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
126- .addComponent(jBtnRowIns))
127- .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 375, javax.swing.GroupLayout.PREFERRED_SIZE))
128- .addGap(0, 0, Short.MAX_VALUE))
129+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
130+ .addComponent(jBtnRowCpy)
131+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
132+ .addComponent(jBtnRowDel)
133+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
134+ .addComponent(jBtnRowIns))
135+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
129136 );
130137 jPanel1Layout.setVerticalGroup(
131138 jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -134,7 +141,8 @@
134141 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
135142 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
136143 .addComponent(jBtnRowDel)
137- .addComponent(jBtnRowIns)))
144+ .addComponent(jBtnRowIns)
145+ .addComponent(jBtnRowCpy)))
138146 );
139147
140148 jLabel1.setText("URL:");
@@ -141,15 +149,15 @@
141149
142150 jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("検索結果"));
143151
144- jTextArea1.setColumns(20);
145- jTextArea1.setRows(5);
146- jScrollPane2.setViewportView(jTextArea1);
152+ jTxtRtn.setColumns(20);
153+ jTxtRtn.setRows(5);
154+ jScrollPane2.setViewportView(jTxtRtn);
147155
148156 javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
149157 jPanel2.setLayout(jPanel2Layout);
150158 jPanel2Layout.setHorizontalGroup(
151159 jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
152- .addComponent(jScrollPane2)
160+ .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 387, Short.MAX_VALUE)
153161 );
154162 jPanel2Layout.setVerticalGroup(
155163 jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -182,11 +190,6 @@
182190 jMenu2MouseClicked(evt);
183191 }
184192 });
185- jMenu2.addActionListener(new java.awt.event.ActionListener() {
186- public void actionPerformed(java.awt.event.ActionEvent evt) {
187- jMenu2ActionPerformed(evt);
188- }
189- });
190193 jMenuBar1.add(jMenu2);
191194
192195 setJMenuBar(jMenuBar1);
@@ -195,14 +198,12 @@
195198 getContentPane().setLayout(layout);
196199 layout.setHorizontalGroup(
197200 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
198- .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
199- .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
200- .addGap(0, 0, Short.MAX_VALUE))
201201 .addGroup(layout.createSequentialGroup()
202202 .addComponent(jLabel1)
203203 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
204204 .addComponent(jTxtUrl))
205205 .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
206+ .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
206207 );
207208 layout.setVerticalGroup(
208209 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -212,7 +213,7 @@
212213 .addComponent(jTxtUrl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
213214 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
214215 .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
215- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
216+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
216217 .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
217218 );
218219
@@ -222,14 +223,14 @@
222223 }// </editor-fold>//GEN-END:initComponents
223224
224225 private void jBtnRowInsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnRowInsActionPerformed
226+ int SelectedRow = jTable1.getSelectedRow();
225227 serachData sdat = new serachData();
226- sdat.setitem("項目1");
227- sdat.setHtmltag("DIV");
228- sdat.setHtmlid("");
229- sdat.setHtmlclass("classkey1");
230- sdat.setaround("");
231- sdat.setregexp("");
232- this.serachDataList.add(sdat);
228+
229+ if(SelectedRow >= 0) {
230+ this.serachDataList.add(SelectedRow, sdat);
231+ } else {
232+ this.serachDataList.add(sdat);
233+ }
233234 }//GEN-LAST:event_jBtnRowInsActionPerformed
234235
235236 private void jBtnRowDelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnRowDelActionPerformed
@@ -257,32 +258,25 @@
257258 }
258259 }//GEN-LAST:event_jMenuSaveActionPerformed
259260
260- private void jMenu2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenu2ActionPerformed
261- // TODO add your handling code here:
261+ private void jMenu2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenu2MouseClicked
262262
263- System.out.println("jMenu2ActionPerformed");
264-
265- serachData sdat = (serachData)slist.get(0);
266-
267- HtmlParser par = new HtmlParser(jTxtUrl.getText());
268- String rtn = par.search(sdat);
269-// par.seturl(url);
270-// par.setserchkey(key);
271-
272- }//GEN-LAST:event_jMenu2ActionPerformed
273-
274- private void jMenu2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jMenu2MouseClicked
275- // TODO add your handling code here:
276263 System.out.println("jMenu2MouseClicked");
277-
278- serachData sdat = (serachData)slist.get(0);
279264
280265 HtmlParser par = new HtmlParser(jTxtUrl.getText());
281- String rtn = par.search(sdat);
282-
283- jTextArea1.setText(rtn);
266+ for (Object slist1 : slist) {
267+ String rtn = par.search((serachData)slist1);
268+ jTxtRtn.append(rtn + "\r\n");
269+ }
284270 }//GEN-LAST:event_jMenu2MouseClicked
285271
272+ private void jBtnRowCpyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnRowCpyActionPerformed
273+ int SelectedRow = jTable1.getSelectedRow();
274+ if(SelectedRow >= 0) {
275+ serachData SelectData = (serachData)slist.get(SelectedRow);
276+ this.serachDataList.add(SelectedRow, SelectData);
277+ }
278+ }//GEN-LAST:event_jBtnRowCpyActionPerformed
279+
286280 /**
287281 * @param args the command line arguments
288282 */
@@ -319,6 +313,7 @@
319313 }
320314
321315 // Variables declaration - do not modify//GEN-BEGIN:variables
316+ private javax.swing.JButton jBtnRowCpy;
322317 private javax.swing.JButton jBtnRowDel;
323318 private javax.swing.JButton jBtnRowIns;
324319 private javax.swing.JFileChooser jFileChooser1;
@@ -333,7 +328,7 @@
333328 private javax.swing.JScrollPane jScrollPane1;
334329 private javax.swing.JScrollPane jScrollPane2;
335330 private javax.swing.JTable jTable1;
336- private javax.swing.JTextArea jTextArea1;
331+ private javax.swing.JTextArea jTxtRtn;
337332 private javax.swing.JTextField jTxtUrl;
338333 private org.jdesktop.beansbinding.BindingGroup bindingGroup;
339334 // End of variables declaration//GEN-END:variables