From f8f1ab5195e5289b653cf4cb2ddea32b5f357dfc Mon Sep 17 00:00:00 2001
From: Fabien Tessier <fabien.tessier@telecom-paristech.fr>
Date: Thu, 21 Dec 2017 14:11:12 +0100
Subject: [PATCH] Merge project manager
---
src/main/java/dseengine/DSEConfiguration.java | 15 +-----
src/main/java/ui/TGUIAction.java | 6 +--
.../src/test/java/launcher/TestRshClient.java | 4 --
.../src/test/java/ui/TestGTURTLEModeling.java | 47 -------------------
4 files changed, 4 insertions(+), 68 deletions(-)
diff --git a/src/main/java/dseengine/DSEConfiguration.java b/src/main/java/dseengine/DSEConfiguration.java
index acebff3171..052824c9cc 100755
--- a/src/main/java/dseengine/DSEConfiguration.java
+++ b/src/main/java/dseengine/DSEConfiguration.java
@@ -83,11 +83,7 @@ public class DSEConfiguration implements Runnable {
private final String PATH_TO_CODE = "No directory selected for putting the generated code";
private final String PATH_TO_RESULTS = "No directory selected for putting the results";
private final String PATH_TO_SOURCE = "No source model selected";
-<<<<<<< Upstream, based on origin/63-implement-project-management-in-ttool
private final String NO_OUTPUT_SELECTED = "No format for the output (TXT, HTML) has been selected";
-=======
- private final String NO_OUTPUT_SELECTED = "No format ofr the output has been selected";
->>>>>>> a50bf94 Update on DSE engine
private final String LOAD_MAPPING_FAILED = "Loading of the mapping failed";
private final String LOAD_TASKMODEL_FAILED = "Loading of the task model failed";
private final String SIMULATION_COMPILATION_COMMAND_NOT_SET = "Compilation command missing";
@@ -979,10 +975,7 @@ public class DSEConfiguration implements Runnable {
nbOfRemainingSimulation --;
return tmp;
}
-<<<<<<< Upstream, based on origin/63-implement-project-management-in-ttool
-
-=======
->>>>>>> a50bf94 Update on DSE engine
+
public int replaceTapValues(double[] tap){
if (tap.length!=tapValues.length){
@@ -1652,15 +1645,9 @@ public class DSEConfiguration implements Runnable {
TMLArchitecture arch = map.getArch();
List<HwNode> nodes = arch.getCPUs();
for (HwNode node:nodes){
-<<<<<<< Upstream, based on origin/63-implement-project-management-in-ttool
HwBus bus = new HwBus("bus" +node.getName());
bus.privacy=1;
HwMemory mem = new HwMemory("memory_" +node.getName());
-=======
- HwBus bus = new HwBus("bus " +node.getName());
- bus.privacy=1;
- HwMemory mem = new HwMemory("memory " +node.getName());
->>>>>>> a50bf94 Update on DSE engine
HwLink hwlink = new HwLink("link_memory" +node.getName() + "_to_memorybus");
hwlink.bus=bus;
hwlink.hwnode=node;
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 47495b174f..934ce8592b 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -67,11 +67,11 @@ public class TGUIAction extends AbstractAction {
// Actions
public static final int ACT_NEW = 0;
- public static final int ACT_NEW_PROJECT = 465;
+ public static final int ACT_NEW_PROJECT = 471;
public static final int ACT_NEW_DESIGN = 100;
public static final int ACT_NEW_ANALYSIS = 101;
public static final int ACT_OPEN = 1;
- public static final int ACT_OPEN_PROJECT = 466;
+ public static final int ACT_OPEN_PROJECT = 472;
public static final int ACT_OPEN_FROM_NETWORK = 455;
public static final int ACT_OPEN_LAST = 154;
public static final int ACT_MERGE = 228;
@@ -629,7 +629,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 = 471;
+ public static final int NB_ACTION = 473;
private static final TAction [] actions = new TAction[NB_ACTION];
diff --git a/ttool/src/test/java/launcher/TestRshClient.java b/ttool/src/test/java/launcher/TestRshClient.java
index 2f931cd632..a6ab1e75a8 100644
--- a/ttool/src/test/java/launcher/TestRshClient.java
+++ b/ttool/src/test/java/launcher/TestRshClient.java
@@ -25,11 +25,7 @@ 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/launcher/" + TEST_PROGRAM_NAME;
-<<<<<<< Upstream, based on origin/63-implement-project-management-in-ttool
private static final String TEST_COMMAND_NON_STOP = "./resources/launcher/helloWorldNonStop";
-=======
- private static final String TEST_COMMAND_NON_STOP = "./resources//launcher/helloWorldNonStop";
->>>>>>> 906d6ee Fixed problem due to change in structure of resources directory for tests
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 5d00043a54..a71879d480 100644
--- a/ttool/src/test/java/ui/TestGTURTLEModeling.java
+++ b/ttool/src/test/java/ui/TestGTURTLEModeling.java
@@ -15,52 +15,6 @@ import fr.tpt.mem4csd.utils.compare.text.TextComparator;
import myutil.FileUtils;
public class TestGTURTLEModeling extends AbstractUITest {
-<<<<<<< Upstream, based on origin/63-implement-project-management-in-ttool
-
- private static final String RESOURCES_DIR = "resources/ui/generateccode/";
-
- private final IComparator textComparator;
-
- public TestGTURTLEModeling() {
- super();
-
- mainGui.openProjectFromFile( new File( RESOURCES_DIR + "models/ZigBeeTutorial.xml") );
-
- // FIXME: Temporarily ignoring the debug text file due to bug in comparator tool
- textComparator = new TextComparator( Collections.singletonList( "txt" ) );
- }
-
- private void testGenerateCCode( final String mappingDiagName ) {
- final TMLArchiPanel panel = findPanel( mappingDiagName );
- final Vector<TGComponent> compos = new Vector<TGComponent>( panel.tmlap.getComponentList() );
-
- assertTrue( mainGui.gtm.checkSyntaxTMLMapping( compos, panel, true ) );
-
- final String codeDir = RESOURCES_DIR + mappingDiagName + File.separator + "actual" + File.separator;
- FileUtils.deleteFiles( codeDir );
-
- final String codeDirExpected = RESOURCES_DIR + mappingDiagName + File.separator + "expected" + File.separator;
-
- mainGui.gtm.generateCCode( codeDir );
-
- try {
- final IComparisonReport difference = textComparator.compare( new File( codeDir ), new File( codeDirExpected ) );
-
- if ( difference.containsDiff() ) {
- difference.print();
-
- fail( "Generated code files are not the same!!!" );
- }
- else {
- FileUtils.deleteFiles( codeDir );
- }
- }
- catch ( final IOException ex ) {
- handleException( ex );
- }
- }
-
-=======
private static final String RESOURCES_DIR = "resources/ui/generateccode/";
@@ -105,7 +59,6 @@ public class TestGTURTLEModeling extends AbstractUITest {
}
}
->>>>>>> 7f80032 Update on dse scripts
private TMLArchiPanel findPanel( final String name ) {
for ( final TMLArchiPanel panel : mainGui.getTMLArchiDiagramPanels() ) {
if ( name.equals( mainGui.getTitleAt( panel ) ) ) {
--
GitLab