diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src index 28b9acb23f0af46aef4caec4f72c265800a703d3..1a5aafcafa7abcf094ea1b3c9d8808777263ed3e 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 f2d00355ffb49d9a2f7391c85a57613bb80e5abf..ad1bbc58199fb404bc74652b853b290e1d1742c9 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); } }