diff --git a/src/ui/TGComponent.java b/src/ui/TGComponent.java index 5844025f794bb6efefb1fe10721700f0d320f106..311137b504c424423e5be815fa16f7677554c477 100755 --- a/src/ui/TGComponent.java +++ b/src/ui/TGComponent.java @@ -882,9 +882,9 @@ public abstract class TGComponent implements CDElement, GenericTree { } public void drawStatus(Graphics g){ Color c=g.getColor(); - Color textColor=Color.BLACK; - g.setColor(textColor); + g.setColor(Color.BLACK); g.drawString(runningStatus, x+width, y); + internalDrawing(g); g.setColor(c); } public void draw(Graphics g) { @@ -1025,6 +1025,7 @@ public abstract class TGComponent implements CDElement, GenericTree { if (art.getValue().replaceAll(":", "_").equals(name)){ art.runningStatus=stat; art.drawStatus(g); + tdp.repaint(); } } } @@ -1055,7 +1056,9 @@ public abstract class TGComponent implements CDElement, GenericTree { drawAVATARID(g); } else if (tdp.TEPE_ID_ON) { drawTEPEID(g); - } + } else { + runningStatus=""; + } if (tdp.AVATAR_ANIMATE_ON) { //TraceManager.addDev("Avatar animate?"); diff --git a/src/ui/tmldd/TMLArchiArtifact.java b/src/ui/tmldd/TMLArchiArtifact.java index f4e4a2c474182447253f07521fd207ccf313eacf..c673ec198fb0652ddc44ed9a5e9df97a2fc8d2dd 100755 --- a/src/ui/tmldd/TMLArchiArtifact.java +++ b/src/ui/tmldd/TMLArchiArtifact.java @@ -117,13 +117,18 @@ public class TMLArchiArtifact extends TGCWithoutInternalComponent implements Swa g.drawRect(x, y, width, height); Color c = g.getColor(); - if (status.equals("running")){ - g.setColor(ColorManager.CURRENT_COMMAND_RUNNING); - } - else { + if (runningStatus.compareTo("running") == 0) { + g.setColor(ColorManager.CURRENT_COMMAND_RUNNING); + } else if (runningStatus.compareTo("runnable") == 0) { + g.setColor(ColorManager.CURRENT_COMMAND_RUNNABLE); + } else if (runningStatus.compareTo("suspended") == 0) { + g.setColor(ColorManager.CURRENT_COMMAND_SUSPENDED); + } else if (runningStatus.compareTo("terminated") == 0) { + g.setColor(ColorManager.CURRENT_COMMAND_TERMINATED); + } else { g.setColor(ColorManager.CPU_BOX_2); } - g.fillRect(x+1, y+1, width-1, height-1); + g.fillRect(x+1, y+1, width-1, height-1); g.setColor(c); //g.drawRoundRect(x, y, width, height, arc, arc);