• 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

Revision104 (tree)
Time2014-12-09 19:51:59
Authortuna_p

Log Message

(empty log message)

Change Summary

Incremental Difference

--- branches/b3/WebScraping/src/Form/HtmlSearch.java (revision 103)
+++ branches/b3/WebScraping/src/Form/HtmlSearch.java (revision 104)
@@ -23,7 +23,6 @@
2323
2424 import WebScraping.HtmlParser;
2525 import WebScraping.SearchData;
26-import java.awt.Color;
2726 import java.awt.Desktop;
2827 import java.io.File;
2928 import java.io.IOException;
@@ -196,7 +195,7 @@
196195 jPanelTab1Layout.setVerticalGroup(
197196 jPanelTab1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
198197 .addGroup(jPanelTab1Layout.createSequentialGroup()
199- .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 143, Short.MAX_VALUE)
198+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 173, Short.MAX_VALUE)
200199 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
201200 .addGroup(jPanelTab1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
202201 .addComponent(jBtnRowDel)
@@ -268,7 +267,7 @@
268267 );
269268 jPanelRtnLayout.setVerticalGroup(
270269 jPanelRtnLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
271- .addComponent(jScrollPaneRtn, javax.swing.GroupLayout.DEFAULT_SIZE, 157, Short.MAX_VALUE)
270+ .addComponent(jScrollPaneRtn, javax.swing.GroupLayout.DEFAULT_SIZE, 163, Short.MAX_VALUE)
272271 );
273272
274273 jMenu1.setText("ファイル");
@@ -334,7 +333,7 @@
334333 .addComponent(jTxtUrl, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
335334 .addComponent(jBtnSearch))
336335 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
337- .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 220, javax.swing.GroupLayout.PREFERRED_SIZE)
336+ .addComponent(jTabbedPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 250, javax.swing.GroupLayout.PREFERRED_SIZE)
338337 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
339338 .addComponent(jPanelRtn, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
340339 .addContainerGap())
@@ -459,19 +458,13 @@
459458 break;
460459 }
461460 }
462- } catch (ClassNotFoundException ex) {
461+ } catch (ClassNotFoundException
462+ | InstantiationException
463+ | IllegalAccessException
464+ | javax.swing.UnsupportedLookAndFeelException ex) {
463465 java.util.logging.Logger.getLogger(HtmlSearch.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
464- } catch (InstantiationException ex) {
465- java.util.logging.Logger.getLogger(HtmlSearch.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
466- } catch (IllegalAccessException ex) {
467- java.util.logging.Logger.getLogger(HtmlSearch.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
468- } catch (javax.swing.UnsupportedLookAndFeelException ex) {
469- java.util.logging.Logger.getLogger(HtmlSearch.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
470466 }
471467 //</editor-fold>
472- //</editor-fold>
473- //</editor-fold>
474- //</editor-fold>
475468
476469 /* Create and display the form */
477470 java.awt.EventQueue.invokeLater(new Runnable() {
--- branches/b3/WebScraping/src/Form/SearchDataRW.java (revision 103)
+++ branches/b3/WebScraping/src/Form/SearchDataRW.java (revision 104)
@@ -201,35 +201,35 @@
201201 public void saveXml(File file) {
202202 try {
203203 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
204- DocumentBuilder builder = factory.newDocumentBuilder();
205- DOMImplementation domImpl = builder.getDOMImplementation();
204+ DocumentBuilder wkBuilder = factory.newDocumentBuilder();
205+ DOMImplementation domImpl = wkBuilder.getDOMImplementation();
206206
207- Document document = domImpl.createDocument("","searchdata",null);
208- Element root = document.getDocumentElement();
207+ Document doc = domImpl.createDocument("","searchdata",null);
208+ Element wkRoot = doc.getDocumentElement();
209209
210210 // URL
211- Element url = document.createElement("url");
212- url.appendChild(document.createTextNode(UrlAdress));
213- root.appendChild(url);
211+ Element url = doc.createElement("url");
212+ url.appendChild(doc.createTextNode(UrlAdress));
213+ wkRoot.appendChild(url);
214214
215215 // 検索情報
216216 for (Object slist1 : slist) {
217217 SearchData sdat = (SearchData) slist1;
218218
219- Element cslist = document.createElement("searchlist");
220- Element item = document.createElement("item");
221- Element htmltag = document.createElement("htmltag");
222- Element htmlid = document.createElement("htmlid");
223- Element htmlclass = document.createElement("htmlclass");
224- Element around = document.createElement("around");
225- Element regexp = document.createElement("regexp");
219+ Element cslist = doc.createElement("searchlist");
220+ Element item = doc.createElement("item");
221+ Element htmltag = doc.createElement("htmltag");
222+ Element htmlid = doc.createElement("htmlid");
223+ Element htmlclass = doc.createElement("htmlclass");
224+ Element around = doc.createElement("around");
225+ Element regexp = doc.createElement("regexp");
226226
227- item.appendChild(document.createTextNode(sdat.getitem()));
228- htmltag.appendChild(document.createTextNode(sdat.getHtmltag()));
229- htmlid.appendChild(document.createTextNode(sdat.getHtmlid()));
230- htmlclass.appendChild(document.createTextNode(sdat.getHtmlclass()));
231- around.appendChild(document.createTextNode(sdat.getaround()));
232- regexp.appendChild(document.createTextNode(sdat.getregexp()));
227+ item.appendChild(doc.createTextNode(sdat.getitem()));
228+ htmltag.appendChild(doc.createTextNode(sdat.getHtmltag()));
229+ htmlid.appendChild(doc.createTextNode(sdat.getHtmlid()));
230+ htmlclass.appendChild(doc.createTextNode(sdat.getHtmlclass()));
231+ around.appendChild(doc.createTextNode(sdat.getaround()));
232+ regexp.appendChild(doc.createTextNode(sdat.getregexp()));
233233
234234 cslist.appendChild(item);
235235 cslist.appendChild(htmltag);
@@ -237,14 +237,14 @@
237237 cslist.appendChild(htmlclass);
238238 cslist.appendChild(around);
239239 cslist.appendChild(regexp);
240-
241- root.appendChild(cslist);
240+
241+ wkRoot.appendChild(cslist);
242242 }
243243 // 出力
244244 TransformerFactory transFactory = TransformerFactory.newInstance();
245245 Transformer transformer = transFactory.newTransformer();
246246
247- DOMSource source = new DOMSource(document);
247+ DOMSource source = new DOMSource(doc);
248248 FileOutputStream os = new FileOutputStream(file);
249249 StreamResult result = new StreamResult(os);
250250 transformer.transform(source, result);
@@ -267,19 +267,19 @@
267267
268268 try {
269269 DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
270- DocumentBuilder builder = factory.newDocumentBuilder();
271- Document doc = builder.parse(file);
270+ DocumentBuilder wkBuilder = factory.newDocumentBuilder();
271+ Document doc = wkBuilder.parse(file);
272272
273273 // ルート要素の取得
274- Element root = doc.getDocumentElement();
274+ Element wkRoot = doc.getDocumentElement();
275275
276276 // URL
277- NodeList url = root.getElementsByTagName("url");
277+ NodeList url = wkRoot.getElementsByTagName("url");
278278 Node urlnode = url.item(0);
279279 UrlAdress = urlnode.getFirstChild().getNodeValue();
280280
281281 // 検索情報
282- NodeList cslist = root.getElementsByTagName("searchlist");
282+ NodeList cslist = wkRoot.getElementsByTagName("searchlist");
283283 for(int i = 0; i < cslist.getLength(); i++) {
284284 SearchData sdat = new SearchData();
285285
@@ -337,7 +337,7 @@
337337 }
338338
339339 public ArrayList<SearchData> loadSearchList() {
340- ArrayList<SearchData> slist = new ArrayList<>();
340+ ArrayList<SearchData> sdatlst = new ArrayList<>();
341341
342342 NodeList nodelist = root.getElementsByTagName("searchlist");
343343 for(int i = 0; i < nodelist.getLength(); i++) {
@@ -389,9 +389,9 @@
389389 }
390390 }
391391 }
392- if(sdatflg) slist.add(sdat);
392+ if(sdatflg) sdatlst.add(sdat);
393393 }
394- return slist;
394+ return sdatlst;
395395 }
396396
397397 public Element loadElement(String elementTagName) {
@@ -414,11 +414,13 @@
414414 checkdoc();
415415 removeElement("searchlist"); // 既にElementが存在してた場合、一度削除
416416
417+ int count = 0;
417418 for (Object slist1 : slist) {
418419 SearchData sdat = (SearchData) slist1;
419420
420421 Element cslist = document.createElement("searchlist");
421-
422+ cslist.setAttribute("listNo", String.valueOf(++count));
423+
422424 addChild(cslist, "item", sdat.getitem());
423425 addChild(cslist, "htmltag", sdat.getHtmltag());
424426 addChild(cslist, "htmlid", sdat.getHtmlid());