From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: More code cleanup: Refactored Entity Proxy Subscription to handle generics better Rewrote RemoteMap to use TreeMap instead of the internal array for order. It now sorts its keys by number if they parse, else as strings. Removed a no-longer-in-progress outcome form class --- .../c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) mode change 100755 => 100644 source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java (limited to 'source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java') diff --git a/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java b/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java old mode 100755 new mode 100644 index 5746673..c4309ee --- a/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java +++ b/source/com/c2kernel/lifecycle/gui/view/ActivitySlotDefRenderer.java @@ -19,7 +19,8 @@ public class ActivitySlotDefRenderer implements VertexRenderer private Paint mTextPaint = Color.black; - public void draw( Graphics2D g2d, Vertex vertex) + @Override + public void draw( Graphics2D g2d, Vertex vertex) { ActivitySlotDef activitySlotDef = ( ActivitySlotDef )vertex; boolean hasError = activitySlotDef.verify(); @@ -28,12 +29,12 @@ public class ActivitySlotDefRenderer implements VertexRenderer GraphPoint centrePoint = activitySlotDef.getCentrePoint(); int vertexHeight = activitySlotDef.getHeight(); int vertexWidth = activitySlotDef.getWidth(); - + String[] linesOfText = new String[2+(hasError?0:1)]; FontMetrics metrics = g2d.getFontMetrics(); int lineWidth = 0; int lineHeight = metrics.getHeight(); - int linesHeight = lineHeight * linesOfText.length; + int linesHeight = lineHeight * linesOfText.length; int linesStartY = centrePoint.y - linesHeight / 2 + lineHeight * 2 / 3; int x = 0; int y = 0; @@ -41,7 +42,7 @@ public class ActivitySlotDefRenderer implements VertexRenderer linesOfText[0]="("+activitySlotDef.getActivityDef()+")"; linesOfText[1]=(String)activitySlotDef.getProperties().get("Name"); - + if (!hasError)linesOfText[2]=Language.translate(activitySlotDef.getErrors()); g2d.setPaint( !hasError ? mErrorPaint : isComposite ? mCompositePaint : mInactivePaint ); @@ -53,7 +54,7 @@ public class ActivitySlotDefRenderer implements VertexRenderer vertexHeight, true ); - + g2d.setPaint( mTextPaint ); // Draw the lines of text -- cgit v1.2.3