diff --git a/build.txt b/build.txt index 5c87e4f36b15b2b57a244b59e332f97d05ebaf67..96949fa420491e75fb559b5bf2930f9ddca32dd9 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -12559 \ No newline at end of file +12562 \ No newline at end of file diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java index d2748b711a91eb02d02e72ac359061822b2cc9cb..8fda772d1d593561dd03fe342de5f855ea04bd5f 100755 --- a/src/main/java/ui/GTMLModeling.java +++ b/src/main/java/ui/GTMLModeling.java @@ -835,13 +835,6 @@ public class GTMLModeling { port1 = li.next(); if (!(alreadyConsidered.contains(port1))) { portstome = tmlcdp.tmlctdp.getPortsConnectedTo(port1, componentsToTakeIntoAccount); - //TraceManager.addDev("******** Considering port1 = " +port1.getPortName() + " size of connecting ports:" + portstome.size()); - - Iterator<TMLCPrimitivePort> ite = portstome.listIterator(); - while(ite.hasNext()) { - //TraceManager.addDev("port=" + ite.next().getPortName()); - ite.next(); - } if (portstome.size() < 1) { String msg = "port " + port1.getPortName() + " is not correctly connected"; diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java index 16fa452b8c195d2bb2d5286c337831521539b040..02f2ee106432745858b19e67b32bb78d37967c4c 100755 --- a/src/main/java/ui/util/DefaultText.java +++ b/src/main/java/ui/util/DefaultText.java @@ -50,8 +50,8 @@ package ui.util; */ public class DefaultText { - public static String BUILD = "12558"; - public static String DATE = "2018/02/13 09:49:08 CET"; + public static String BUILD = "12561"; + public static String DATE = "2018/02/15 02:01:35 CET"; public static StringBuffer sbAbout = makeAbout(); diff --git a/src/main/java/ui/util/IconManager.java b/src/main/java/ui/util/IconManager.java index 77134d062b750f109807c5051da72c2dd2ba0603..b15b9490b95b83f888d4262ccf6b5d15d0c20a9e 100755 --- a/src/main/java/ui/util/IconManager.java +++ b/src/main/java/ui/util/IconManager.java @@ -658,8 +658,8 @@ public class IconManager { } - public ImageIcon getIcon(String s) { - URL url = this.getClass().getResource(s); + public static ImageIcon getIcon(String s) { + URL url = IconManager.class.getResource(s); if (url != null) { return new ImageIcon(url); @@ -680,7 +680,7 @@ public class IconManager { } } - public void loadImg() { + public static void loadImg() { imgic8 = getIcon(icon8); imgic9 = getIcon(icon9); if (imgic8 != null) { diff --git a/ttool/src/main/java/Main.java b/ttool/src/main/java/Main.java index 25ce697c95c8bd57f175544dfca16985221530a7..c1eba3d54158cce1ea2e2e9760a23733790d87cd 100755 --- a/ttool/src/main/java/Main.java +++ b/ttool/src/main/java/Main.java @@ -242,8 +242,7 @@ public class Main implements ActionListener { if (splashFrame != null) { splashFrame.setMessage("Loading images"); } - IconManager icma = new IconManager(); - icma.loadImg(); + IconManager.loadImg(); // Loading configuration if (splashFrame != null) { diff --git a/ttool/src/test/java/ui/AbstractUITest.java b/ttool/src/test/java/ui/AbstractUITest.java index 3d64e22481472acbe2d2242f73c25269d10bc15e..6c5356c5d3734461712bd1284f0d7d60c4604e97 100644 --- a/ttool/src/test/java/ui/AbstractUITest.java +++ b/ttool/src/test/java/ui/AbstractUITest.java @@ -4,12 +4,14 @@ import static org.junit.Assert.fail; import myutil.PluginManager; import test.AbstractTest; +import ui.util.IconManager; public abstract class AbstractUITest extends AbstractTest { protected final MainGUI mainGui; protected AbstractUITest() { + IconManager.loadImg(); mainGui = new MainGUI(false, false, false, false, false, false, false, false, false, true, false, false); mainGui.build(); PluginManager.pluginManager = new PluginManager();