svn commit: r1608908 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz: JobFragment.java VisualizedHost.java

[challngr]

Author: challngr
Date: Tue Jul  8 19:21:08 2014
New Revision: 1608908

URL: http://svn.apache.org/r1608908
Log:
UIMA-3900 Make text color match text color for reservations, pop, and services.

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java?rev=1608908&r1=1608907&r2=1608908&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
 Tue Jul  8 19:21:08 2014
@@ -83,6 +83,5 @@ class JobFragment
                 return id + " " + nprocesses + " processes"; 
         }
     }
-    String getUser() { return user; }
 }
 

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java?rev=1608908&r1=1608907&r2=1608908&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
 Tue Jul  8 19:21:08 2014
@@ -196,12 +196,25 @@ class VisualizedHost
             m.titleForFragment(this, j);
 
             // draw the share block for each fragment
-            if ( j.type == DuccType.Undefined ) {
-                m.rect(0, top, size, height, "", "black", .1f, "");
-            } else {
-                m.rect(0, top, size, height, fill, "black", .1f, "");
+            switch ( j.type ) {
+                case Undefined:
+                    m.rect(0, top, size, height, "", "black", .1f, "");
+                    break;
+                case Job:
+                    m.rect(0, top, size, height, fill, "black", .1f, "");
+                    break;
+                default:
+                    m.rect(0, top, size, height, j.textColor, "black", .1f, 
"");
+                    m.rect(0, top, size, height, fill, "black", .1f, "");
+                    break;
             }
 
+            // if ( j.type == DuccType.Undefined ) {
+            //     m.rect(0, top, size, height, "", "black", .1f, "");
+            // } else {
+            //     m.rect(0, top, size, height, fill, "black", .1f, "");
+            // }
+
             // draw the work duccid in the fragment
             m.rect(.1f, top, size-.1f, 1.2f, j.fillColor, j.fillColor, .1f, 
"");
             m.text(.1f, top + 1.2f, j.id + " " + j.user, j.textColor, 10);