From 18a9d96b6b8ad5f22283a72403ace1733cbf783a Mon Sep 17 00:00:00 2001
From: Fabien Tessier <fabien.tessier@telecom-paristech.fr>
Date: Thu, 7 Dec 2017 15:45:48 +0100
Subject: [PATCH] Post merge commit (fix tests and compilation errors)
---
src/main/java/ui/GTURTLEModeling.java | 6 +++---
src/main/java/ui/MainGUI.java | 4 ++--
src/main/java/ui/TGUIAction.java | 4 ++--
.../ui/networkmodelloader/JDialogLoadingNetworkModel.java | 1 -
ttool/src/test/java/launcher/TestRshClient.java | 6 +++---
ttool/src/test/java/ui/TestGTURTLEModeling.java | 2 +-
6 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 47e33aef81..886ec68137 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -486,15 +486,15 @@ public class GTURTLEModeling {
CCode.toTextFormat();
try {
- if( SpecConfigTTool.CCodeDirectory.equals("") ) {
+ if( directory.equals("") ) {
JOptionPane.showMessageDialog( mgui.frame,
"No directory for C code generation found in config.xml. The C code cannot be generated.",
"Control code generation failed", JOptionPane.INFORMATION_MESSAGE );
return true;
}
else {
- FileUtils.checkAndCreateCCodeDir(SpecConfigTTool.CCodeDirectory);
- CCode.saveFile( SpecConfigTTool.CCodeDirectory + File.separator, applicationName );
+ FileUtils.checkAndCreateCCodeDir(directory);
+ CCode.saveFile( directory + File.separator, applicationName );
}
}
catch( Exception e ) {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index e08dde5547..88b27cc164 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -4330,7 +4330,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
adp = (AvatarDesignPanel) tp;
limit=false;
}
- JDialogProverifVerification jgen = new JDialogProverifVerification(frame, this, "Security verification with ProVerif", ConfigurationTTool.ProVerifVerifierHost, SpecConfigTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath, adp,limit);
+ JDialogProverifVerification jgen = new JDialogProverifVerification(frame, this, "Security verification with ProVerif", ConfigurationTTool.ProVerifVerifierHost, SpecConfigTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath, adp,limit, gtm.getCPUTaskMap());
// jgen.setSize(500, 450);
GraphicLib.centerOnParent(jgen, 600, 800);
jgen.setVisible(true);
@@ -4339,7 +4339,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void dse(){
TraceManager.addDev("Design space exploration");
- JDialogDSE jdse= new JDialogDSE(frame, this, "Design Space Exploration", SpecConfigTTool.SystemCCodeDirectory, SpecConfigTTool.TMLCodeDirectory, gtm.getCPUTaskMap());
+ JDialogDSE jdse= new JDialogDSE(frame, this, "Design Space Exploration", SpecConfigTTool.SystemCCodeDirectory, SpecConfigTTool.TMLCodeDirectory);
// jdse.setSize(600,800);
GraphicLib.centerOnParent(jdse, 600,800);
jdse.setVisible(true);
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 5472a921f6..1d0fbefde1 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -67,7 +67,7 @@ public class TGUIAction extends AbstractAction {
// Actions
public static final int ACT_NEW = 0;
- public static final int ACT_NEW_PROJECT = 464;
+ public static final int ACT_NEW_PROJECT = 465;
public static final int ACT_NEW_DESIGN = 100;
public static final int ACT_NEW_ANALYSIS = 101;
public static final int ACT_OPEN = 1;
@@ -620,7 +620,7 @@ public class TGUIAction extends AbstractAction {
public static final int MOVE_ENABLED = 463;
public static final int FIRST_DIAGRAM = 464;
- public static final int NB_ACTION = 465;
+ public static final int NB_ACTION = 466;
private static final TAction [] actions = new TAction[NB_ACTION];
diff --git a/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java b/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java
index 6a372b47ab..a637c9fe30 100644
--- a/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java
+++ b/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java
@@ -314,7 +314,6 @@ public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements Ac
// Wait 5seconds before refreshing panel
Thread.sleep(5000);
panel.repaint();
- }
} catch (Exception e) {
jta.append("Error when retreiving file: " + url + "\n No internet connection?\n No right for the Java Virtual Machine to use http connections?\n\n");
diff --git a/ttool/src/test/java/launcher/TestRshClient.java b/ttool/src/test/java/launcher/TestRshClient.java
index 4a3dc390b0..a6ab1e75a8 100644
--- a/ttool/src/test/java/launcher/TestRshClient.java
+++ b/ttool/src/test/java/launcher/TestRshClient.java
@@ -24,9 +24,9 @@ public class TestRshClient {
private static final String EXPECTED_COMMAND_OUTPUT = "!!!Hello World!!!" + System.lineSeparator();
private static final String TEST_PROGRAM_NAME = "helloWorld";
- private static final String TEST_COMMAND = "./resources/test/launcher/" + TEST_PROGRAM_NAME;
- private static final String TEST_COMMAND_NON_STOP = "./resources/test//launcher/helloWorldNonStop";
- private static final String TEST_FILE_NAME = "./resources/test/launcher/test.txt";
+ private static final String TEST_COMMAND = "./resources/launcher/" + TEST_PROGRAM_NAME;
+ private static final String TEST_COMMAND_NON_STOP = "./resources/launcher/helloWorldNonStop";
+ private static final String TEST_FILE_NAME = "./resources/launcher/test.txt";
private static final String TEST_FILE_DATA = "testDatafhkenomrcg ,jgh o";
diff --git a/ttool/src/test/java/ui/TestGTURTLEModeling.java b/ttool/src/test/java/ui/TestGTURTLEModeling.java
index e9c8e40823..1f8f184c73 100644
--- a/ttool/src/test/java/ui/TestGTURTLEModeling.java
+++ b/ttool/src/test/java/ui/TestGTURTLEModeling.java
@@ -16,7 +16,7 @@ import myutil.FileUtils;
public class TestGTURTLEModeling extends AbstractUITest {
- private static final String RESOURCES_DIR = "resources/test/ui/generateccode/";
+ private static final String RESOURCES_DIR = "resources/ui/generateccode/";
private final IComparator textComparator;
--
GitLab