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/06/30 15:37:04 UTC
svn commit: r1606727 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
Author: degenaro
Date: Mon Jun 30 13:37:04 2014
New Revision: 1606727
URL: http://svn.apache.org/r1606727
Log:
UIMA-3912 DUCC WebServer (WS) sort on Job Details page
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java?rev=1606727&r1=1606726&r2=1606727&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/sort/JobDetailsProcesses.java Mon Jun 30 13:37:04 2014
@@ -34,14 +34,65 @@ public class JobDetailsProcesses impleme
return _process;
}
- private boolean isOperational() {
+ private boolean isRunning() {
boolean retVal = false;
try {
ProcessState processState = getProcess().getProcessState();
switch(processState) {
- case Initializing:
case Running:
+ retVal = true;
+ break;
+ default:
+ //retVal = false;
+ break;
+ }
+ }
+ catch(Exception e) {
+ }
+ return retVal;
+ }
+
+ private boolean isInitializing() {
+ boolean retVal = false;
+ try {
+ ProcessState processState = getProcess().getProcessState();
+ switch(processState) {
+ case Initializing:
+ retVal = true;
+ break;
+ default:
+ //retVal = false;
+ break;
+ }
+ }
+ catch(Exception e) {
+ }
+ return retVal;
+ }
+
+ private boolean isStarting() {
+ boolean retVal = false;
+ try {
+ ProcessState processState = getProcess().getProcessState();
+ switch(processState) {
case Starting:
+ retVal = true;
+ break;
+ default:
+ //retVal = false;
+ break;
+ }
+ }
+ catch(Exception e) {
+ }
+ return retVal;
+ }
+
+ private boolean isStopping() {
+ boolean retVal = false;
+ try {
+ ProcessState processState = getProcess().getProcessState();
+ switch(processState) {
case Stopping:
retVal = true;
break;
@@ -103,10 +154,28 @@ public class JobDetailsProcesses impleme
long f1 = p1.getDuccId().getFriendly();
long f2 = p2.getDuccId().getFriendly();
if(f1 != f2) {
- if(!j1.isOperational() && j2.isOperational()) {
+ if(!j1.isRunning() && j2.isRunning()) {
+ retVal = 1;
+ }
+ else if(j1.isRunning() && !j2.isRunning()) {
+ retVal = -1;
+ }
+ else if(!j1.isInitializing() && j2.isInitializing()) {
+ retVal = 1;
+ }
+ else if(j1.isInitializing() && !j2.isInitializing()) {
+ retVal = -1;
+ }
+ else if(!j1.isStarting() && j2.isStarting()) {
+ retVal = 1;
+ }
+ else if(j1.isStarting() && !j2.isStarting()) {
+ retVal = -1;
+ }
+ else if(!j1.isStopping() && j2.isStopping()) {
retVal = 1;
}
- else if(j1.isOperational() && !j2.isOperational()) {
+ else if(j1.isStopping() && !j2.isStopping()) {
retVal = -1;
}
else if(!j1.isFailed() && j2.isFailed()) {