Commit 12cb1c2b authored by apvrille's avatar apvrille

Resolving bug on dsez3 button

parent 56f6d1c6
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<root url="jar://$PROJECT_DIR$/libs/batik-util.jar!/" /> <root url="jar://$PROJECT_DIR$/libs/batik-util.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/batik-xml.jar!/" /> <root url="jar://$PROJECT_DIR$/libs/batik-xml.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/jautomata-core.jar!/" /> <root url="jar://$PROJECT_DIR$/libs/jautomata-core.jar!/" />
<root url="jar://$PROJECT_DIR$/libs/com.microsoft.z3.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/libs/commons-io-2.5-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/libs/commons-io-2.5-javadoc.jar!/" />
......
...@@ -7,6 +7,7 @@ TAR = tar ...@@ -7,6 +7,7 @@ TAR = tar
GZIP = gzip GZIP = gzip
GRADLE_NO_TEST = -x test GRADLE_NO_TEST = -x test
GRADLE_OPTIONS = --parallel GRADLE_OPTIONS = --parallel
#GRADLE_OPTIONS =
GRADLE = $(shell which gradle) GRADLE = $(shell which gradle)
GRADLE_VERSION_NEEDED = 3.3 GRADLE_VERSION_NEEDED = 3.3
ERROR_MSG = printf "$(COLOR)\nBuild with gradle failed. Falling back to regular javac command...\n$(RESET)" ERROR_MSG = printf "$(COLOR)\nBuild with gradle failed. Falling back to regular javac command...\n$(RESET)"
......
...@@ -323,7 +323,9 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener ...@@ -323,7 +323,9 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
//TraceManager.addDev("Show avatar options with b = " + b); //TraceManager.addDev("Show avatar options with b = " + b);
dse.setVisible(!b); dse.setVisible(!b);
dseZ3.setVisible(!b); if (dseZ3 != null) {
dseZ3.setVisible(!b);
}
avatarSimu.setVisible(b); avatarSimu.setVisible(b);
avatarFVUPPAAL.setVisible(b); avatarFVUPPAAL.setVisible(b);
...@@ -401,7 +403,9 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener ...@@ -401,7 +403,9 @@ public class JToolBarMainTurtle extends JToolBar implements ActionListener
//TraceManager.addDev("Show diplodocus options with b = " + b); //TraceManager.addDev("Show diplodocus options with b = " + b);
dse.setVisible(b); dse.setVisible(b);
dseZ3.setVisible(b); if (dseZ3 != null) {
dseZ3.setVisible(b);
}
avatarSimu.setVisible(!b); avatarSimu.setVisible(!b);
avatarFVUPPAAL.setVisible(!b); avatarFVUPPAAL.setVisible(!b);
avatarFVStaticAnalysis.setVisible(!b); avatarFVStaticAnalysis.setVisible(!b);
......
...@@ -405,6 +405,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per ...@@ -405,6 +405,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
//} catch (Exception e) { ErrorGUI.exit(ErrorGUI.GUI);} //} catch (Exception e) { ErrorGUI.exit(ErrorGUI.GUI);}
// Creating main container // Creating main container
frame = new JFrame("TTool"); frame = new JFrame("TTool");
frame.addWindowListener(this); frame.addWindowListener(this);
...@@ -503,6 +504,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per ...@@ -503,6 +504,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
// statusBar // statusBar
status = createStatusBar(); status = createStatusBar();
// Mouse handler // Mouse handler
mouseHandler = new MouseHandler(status); mouseHandler = new MouseHandler(status);
...@@ -515,6 +517,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per ...@@ -515,6 +517,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
// Panels // Panels
panelForTab = new JPanel(); panelForTab = new JPanel();
panelForTab.setLayout(new BorderLayout()); panelForTab.setLayout(new BorderLayout());
//panelForTree = new JPanel(); panelForTree.setLayout(new BorderLayout()); //panelForTree = new JPanel(); panelForTree.setLayout(new BorderLayout());
// Tree // Tree
dtree = new JDiagramTree(this); dtree = new JDiagramTree(this);
......
...@@ -165,11 +165,11 @@ public class TToolCLI implements InterpreterOutputInterface { ...@@ -165,11 +165,11 @@ public class TToolCLI implements InterpreterOutputInterface {
cli.print("Loading script:" + getInputFile(args)); cli.print("Loading script:" + getInputFile(args));
// Load script file // Load script file
File f = new File(getInputFile(args)); File f = new File(getInputFile(args));
if (!FileUtils.checkFileForOpen(f)) { if (!myutil.FileUtils.checkFileForOpen(f)) {
cli.printError("File " + f.getAbsolutePath() + " could not be opened."); cli.printError("File " + f.getAbsolutePath() + " could not be opened.");
cli.exit(-1); cli.exit(-1);
} }
script = FileUtils.loadFileData(f); script = myutil.FileUtils.loadFileData(f);
} }
} }
......
...@@ -55,3 +55,7 @@ jar { ...@@ -55,3 +55,7 @@ jar {
} }
mainClassName = 'Main' mainClassName = 'Main'
test {
testLogging.showStandardStreams = true
}
...@@ -6,21 +6,30 @@ import java.io.FileReader; ...@@ -6,21 +6,30 @@ import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.logging.Logger;
import myutil.PluginManager; import myutil.PluginManager;
import test.AbstractTest; import test.AbstractTest;
public abstract class AbstractUITest extends AbstractTest { public abstract class AbstractUITest extends AbstractTest {
protected final MainGUI mainGUI; protected MainGUI mainGUI = null;
protected AbstractUITest() { protected AbstractUITest() {
// DB: Not needed for tests (causes NPE) // DB: Not needed for tests (causes NPE)
//IconManager.loadImg(); //IconManager.loadImg();
mainGUI = new MainGUI(false,false, false, false, false, false, false, false, false, false, true, false, false); System.out.println("Creating main Window");
mainGUI.build(); mainGUI = new MainGUI(false, false, false, false, false, false, false, false, false, false, true, false, false);
PluginManager.pluginManager = new PluginManager(); System.out.println("Main Window new done");
mainGUI.build();
System.out.println("Main Window build done");
PluginManager.pluginManager = new PluginManager();
System.out.println("Main Window created");
} }
protected void openModel( final String fileName ) { protected void openModel( final String fileName ) {
......
...@@ -42,6 +42,7 @@ public class TestAvatarDesignPanelTranslator extends AbstractUITest { ...@@ -42,6 +42,7 @@ public class TestAvatarDesignPanelTranslator extends AbstractUITest {
public TestAvatarDesignPanelTranslator() { public TestAvatarDesignPanelTranslator() {
super(); super();
System.out.println("Test before super");
} }
private AvatarSpecification translateDiagramToAvatar( final String diagramName ) private AvatarSpecification translateDiagramToAvatar( final String diagramName )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment