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 2015/03/16 21:57:09 UTC
svn commit: r1667132 - 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: Mon Mar 16 20:57:09 2015
New Revision: 1667132
URL: http://svn.apache.org/r1667132
Log:
UIMA-4275 DUCC Web Server (WS) should display Resource Manager (RM) reason with respect to WaitingForResources
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=1667132&r1=1667131&r2=1667132&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 Mon Mar 16 20:57:09 2015
@@ -571,21 +571,44 @@ public class DuccHandlerClassic extends
sb.append("</td>");
// Reason
if(duccwork instanceof DuccWorkReservation) {
- sb.append("<td>");
DuccWorkReservation reservation = (DuccWorkReservation) duccwork;
- switch(reservation.getCompletionType()) {
- case Undefined:
+ sb.append("<td>");
+ switch(reservation.getReservationState()) {
+ case WaitingForResources:
+ String rmReason = reservation.getRmReason();
+ if(rmReason != null) {
+ sb.append("<span>");
+ sb.append(rmReason);
+ sb.append("</span>");
+ }
break;
- case CanceledByUser:
- case CanceledByAdmin:
- try {
- String cancelUser = duccwork.getStandardInfo().getCancelUser();
- if(cancelUser != null) {
- sb.append("<span title=\"canceled by "+cancelUser+"\">");
- sb.append(duccwork.getCompletionTypeObject().toString());
- sb.append("</span>");
- }
- else {
+ default:
+ switch(reservation.getCompletionType()) {
+ case Undefined:
+ break;
+ case CanceledByUser:
+ case CanceledByAdmin:
+ try {
+ String cancelUser = duccwork.getStandardInfo().getCancelUser();
+ if(cancelUser != null) {
+ sb.append("<span title=\"canceled by "+cancelUser+"\">");
+ sb.append(duccwork.getCompletionTypeObject().toString());
+ sb.append("</span>");
+ }
+ else {
+ IRationale rationale = reservation.getCompletionRationale();
+ if(rationale != null) {
+ sb.append("<span title="+rationale.getTextQuoted()+">");
+ sb.append(duccwork.getCompletionTypeObject().toString());
+ sb.append("</span>");
+ }
+ else {
+ sb.append(duccwork.getCompletionTypeObject().toString());
+ }
+
+ }
+ }
+ catch(Exception e) {
IRationale rationale = reservation.getCompletionRationale();
if(rationale != null) {
sb.append("<span title="+rationale.getTextQuoted()+">");
@@ -595,10 +618,9 @@ public class DuccHandlerClassic extends
else {
sb.append(duccwork.getCompletionTypeObject().toString());
}
-
}
- }
- catch(Exception e) {
+ break;
+ default:
IRationale rationale = reservation.getCompletionRationale();
if(rationale != null) {
sb.append("<span title="+rationale.getTextQuoted()+">");
@@ -608,17 +630,7 @@ public class DuccHandlerClassic extends
else {
sb.append(duccwork.getCompletionTypeObject().toString());
}
- }
- break;
- default:
- IRationale rationale = reservation.getCompletionRationale();
- if(rationale != null) {
- sb.append("<span title="+rationale.getTextQuoted()+">");
- sb.append(duccwork.getCompletionTypeObject().toString());
- sb.append("</span>");
- }
- else {
- sb.append(duccwork.getCompletionTypeObject().toString());
+ break;
}
break;
}
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=1667132&r1=1667131&r2=1667132&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 Mon Mar 16 20:57:09 2015
@@ -670,19 +670,42 @@ public class DuccHandlerJsonFormat exten
sb = new StringBuffer();
if(duccwork instanceof DuccWorkReservation) {
DuccWorkReservation reservation = (DuccWorkReservation) duccwork;
- switch(reservation.getCompletionType()) {
- case Undefined:
+ switch(reservation.getReservationState()) {
+ case WaitingForResources:
+ String rmReason = reservation.getRmReason();
+ if(rmReason != null) {
+ sb.append("<span>");
+ sb.append(rmReason);
+ sb.append("</span>");
+ }
break;
- case CanceledByUser:
- case CanceledByAdmin:
- try {
- String cancelUser = duccwork.getStandardInfo().getCancelUser();
- if(cancelUser != null) {
- sb.append("<span title=\"canceled by "+cancelUser+"\">");
- sb.append(duccwork.getCompletionTypeObject().toString());
- sb.append("</span>");
- }
- else {
+ default:
+ switch(reservation.getCompletionType()) {
+ case Undefined:
+ break;
+ case CanceledByUser:
+ case CanceledByAdmin:
+ try {
+ String cancelUser = duccwork.getStandardInfo().getCancelUser();
+ if(cancelUser != null) {
+ sb.append("<span title=\"canceled by "+cancelUser+"\">");
+ sb.append(duccwork.getCompletionTypeObject().toString());
+ sb.append("</span>");
+ }
+ else {
+ IRationale rationale = reservation.getCompletionRationale();
+ if(rationale != null) {
+ sb.append("<span title="+rationale.getTextQuoted()+">");
+ sb.append(duccwork.getCompletionTypeObject().toString());
+ sb.append("</span>");
+ }
+ else {
+ sb.append(duccwork.getCompletionTypeObject().toString());
+ }
+
+ }
+ }
+ catch(Exception e) {
IRationale rationale = reservation.getCompletionRationale();
if(rationale != null) {
sb.append("<span title="+rationale.getTextQuoted()+">");
@@ -692,10 +715,9 @@ public class DuccHandlerJsonFormat exten
else {
sb.append(duccwork.getCompletionTypeObject().toString());
}
-
}
- }
- catch(Exception e) {
+ break;
+ default:
IRationale rationale = reservation.getCompletionRationale();
if(rationale != null) {
sb.append("<span title="+rationale.getTextQuoted()+">");
@@ -705,17 +727,7 @@ public class DuccHandlerJsonFormat exten
else {
sb.append(duccwork.getCompletionTypeObject().toString());
}
- }
- break;
- default:
- IRationale rationale = reservation.getCompletionRationale();
- if(rationale != null) {
- sb.append("<span title="+rationale.getTextQuoted()+">");
- sb.append(duccwork.getCompletionTypeObject().toString());
- sb.append("</span>");
- }
- else {
- sb.append(duccwork.getCompletionTypeObject().toString());
+ break;
}
break;
}