diff --git a/bin/config.xml b/bin/config.xml
index ebd7b06feb4e34610bc70579887a05090535200a..c48d8ef295037a680976f1e888010f1ba4942c25 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -61,11 +61,11 @@
<ExternalCommand2Host data="localhost"/>
<ExternalCommand2 data="/packages/uppaal(4.0.11/uppaal /home/enrici/TURTLE/uppaal/spec.xml"/>
-<LastOpenFile data="/home/trhuy/TURTLE/stuxnet.xml"/>
+<LastOpenFile data="/home/trhuy/Downloads/CSmartCardProtocol.xml"/>
<ExternalServer data="localhost:12345"/>
-<LastWindowAttributes x="358" y="70" width="792" height="597" max="false" />
+<LastWindowAttributes x="144" y="81" width="1219" height="597" max="false" />
</TURTLECONFIGURATION>
diff --git a/crawler/bin/client.jar b/crawler/bin/client.jar
index 7a797df0f521b4ba6b0f9ab08560ea3f72d9a416..45039104e300e939e8b597f8da0d36145ef52aaf 100644
Binary files a/crawler/bin/client.jar and b/crawler/bin/client.jar differ
diff --git a/crawler/bin/crawler.jar b/crawler/bin/crawler.jar
index 338302e499732d197f25d490fb9ad9cce4944b00..482a8add03c34186461990a58ee8be7099296f35 100755
Binary files a/crawler/bin/crawler.jar and b/crawler/bin/crawler.jar differ
diff --git a/crawler/bin/derby.log b/crawler/bin/derby.log
index 9493992d9a974fd90c72a333d26cc433f0dd5497..8fbfb9d8211b752c68a113feb8fb391b7cf0b6e4 100755
--- a/crawler/bin/derby.log
+++ b/crawler/bin/derby.log
@@ -1,14 +1,17 @@
-Mon Jun 15 00:29:33 CEST 2015 : Apache Derby Network Server - 10.8.3.0 - (1405108) started and ready to accept connections on port 1527
-----------------------------------------------------------------
-Mon Jun 15 00:29:34 CEST 2015:
-Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.3.0 - (1405108): instance a816c00e-014d-f431-2f30-000002d6fbe8
-on database directory /home/trhuy/TURTLE/crawler/bin/MyDatabase with class loader sun.misc.Launcher$AppClassLoader@3c7bf4c3
-Loaded from file:/home/trhuy/TURTLE/crawler/bin/derby.jar
-java.vendor=Oracle Corporation
-java.runtime.version=1.7.0_79-b14
-user.dir=/home/trhuy/TURTLE/crawler/bin
-os.name=Linux
-os.arch=amd64
-os.version=3.13.0-37-generic
-derby.system.home=null
-Database Class Loader started - derby.database.classpath=''
+Mon Jun 15 10:47:24 CEST 2015 : Could not listen on port 1527 on host 127.0.0.1:
+ java.net.BindException: Address already in use
+An exception was thrown during network server startup. DRDA_ListenPort.S:Could not listen on port 1527 on host 127.0.0.1:
+ java.net.BindException: Address already in use
+java.lang.reflect.InvocationTargetException
+ at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+ at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
+ at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+ at java.lang.reflect.Method.invoke(Method.java:606)
+ at org.apache.derby.iapi.jdbc.DRDAServerStarter.run(Unknown Source)
+ at java.lang.Thread.run(Thread.java:745)
+Caused by: java.lang.Exception: DRDA_ListenPort.S:Could not listen on port 1527 on host 127.0.0.1:
+ java.net.BindException: Address already in use
+ at org.apache.derby.impl.drda.NetworkServerControlImpl.consolePropertyMessageWork(Unknown Source)
+ at org.apache.derby.impl.drda.NetworkServerControlImpl.consolePropertyMessage(Unknown Source)
+ at org.apache.derby.impl.drda.NetworkServerControlImpl.blockingStart(Unknown Source)
+ ... 6 more
diff --git a/src/ui/MainGUI.java b/src/ui/MainGUI.java
index a1b2939a5b3d4006a250b268422e671734e8e4a6..005e57f130ea0ed324667723c1524ac234100bcb 100755
--- a/src/ui/MainGUI.java
+++ b/src/ui/MainGUI.java
@@ -2964,15 +2964,17 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
ArrayList<String> listSearch = new ArrayList<String>();
if (null == this.searchBox) {
- if (getCurrentTDiagramPanel().tdmm.getSelectComponents().size() == 0) {
- listSearch.add(textSearchField);
- }
- else{
- listSearch = getCurrentTDiagramPanel().tdmm.getSelectComponents();
- listSearch.add(0,textSearchField);
+ if (getCurrentTDiagramPanel()!=null) {
+ if (getCurrentTDiagramPanel().tdmm.getSelectComponents().size() == 0) {
+ listSearch.add(textSearchField);
+ } else {
+ listSearch = getCurrentTDiagramPanel().tdmm.getSelectComponents();
+ listSearch.add(0, textSearchField);
- }
- this.searchBox = new JDialogSearchBox(frame, "External Search", listSearch,getCurrentTDiagramPanel().tdmm);
+ }
+ this.searchBox = new JDialogSearchBox(frame, "External Search", listSearch, getCurrentTDiagramPanel().tdmm);
+ }else
+ this.searchBox = new JDialogSearchBox(frame, "External Search", new ArrayList<String>());
}
else {
diff --git a/src/ui/window/JDialogSearchBox.java b/src/ui/window/JDialogSearchBox.java
index 446c97b2306bce4655dc059f6428ccddbd626870..5a334938767e388fe854ca5df7a3507a7d48cb72 100644
--- a/src/ui/window/JDialogSearchBox.java
+++ b/src/ui/window/JDialogSearchBox.java
@@ -174,6 +174,21 @@ public class JDialogSearchBox extends javax.swing.JFrame {
this.setVisible(true);
+ }
+ public JDialogSearchBox(Frame _frame, String _title, ArrayList<String> l) {
+ //super(_frame, _title, true);
+ initComponents();
+ this.tdmm = tdmm;
+ this.setTitle("External Search");
+ GraphicLib.centerOnParent(this);
+ //String s="";
+ for (int i =0; i< l.size(); i++){
+ addValueListKeyword(l.get(i));
+ }
+ pack();
+
+ this.setVisible(true);
+
}
private void initComponents(){
@@ -232,16 +247,22 @@ public class JDialogSearchBox extends javax.swing.JFrame {
String SCORE_LIST[] = {"all", "5-7", "7-8", "8-9"};
String COLUMNTITLE_G[] ={"No", "Title", "Link"} ;
String COLUMNTITLE_GS[]= {"No", "Title", "Author", "Link"};
- String COLUMNTITLE_DB[]= {"No", "ID CVE", "Title"};
+ String COLUMNTITLE_DB[]= {"No", "ID CVE", "Title","Score"};
detailText_google.setContentType("text/html");
detailText_db.setContentType("text/html");
detailText_googleScholar.setContentType("text/html");
+ try {
+ jTextaddressDB.setText(ConfigurationTTool.ExternalServer);
+ dbaddress = jTextaddressDB.getText().split(":")[0];
+ dbport = Integer.parseInt(jTextaddressDB.getText().split(":")[1]);
+ }catch(ArrayIndexOutOfBoundsException exception) {
+ dbaddress="localhost";
+ dbport=12345;
+ jTextaddressDB.setText(dbaddress+Integer.toString(dbport));
+ }
- jTextaddressDB.setText(ConfigurationTTool.ExternalServer);
- dbaddress = jTextaddressDB.getText().split(":")[0];
- dbport = Integer.parseInt(jTextaddressDB.getText().split(":")[1]);
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setResizable(false);
@@ -396,7 +417,8 @@ public class JDialogSearchBox extends javax.swing.JFrame {
jScrollPane5.setViewportView(resultTable_db);
resultTable_db.getColumnModel().getColumn(0).setMaxWidth(40);
- resultTable_db.getColumnModel().getColumn(2).setMinWidth(120);
+ resultTable_db.getColumnModel().getColumn(2).setMinWidth(90);
+ resultTable_db.getColumnModel().getColumn(3).setMaxWidth(50);
jScrollPane7.setViewportView(detailText_db);
@@ -828,7 +850,8 @@ public class JDialogSearchBox extends javax.swing.JFrame {
private void WindowClosing(WindowEvent evt) {
- tdmm.clearSelectComponents();
+ if (tdmm !=null)
+ tdmm.clearSelectComponents();
this.dispose();
}