You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/05/16 20:28:01 UTC
svn commit: r1595286 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerClassic.java DuccHandlerJsonFormat.java
Author: degenaro
Date: Fri May 16 18:28:01 2014
New Revision: 1595286
URL: http://svn.apache.org/r1595286
Log:
UIMA-3361 DUCC Web Server (WS) Machines page improvements
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1595286&r1=1595285&r2=1595286&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Fri May 16 18:28:01 2014
@@ -1822,13 +1822,31 @@ public class DuccHandlerClassic extends
row.append("<td align=\"right\">");
row.append(sb);
row.append("</td>");
+ // Shares
+ int sharesTotal = 0;
+ int sharesInuse = 0;
+ try {
+ int total = Integer.parseInt(facts.sharesTotal);
+ int inuse = Integer.parseInt(facts.sharesInuse);
+ sharesTotal = total;
+ sharesInuse = inuse;
+ }
+ catch(Exception e) {
+ }
// Shares: total
row.append("<td align=\"right\">");
row.append(facts.sharesTotal);
row.append("</td>");
- // Shares:inuse
+ // Shares: inuse
row.append("<td align=\"right\">");
+ String span0 = "<span class=\"health_black\">";
+ String span1 = "</span>";
+ if(sharesInuse > sharesTotal) {
+ span0 = "<span class=\"health_red\">";
+ }
+ row.append(span0);
row.append(facts.sharesInuse);
+ row.append(span1);
row.append("</td>");
// Heartbeat: last
row.append("<td align=\"right\">");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1595286&r1=1595285&r2=1595286&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Fri May 16 18:28:01 2014
@@ -1383,10 +1383,30 @@ public class DuccHandlerJsonFormat exten
sb.append("</span>");
}
row.add(new JsonPrimitive(sb.toString()));
+ // Shares
+ int sharesTotal = 0;
+ int sharesInuse = 0;
+ try {
+ int total = Integer.parseInt(facts.sharesTotal);
+ int inuse = Integer.parseInt(facts.sharesInuse);
+ sharesTotal = total;
+ sharesInuse = inuse;
+ }
+ catch(Exception e) {
+ }
// Shares: total
row.add(new JsonPrimitive(facts.sharesTotal));
- // Shares:inuse
- row.add(new JsonPrimitive(facts.sharesInuse));
+ // Shares: inuse
+ sb = new StringBuffer();
+ String span0 = "<span class=\"health_black\">";
+ String span1 = "</span>";
+ if(sharesInuse > sharesTotal) {
+ span0 = "<span class=\"health_red\">";
+ }
+ sb.append(span0);
+ sb.append(facts.sharesInuse);
+ sb.append(span1);
+ row.add(new JsonPrimitive(sb.toString()));
// Heartbeat: last
row.add(new JsonPrimitive(facts.heartbeat));
data.add(row);