You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/10/14 14:24:22 UTC
svn commit: r1022482 -
/sling/branches/eventing-3.0/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
Author: cziegeler
Date: Thu Oct 14 12:24:21 2010
New Revision: 1022482
URL: http://svn.apache.org/viewvc?rev=1022482&view=rev
Log:
Format queue type
Modified:
sling/branches/eventing-3.0/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
Modified: sling/branches/eventing-3.0/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/branches/eventing-3.0/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java?rev=1022482&r1=1022481&r2=1022482&view=diff
==============================================================================
--- sling/branches/eventing-3.0/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java (original)
+++ sling/branches/eventing-3.0/src/main/java/org/apache/sling/event/impl/jobs/console/WebConsolePlugin.java Thu Oct 14 12:24:21 2010
@@ -165,7 +165,7 @@ public class WebConsolePlugin extends Ht
s = q.getStatistics();
final QueueConfiguration c = q.getConfiguration();
pw.println("<tr><th colspan='2'>Statistics</th><th colspan='2'>Configuration</th></tr>");
- pw.printf("<tr><td>Start Time</td><td>%s</td><td>Type</td><td>%s</td></tr>", formatDate(s.getStartTime()), c.getType());
+ pw.printf("<tr><td>Start Time</td><td>%s</td><td>Type</td><td>%s</td></tr>", formatDate(s.getStartTime()), formatType(c.getType()));
pw.printf("<tr><td>Last Activated</td><td>%s</td><td>Topics</td><td>%s</td></tr>", formatDate(s.getLastActivatedJobTime()), formatArray(c.getTopics()));
pw.printf("<tr><td>Last Finished</td><td>%s</td><td>Max Parallel</td><td>%s</td></tr>", formatDate(s.getLastFinishedJobTime()), c.getMaxParallel());
pw.printf("<tr><td>Queued Jobs</td><td>%s</td><td>Max Retries</td><td>%s</td></tr>", s.getNumberOfQueuedJobs(), c.getMaxRetries());
@@ -220,7 +220,7 @@ public class WebConsolePlugin extends Ht
pw.println("<table class='nicetable'><tbody>");
pw.println("<tr><th colspan='2'>Configuration</th></tr>");
pw.printf("<tr><td>Valid</td><td>%s</td></tr>", c.isValid());
- pw.printf("<tr><td>Type</td><td>%s</td></tr>", c.getType());
+ pw.printf("<tr><td>Type</td><td>%s</td></tr>", formatType(c.getType()));
pw.printf("<tr><td>Topics</td><td>%s</td></tr>", formatArray(c.getTopics()));
pw.printf("<tr><td>Max Parallel</td><td>%s</td></tr>", c.getMaxParallel());
pw.printf("<tr><td>Max Retries</td><td>%s</td></tr>", c.getMaxRetries());
@@ -263,6 +263,15 @@ public class WebConsolePlugin extends Ht
return Arrays.toString(array);
}
+ private String formatType(final QueueConfiguration.Type type) {
+ switch ( type ) {
+ case IGNORE : return "Ignore";
+ case ORDERED : return "Ordered";
+ case TOPIC_ROUND_ROBIN : return "Topic Round Robin";
+ case UNORDERED : return "Parallel";
+ }
+ return type.toString();
+ }
/** Default date format used. */
private final DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSS yyyy-MMM-dd");
@@ -350,7 +359,7 @@ public class WebConsolePlugin extends Ht
pw.printf("Average Waiting Time : %s%n", formatTime(s.getAverageWaitingTime()));
pw.printf("Status Info : %s%n", q.getStatusInfo());
pw.println("Configuration");
- pw.printf("Type : %s%n", c.getType());
+ pw.printf("Type : %s%n", formatType(c.getType()));
pw.printf("Topics : %s%n", formatArrayAsText(c.getTopics()));
pw.printf("Max Parallel : %s%n", c.getMaxParallel());
pw.printf("Max Retries : %s%n", c.getMaxRetries());
@@ -392,7 +401,7 @@ public class WebConsolePlugin extends Ht
pw.printf("Job Queue Configuration: %s%n",
c.getName());
pw.printf("Valid : %s%n", c.isValid());
- pw.printf("Type : %s%n", c.getType());
+ pw.printf("Type : %s%n", formatType(c.getType()));
pw.printf("Topics : %s%n", formatArrayAsText(c.getTopics()));
pw.printf("Max Parallel : %s%n", c.getMaxParallel());
pw.printf("Max Retries : %s%n", c.getMaxRetries());