From 52726a34226a8e8a9882107779c6167805a71f79 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Mon, 12 Mar 2018 16:19:13 +0100
Subject: [PATCH] Resolving bug on the creation of directoris for diplodocus
projects
---
src/main/java/myutil/FileUtils.java | 2 +-
.../JFrameInteractiveSimulation.java | 4 +++-
.../java/ui/window/JDialogSystemCGeneration.java | 14 ++++++++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/myutil/FileUtils.java b/src/main/java/myutil/FileUtils.java
index 77192e3996..363968d18b 100755
--- a/src/main/java/myutil/FileUtils.java
+++ b/src/main/java/myutil/FileUtils.java
@@ -53,7 +53,7 @@ import java.io.FilenameFilter;
* @version 1.1 01/12/2003
* @author Ludovic APVRILLE
*/
-public class FileUtils extends org.apache.commons.io.FileUtils{
+public class FileUtils extends org.apache.commons.io.FileUtils {
public final static String xml = "xml";
public final static String rtl = "lot";
diff --git a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
index d1d7d1970a..88c762e051 100755
--- a/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/main/java/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -2549,7 +2549,9 @@ public class JFrameInteractiveSimulation extends JFrame implements ActionListene
animateWithInfo.setEnabled(animate.isSelected());
openDiagram.setEnabled(animate.isSelected());
update.setSelected(false);
- sendCommand("run-exploration " + minimalCommandCoverage.getValue() + " " + minimalBranchCoverage.getValue() + " " + getCurrentRGName());
+ String graph = getCurrentRGName();
+ sendCommand("run-exploration " + minimalCommandCoverage.getValue() + " " + minimalBranchCoverage.getValue()
+ + " " + graph);
}
diff --git a/src/main/java/ui/window/JDialogSystemCGeneration.java b/src/main/java/ui/window/JDialogSystemCGeneration.java
index d0b12ef74a..24a5f84738 100755
--- a/src/main/java/ui/window/JDialogSystemCGeneration.java
+++ b/src/main/java/ui/window/JDialogSystemCGeneration.java
@@ -65,6 +65,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
+import java.io.File;
+
/**
* Class JDialogSystemCGeneration
* Dialog for managing the generation and compilation of SystemC code
@@ -161,6 +163,11 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
mgui = _mgui;
+ // Must first create all directories
+ new File(_pathCode).mkdirs();
+ new File(_graphPath).mkdirs();
+
+
pathCode = _pathCode;
pathCompiler = _pathCompiler;
@@ -178,13 +185,16 @@ public class JDialogSystemCGeneration extends JDialog implements ActionListener,
pathFormalExecute = pathInteractiveExecute;
+
int index = pathFormalExecute.indexOf("-server");
if (index != -1) {
- pathFormalExecute = pathFormalExecute.substring(0, index) + pathFormalExecute.substring(index + 7, pathFormalExecute.length());
+ pathFormalExecute = pathFormalExecute.substring(0, index) +
+ pathFormalExecute.substring(index + 7, pathFormalExecute.length());
pathFormalExecute += " -gname graph -explo";
-
}
+
+
simulatorHost = _simulatorHost;
automatic = _automatic;
--
GitLab