diff --git a/src/main/java/myutil/TraceManager.java b/src/main/java/myutil/TraceManager.java index 185432cd4b604c5b49bd988eb0f77d2a0ad7a882..0521f251c3427715f6b144ab00802f9f2faf6f29 100644 --- a/src/main/java/myutil/TraceManager.java +++ b/src/main/java/myutil/TraceManager.java @@ -58,10 +58,10 @@ public class TraceManager { public static int devPolicy = TO_CONSOLE; public static int errPolicy = TO_CONSOLE; - public static void addDev(String _s) { + public static void addDev(String res) { switch(devPolicy) { case TO_CONSOLE: - System.out.println(_s); + System.out.println(res); break; case TO_DEVNULL: break; diff --git a/src/main/java/ui/TGComponent.java b/src/main/java/ui/TGComponent.java index 644262db990ae7b22aff56c67a9942604c221889..419391fb3546db8e0c75eafee7e4bdaed3baab8a 100755 --- a/src/main/java/ui/TGComponent.java +++ b/src/main/java/ui/TGComponent.java @@ -614,7 +614,7 @@ public abstract class TGComponent extends AbstractCDElement implements /*CDElem } protected void drawAttributes(Graphics g, String attr) { - if (attr == null) { + if (attr == null || this.isHidden()) { return; } @@ -1225,10 +1225,9 @@ public abstract class TGComponent extends AbstractCDElement implements /*CDElem } else if (TDiagramPanel.DIPLO_ID_ON) { drawDiploID(g); } else if (TDiagramPanel.AVATAR_ID_ON) { - - drawAVATARID(g); + drawAVATARID(g); } else if (TDiagramPanel.TEPE_ID_ON) { - drawTEPEID(g); + drawTEPEID(g); } else { runningStatus = ""; transactions.clear(); @@ -1533,11 +1532,15 @@ public abstract class TGComponent extends AbstractCDElement implements /*CDElem return !((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height))); } + //Isssue #73: Hidden component still clickable public final void drawInternalComponents(Graphics g) { for (int i = 0; i < nbInternalTGComponent; i++) { //ColorManager.setColor(g, tgcomponent[i].getState(), 0); if (!tgcomponent[i].isHidden()) { tgcomponent[i].draw(g); + tgcomponent[i].setHidden(false); + } else { + tgcomponent[i].setHidden(true); } } } diff --git a/ttool/launch_configurations/config.xml b/ttool/launch_configurations/config.xml old mode 100755 new mode 100644 index 60053fa0bfc79b07b4887dc9e8ccde06ac014bd2..de5ba95d29115225bc66508f952eaace67c9d091 --- a/ttool/launch_configurations/config.xml +++ b/ttool/launch_configurations/config.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> - <TURTLECONFIGURATION> <RTLHost data="localhost" /> <RTLPath data="/packages/RT-LOTOS.0.12/bin/rtl" />