diff --git a/.idea/misc.xml b/.idea/misc.xml
index 51e5191ed4bd4e6ffe2a1823753c5d6f92894ab9..b755d8ca46c060cb7a2b6b29b7ec83e02b8b71e2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -38,7 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build" />
</component>
</project>
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2c3f8e08106d0d8c596606c09eb77e2cc4478dbc..69cabd0fef3af27430a8e6a4a079fa42111732ff 100755
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ JAVADOC = javadoc
MAKE = make -s
TAR = tar
GZIP = gzip
-GRADLE = $(shell which gradle) -q
+GRADLE = $(shell which gradle)
GRADLE_VERSION_NEEDED = 3.3
ERROR_MSG = printf "$(COLOR)\nBuild with gradle failed. Falling back to regular javac command...\n$(RESET)"
diff --git a/build.txt b/build.txt
index 8d86089a92b22e96532725d246d63bebc0157867..12abeccdea7af702eee84cbe155552c61ca14a17 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-12505
\ No newline at end of file
+12521
\ No newline at end of file
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 6088a4efc3a70fd2fa86238e85a6a81de2ce3d49..7d672613096d4a06ece91a80b00ce1f2208594d7 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -381,10 +381,17 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
public void build() {
// Swing look and feel
+ //try {
try {
- UIManager.setLookAndFeel(
- UIManager.getCrossPlatformLookAndFeelClassName());
- } catch (Exception e) { ErrorGUI.exit(ErrorGUI.GUI);}
+ UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());
+ } catch (ClassNotFoundException | InstantiationException | UnsupportedLookAndFeelException e) {
+ ErrorGUI.exit(ErrorGUI.GUI);
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ ErrorGUI.exit(ErrorGUI.GUI);
+ e.printStackTrace();
+ }
+ //} catch (Exception e) { ErrorGUI.exit(ErrorGUI.GUI);}
// Creating main container
frame = new JFrame("TTool");
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index 6eac6827db5f7a190c3466eef1c3c7735615a48b..19814b97d42c0376d8a2aa5fffdf4ce5e7c17b75 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -37,8 +37,6 @@
*/
-
-
package ui.util;
@@ -46,39 +44,40 @@ package ui.util;
* Class DefaultText
* Text of some windows
* Creation: 01/12/2003
- * @version 1.1 29/01/2004
+ *
* @author Ludovic APVRILLE
+ * @version 1.1 29/01/2004
*/
-public class DefaultText {
+public class DefaultText {
+
+ public static String BUILD = "12520";
+ public static String DATE = "2018/01/09 02:01:48 CET";
- public static String BUILD = "12504";
- public static String DATE = "2018/01/05 02:01:51 CET";
-
public static StringBuffer sbAbout = makeAbout();
-
+
public static String getAboutText() {
return new String(sbAbout);
}
-
+
public static String getVersion() {
return "1.0beta"; /* Set new release Nov. 16th, 2017 */
}
-
+
public static String getFullVersion() {
- return getVersion() + " -- build: " + DefaultText.BUILD + " date: " + DefaultText.DATE;
+ return getVersion() + " -- build: " + DefaultText.BUILD + " date: " + DefaultText.DATE;
}
-
+
private static StringBuffer makeAbout() {
StringBuffer sb = new StringBuffer();
sb.append("TTool version " + getFullVersion() + "\n");
- sb.append("Copyright IMT - Telecom ParisTech / Ludovic Apvrille \n");
- sb.append("\nContact: ludovic.apvrille@telecom-paristech.fr\n");
+ sb.append("Copyright IMT - Telecom ParisTech / Ludovic Apvrille \n");
+ sb.append("\nContact: ludovic.apvrille@telecom-paristech.fr\n");
sb.append("\nProgrammers\n\tTelecom ParisTech: Ludovic Apvrille, Dominique Blouin, Fabien Tessier, \n\tDaniel Knorreck, Florian Lugou, Letitia Li\n");
- sb.append("\n\tNokia: Andrea Enrici\n");
- sb.append("\n\tLIP6: Daniela Genius\n");
+ sb.append("\n\tNokia: Andrea Enrici\n");
+ sb.append("\n\tLIP6: Daniela Genius\n");
sb.append("\nFor more information:\n");
sb.append("http://ttool.telecom-paristech.fr/\n\n");
return sb;
}
-
+
}
diff --git a/ttool/src/test/java/test/AbstractTest.java b/ttool/src/test/java/test/AbstractTest.java
index 385b84efd35afaeb6c3e401fe110aa1ed5c8d643..394ca6ac61e026109222e80135003b7e1e9f8e54 100644
--- a/ttool/src/test/java/test/AbstractTest.java
+++ b/ttool/src/test/java/test/AbstractTest.java
@@ -2,7 +2,7 @@ package test;
public abstract class AbstractTest {
- protected static String RESOURCES_DIR;
+ protected static String RESOURCES_DIR = "";
protected static String getBaseResourcesDir() {
final String systemPropResDir = System.getProperty( "resources_dir" );
diff --git a/ttool/src/test/java/ui/TestGTURTLEModeling.java b/ttool/src/test/java/ui/TestGTURTLEModeling.java
index 4a275e2780485f6a551820ada31b7f5158651c4f..1890ed119373037cc748fdf65cc571864ab604ca 100644
--- a/ttool/src/test/java/ui/TestGTURTLEModeling.java
+++ b/ttool/src/test/java/ui/TestGTURTLEModeling.java
@@ -20,8 +20,7 @@ public class TestGTURTLEModeling extends AbstractUITest {
//private static final String RESOURCES_DIR = "resources/ui/generateccode/";
@BeforeClass
- public static void setUpBeforeClass()
- throws Exception {
+ public static void setUpBeforeClass() throws Exception {
RESOURCES_DIR = getBaseResourcesDir() + "ui/generateccode/";
}
@@ -49,6 +48,11 @@ public class TestGTURTLEModeling extends AbstractUITest {
mainGui.gtm.generateCCode( codeDir );
+ /*try {
+ Thread.sleep(5000);
+ } catch (Exception ignored) {
+ }*/
+
try {
final IComparisonReport difference = textComparator.compare( new File( codeDir ), new File( codeDirExpected ) );