From 69238eeab7ec3c7566fd9544d270c9d2034d0a26 Mon Sep 17 00:00:00 2001
From: Dominique Blouin <dominique.blouin@telecom-paristech.fr>
Date: Thu, 5 Mar 2015 00:11:31 +0000
Subject: [PATCH] display SearchBox in center; eliminate the output to console
when searching.
---
src/myutil/GoogleSearch.java | 22 ++++++++++++----------
src/ui/TDiagramMouseManager.java | 3 ++-
src/ui/window/JDialogSearchBox.java | 8 +++++---
3 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/myutil/GoogleSearch.java b/src/myutil/GoogleSearch.java
index b58c77c46a..435f5a606b 100644
--- a/src/myutil/GoogleSearch.java
+++ b/src/myutil/GoogleSearch.java
@@ -1,5 +1,6 @@
package myutil;
+
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@@ -11,6 +12,7 @@ import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.jsoup.nodes.Document;
+import myutil.TraceManager;
public class GoogleSearch {
@@ -69,9 +71,9 @@ public class GoogleSearch {
if (descelement.size()!=0)
desc = descelement.first().text();
- System.out.println("Title: --> "+title);
- System.out.println("url: --> "+url);
- System.out.println("Decription: --> "+desc);
+ //TraceManager.addDev("Title: --> "+title);
+ //TraceManager.addDev("url: --> "+url);
+ //TraceManager.addDev("Decription: --> "+desc);
gs.setTitle(title);
gs.setUrl(url);
@@ -159,13 +161,13 @@ public class GoogleSearch {
}
- System.out.println("title-->"+title);
- System.out.println("url-->"+url);
- System.out.println("desc-->"+desc);
- System.out.println("author-->"+authors);
- System.out.println("cited number-->"+citedNumber);
- System.out.println("cited link-->"+citedLinks);
- System.out.println("related link-->"+related);
+ //TraceManager.addDev("title-->"+title);
+ //TraceManager.addDev("url-->"+url);
+ //TraceManager.addDev("desc-->"+desc);
+ //TraceManager.addDev("author-->"+authors);
+ //TraceManager.addDev("cited number-->"+citedNumber);
+ //TraceManager.addDev("cited link-->"+citedLinks);
+ //TraceManager.addDev("related link-->"+related);
gs.authors=authors;
gs.title=title;
diff --git a/src/ui/TDiagramMouseManager.java b/src/ui/TDiagramMouseManager.java
index 91577c3a15..9ba636d591 100755
--- a/src/ui/TDiagramMouseManager.java
+++ b/src/ui/TDiagramMouseManager.java
@@ -54,6 +54,7 @@ import myutil.*;
import java.util.ArrayList;
import ui.window.JDialogSearchBox;
+import myutil.TraceManager;
public class TDiagramMouseManager implements MouseListener, MouseMotionListener {
@@ -355,7 +356,7 @@ public class TDiagramMouseManager implements MouseListener, MouseMotionListener
selectedMultiComponents.add(tgc.getValue());
- System.out.println("cac component da select : " + selectedMultiComponents.toString());
+ //TraceManager.addDev("Selected components: " + selectedMultiComponents.toString());
}
else {
if (tdp.j.isShowing())
diff --git a/src/ui/window/JDialogSearchBox.java b/src/ui/window/JDialogSearchBox.java
index 7539a37aaa..0326bc1871 100644
--- a/src/ui/window/JDialogSearchBox.java
+++ b/src/ui/window/JDialogSearchBox.java
@@ -21,12 +21,15 @@ import javax.swing.JPanel;
import javax.swing.JTable;
import myutil.GoogleSearch;
+import myutil.GraphicLib;
import java.lang.Object;
import java.awt.Desktop;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
+import myutil.GraphicLib;
+
import javax.swing.table.AbstractTableModel;
import javax.swing.*;
@@ -77,6 +80,7 @@ public class JDialogSearchBox extends javax.swing.JFrame {
public JDialogSearchBox(Frame _frame, String _title, ArrayList<String> l) {
//super(_frame, _title, true);
initComponents();
+ GraphicLib.centerOnParent(this);
String s="";
for (int i =0; i< l.size(); i++){
addValueListKeyword(l.get(i));
@@ -374,7 +378,7 @@ public class JDialogSearchBox extends javax.swing.JFrame {
DefaultTableModel model = (DefaultTableModel) this.resultTable.getModel();
int rowindex = resultTable.getSelectedRow();
int id =0;
- System.out.println(rowindex);
+
if(rowindex >=0)
id= (int) resultTable.getValueAt(rowindex, 0);
GoogleSearch selected=null;
@@ -432,8 +436,6 @@ public class JDialogSearchBox extends javax.swing.JFrame {
public void putGoogleToTable(ArrayList<GoogleSearch> a)
{
- System.out.println(rows.size());
- System.out.println(a.size());
int i = this.rows.size()+1;
for (GoogleSearch gs : a){
this.rows.add(new Object[]{i, gs,"Google"});
--
GitLab