Author: degenaro
Date: Fri Mar 8 12:19:47 2013
New Revision: 1454341
URL: http://svn.apache.org/r1454341
Log:
UIMA-2722 DUCC webserver (WS) hints
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccConstants.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccConstants.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccConstants.java?rev=1454341&r1=1454340&r2=1454341&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccConstants.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccConstants.java
Fri Mar 8 12:19:47 2013
@@ -30,5 +30,6 @@ public class DuccConstants {
public static final String hintPreferencesDescriptionStyleShort =
"Hint: use Preferences -> Description Style [Short] to hide everything left of
last /";
public static final String hintPreferencesRoleAdministrator = "Hint:
use Preferences -> Role [Administrator] to enable";
+ public static final String hintPreferencesDateStyle = "Hint: use
Preferences -> Date Style to alter format";
public static final String hintLogin = "Hint: use Login to enable";
}
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=1454341&r1=1454340&r2=1454341&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 Mar 8 12:19:47 2013
@@ -133,9 +133,17 @@ public class DuccHandlerJsonFormat exten
sb.append("</span>");
row.add(new JsonPrimitive(sb.toString()));
// Start
- row.add(new JsonPrimitive(getTimeStamp(request,job.getDuccId(),
job.getStandardInfo().getDateOfSubmission())));
+ sb = new StringBuffer();
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
+ sb.append(getTimeStamp(request,job.getDuccId(),
job.getStandardInfo().getDateOfSubmission()));
+ sb.append("</span>");
+ row.add(new JsonPrimitive(sb.toString()));
// End
- row.add(new
JsonPrimitive(getCompletionOrProjection(request,job)));
+ sb = new StringBuffer();
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
+ sb.append(getCompletionOrProjection(request,job));
+ sb.append("</span>");
+ row.add(new JsonPrimitive(sb.toString()));
// User
sb = new StringBuffer();
String title = "";
@@ -533,15 +541,20 @@ public class DuccHandlerJsonFormat exten
}
row.add(new JsonPrimitive(sb.toString()));
// Start
- row.add(new
JsonPrimitive(getTimeStamp(request,duccwork.getDuccId(),
duccwork.getStandardInfo().getDateOfSubmission())));
+ sb = new StringBuffer();
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
+ sb.append(getTimeStamp(request,duccwork.getDuccId(),
duccwork.getStandardInfo().getDateOfSubmission()));
+ sb.append("</span>");
+ row.add(new JsonPrimitive(sb.toString()));
// End
sb = new StringBuffer();
- sb.append("<span>");
if(duccwork instanceof DuccWorkReservation) {
DuccWorkReservation reservation = (DuccWorkReservation)
duccwork;
switch(reservation.getReservationState()) {
case Completed:
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getTimeStamp(request,duccwork.getDuccId(),duccwork.getStandardInfo().getDateOfCompletion()));
+ sb.append("</span>");
break;
default:
break;
@@ -551,13 +564,14 @@ public class DuccHandlerJsonFormat exten
DuccWorkJob job = (DuccWorkJob) duccwork;
switch(job.getJobState()) {
case Completed:
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getTimeStamp(request,duccwork.getDuccId(),duccwork.getStandardInfo().getDateOfCompletion()));
+ sb.append("</span>");
break;
default:
break;
}
}
- sb.append("</span>");
row.add(new JsonPrimitive(sb.toString()));
// User
sb = new StringBuffer();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1454341&r1=1454340&r2=1454341&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
Fri Mar 8 12:19:47 2013
@@ -112,11 +112,15 @@ public class DuccHandlerLegacy extends D
sb.append("</td>");
// Start
sb.append("<td valign=\"bottom\">");
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getTimeStamp(request,job.getDuccId(),
job.getStandardInfo().getDateOfSubmission()));
+ sb.append("</span>");
sb.append("</td>");
// End
sb.append("<td valign=\"bottom\">");
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getCompletionOrProjection(request,job));
+ sb.append("</span>");
sb.append("</td>");
// User
String title = "";
@@ -449,7 +453,9 @@ public class DuccHandlerLegacy extends D
}
// Start
sb.append("<td>");
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getTimeStamp(request,duccwork.getDuccId(),duccwork.getStandardInfo().getDateOfSubmission()));
+ sb.append("</span>");
sb.append("</td>");
// End
sb.append("<td>");
@@ -457,7 +463,9 @@ public class DuccHandlerLegacy extends D
DuccWorkReservation reservation = (DuccWorkReservation)
duccwork;
switch(reservation.getReservationState()) {
case Completed:
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getTimeStamp(request,duccwork.getDuccId(),duccwork.getStandardInfo().getDateOfCompletion()));
+ sb.append("</span>");
break;
default:
break;
@@ -467,7 +475,9 @@ public class DuccHandlerLegacy extends D
DuccWorkJob job = (DuccWorkJob) duccwork;
switch(job.getJobState()) {
case Completed:
+ sb.append("<span
title=\""+DuccConstants.hintPreferencesDateStyle+"\">");
sb.append(getTimeStamp(request,duccwork.getDuccId(),duccwork.getStandardInfo().getDateOfCompletion()));
+ sb.append("<span>");
break;
default:
break;
