From a5f94d94d4d81e404cd24db2544e1d0ef2d18ea0 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Wed, 27 Mar 2013 16:22:59 +0000
Subject: [PATCH] Update on the position of information on mutually exclusive
states
---
executablecode/Makefile.src | 2 +-
src/ui/TGComponent.java | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 28b9acb23f..1a5aafcafa 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/RemoteControl.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c generated_src/WirelessInterface.c
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/WirelessInterface.c generated_src/Door.c generated_src/Magnetron.c generated_src/Controller.c generated_src/ControlPanel.c generated_src/Bell.c generated_src/RemoteControl.c
\ No newline at end of file
diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java
index f2d00355ff..ad1bbc5819 100755
--- a/src/ui/TGComponent.java
+++ b/src/ui/TGComponent.java
@@ -862,12 +862,12 @@ public abstract class TGComponent implements CDElement, GenericTree {
g.setColor(ColorManager.ACCESSIBILITY);
//GraphicLib.setMediumStroke(g);
if (mutex == MUTEX_NOT_YET_STUDIED) {
- g.drawString("mutual exclusion?", x+width+1, y);
+ g.drawString("mutual exclusion?", x+width+1, y-12);
} else if (mutex == MUTEX_UNKNOWN) {
- g.drawString("mutual exclusion: cannot be proved", x+width+1, y);
+ g.drawString("mutual exclusion: cannot be proved", x+width+1, y-12);
} else if (mutex == MUTEX_OK) {
g.setColor(ColorManager.MUTEX_OK);
- g.drawString("mutual exclusion: OK", x+width+1, y);
+ g.drawString("mutual exclusion: OK", x+width+1, y-12);
}
/*g.drawLine(x+width-2, y+2, x+width-6, y+6);
@@ -878,12 +878,12 @@ public abstract class TGComponent implements CDElement, GenericTree {
if (masterMutex) {
g.setColor(ColorManager.ACCESSIBILITY);
if (mutexWith == MUTEX_NOT_YET_STUDIED) {
- g.drawString("mutual exclusion with others?", x+width+1, y+12);
+ g.drawString("mutual exclusion with others?", x+width+1, y);
} else if (mutexWith == MUTEX_UNKNOWN) {
- g.drawString("No mutual exclusion with others found", x+width+1, y+12);
+ g.drawString("No mutual exclusion with others found", x+width+1, y);
} else if (mutexWith == MUTEX_OK) {
g.setColor(ColorManager.MUTEX_OK);
- g.drawString("Mutual exclusion with others found", x+width+1, y+12);
+ g.drawString("Mutual exclusion with others found", x+width+1, y);
}
}
--
GitLab