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 2013/12/04 20:02:24 UTC

svn commit: r1547875 - 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: Wed Dec  4 19:02:24 2013
New Revision: 1547875

URL: http://svn.apache.org/r1547875
Log:
UIMA-3465 DUCC webserver (WS) "display" issues

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=1547875&r1=1547874&r2=1547875&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 Wed Dec  4 19:02:24 2013
@@ -181,6 +181,21 @@ public class DuccHandlerClassic extends 
 			}
 			break;
 		case Visual:
+			// Below
+			sb.append(schedulingClass);
+			if((debugPortDriver >= 0) || (debugPortProcess >= 0)) {
+				sb.append("<br>");
+				if(job.isCompleted()) {
+					sb.append("<span class=\"health_red\""+">");
+				}
+				else {
+					sb.append("<span class=\"health_green\""+">");
+				}
+				sb.append("<div title=\""+title+"\"><img src=\"./opensources/images/Delena-cancerides-huntsman-spider.jpg\"></div>");
+				sb.append("</span>");
+			}
+			/*
+			// On the right
 			sb.append("<table width=\"100%\">");
 			sb.append("<tr>");
 			sb.append("<td align=\"left\">");
@@ -195,6 +210,7 @@ public class DuccHandlerClassic extends 
 			sb.append("</td>");
 			sb.append("</tr>");
 			sb.append("</table>");
+			*/
 			break;
 		}	
 		sb.append("</td>");

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=1547875&r1=1547874&r2=1547875&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 Wed Dec  4 19:02:24 2013
@@ -204,6 +204,21 @@ public class DuccHandlerJsonFormat exten
 			}
 			break;
 		case Visual:
+			// Below
+			sb.append(schedulingClass);
+			if((debugPortDriver >= 0) || (debugPortProcess >= 0)) {
+				sb.append("<br>");
+				if(job.isCompleted()) {
+					sb.append("<span class=\"health_red\""+">");
+				}
+				else {
+					sb.append("<span class=\"health_green\""+">");
+				}
+				sb.append("<div title=\""+title+"\"><img src=\"./opensources/images/Delena-cancerides-huntsman-spider.jpg\"></div>");
+				sb.append("</span>");
+			}
+			/*
+			// On the right
 			sb.append("<table width=\"100%\">");
 			sb.append("<tr>");
 			sb.append("<td align=\"left\">");
@@ -212,12 +227,13 @@ public class DuccHandlerJsonFormat exten
 			sb.append("<td align=\"right\">");
 			if((debugPortDriver >= 0) || (debugPortProcess >= 0)) {
 				sb.append("<span title=\""+title+"\">");
-				sb.append("<img src=\"./opensources/images/Delena-cancerides-huntsman-spider.jpg\">");
+				sb.append("");
 				sb.append("</span>");
 			}
 			sb.append("</td>");
 			sb.append("</tr>");
 			sb.append("</table>");
+			*/
 			break;
 		}	
 		row.add(new JsonPrimitive(sb.toString()));