azkaban-developers
Changes
src/java/azkaban/utils/WebUtils.java 159(+78 -81)
Details
src/java/azkaban/utils/WebUtils.java 159(+78 -81)
diff --git a/src/java/azkaban/utils/WebUtils.java b/src/java/azkaban/utils/WebUtils.java
index 31322e6..4f65159 100644
--- a/src/java/azkaban/utils/WebUtils.java
+++ b/src/java/azkaban/utils/WebUtils.java
@@ -28,10 +28,10 @@ import azkaban.executor.Status;
public class WebUtils {
public static final String DATE_TIME_STRING = "YYYY-MM-dd HH:mm:ss";
- private static final long ONE_KB = 1024;
- private static final long ONE_MB = 1024 * ONE_KB;
- private static final long ONE_GB = 1024 * ONE_MB;
- private static final long ONE_TB = 1024 * ONE_GB;
+ private static final long ONE_KB = 1024;
+ private static final long ONE_MB = 1024 * ONE_KB;
+ private static final long ONE_GB = 1024 * ONE_MB;
+ private static final long ONE_TB = 1024 * ONE_GB;
public String formatDate(long timeMS) {
if (timeMS == -1) {
@@ -78,79 +78,76 @@ public class WebUtils {
public String formatStatus(Status status) {
switch(status) {
- case SUCCEEDED:
- return "Success";
- case FAILED:
- return "Failed";
- case RUNNING:
- return "Running";
- case DISABLED:
- return "Disabled";
- case KILLED:
- return "Killed";
- case FAILED_FINISHING:
- return "Running w/Failure";
- case PREPARING:
- return "Preparing";
- case READY:
- return "Ready";
- case PAUSED:
- return "Paused";
- case SKIPPED:
- return "Skipped";
- default:
+ case SUCCEEDED:
+ return "Success";
+ case FAILED:
+ return "Failed";
+ case RUNNING:
+ return "Running";
+ case DISABLED:
+ return "Disabled";
+ case KILLED:
+ return "Killed";
+ case FAILED_FINISHING:
+ return "Running w/Failure";
+ case PREPARING:
+ return "Preparing";
+ case READY:
+ return "Ready";
+ case PAUSED:
+ return "Paused";
+ case SKIPPED:
+ return "Skipped";
+ default:
}
-
return "Unknown";
}
- public String formatDateTime(DateTime dt)
- {
+ public String formatDateTime(DateTime dt) {
return DateTimeFormat.forPattern(DATE_TIME_STRING).print(dt);
}
- public String formatDateTime(long timestamp) {
- return formatDateTime(new DateTime(timestamp));
- }
+ public String formatDateTime(long timestamp) {
+ return formatDateTime(new DateTime(timestamp));
+ }
- public String formatPeriod(ReadablePeriod period)
- {
- String periodStr = "null";
+ public String formatPeriod(ReadablePeriod period) {
+ String periodStr = "null";
- if (period == null) {
- return periodStr;
- }
+ if (period == null) {
+ return periodStr;
+ }
- if (period.get(DurationFieldType.years()) > 0) {
- int years = period.get(DurationFieldType.years());
- periodStr = years + " year(s)";
- }
- else if (period.get(DurationFieldType.months()) > 0) {
- int months = period.get(DurationFieldType.months());
- periodStr = months + " month(s)";
- }
- else if (period.get(DurationFieldType.weeks()) > 0) {
- int weeks = period.get(DurationFieldType.weeks());
- periodStr = weeks + " week(s)";
- }
- else if (period.get(DurationFieldType.days()) > 0) {
- int days = period.get(DurationFieldType.days());
- periodStr = days + " day(s)";
- }
- else if (period.get(DurationFieldType.hours()) > 0) {
- int hours = period.get(DurationFieldType.hours());
- periodStr = hours + " hour(s)";
- }
- else if (period.get(DurationFieldType.minutes()) > 0) {
- int minutes = period.get(DurationFieldType.minutes());
- periodStr = minutes + " minute(s)";
- }
- else if (period.get(DurationFieldType.seconds()) > 0) {
- int seconds = period.get(DurationFieldType.seconds());
- periodStr = seconds + " second(s)";
- }
-
- return periodStr;
+ if (period.get(DurationFieldType.years()) > 0) {
+ int years = period.get(DurationFieldType.years());
+ periodStr = years + " year(s)";
+ }
+ else if (period.get(DurationFieldType.months()) > 0) {
+ int months = period.get(DurationFieldType.months());
+ periodStr = months + " month(s)";
+ }
+ else if (period.get(DurationFieldType.weeks()) > 0) {
+ int weeks = period.get(DurationFieldType.weeks());
+ periodStr = weeks + " week(s)";
+ }
+ else if (period.get(DurationFieldType.days()) > 0) {
+ int days = period.get(DurationFieldType.days());
+ periodStr = days + " day(s)";
+ }
+ else if (period.get(DurationFieldType.hours()) > 0) {
+ int hours = period.get(DurationFieldType.hours());
+ periodStr = hours + " hour(s)";
+ }
+ else if (period.get(DurationFieldType.minutes()) > 0) {
+ int minutes = period.get(DurationFieldType.minutes());
+ periodStr = minutes + " minute(s)";
+ }
+ else if (period.get(DurationFieldType.seconds()) > 0) {
+ int seconds = period.get(DurationFieldType.seconds());
+ periodStr = seconds + " second(s)";
+ }
+
+ return periodStr;
}
public String extractNumericalId(String execId) {
@@ -160,18 +157,18 @@ public class WebUtils {
return execId.substring(0, index2);
}
- public String displayBytes(long sizeBytes) {
- NumberFormat nf = NumberFormat.getInstance();
- nf.setMaximumFractionDigits(2);
- if(sizeBytes >= ONE_TB)
- return nf.format(sizeBytes / (double) ONE_TB) + " tb";
- else if(sizeBytes >= ONE_GB)
- return nf.format(sizeBytes / (double) ONE_GB) + " gb";
- else if(sizeBytes >= ONE_MB)
- return nf.format(sizeBytes / (double) ONE_MB) + " mb";
- else if(sizeBytes >= ONE_KB)
- return nf.format(sizeBytes / (double) ONE_KB) + " kb";
- else
- return sizeBytes + " B";
- }
+ public String displayBytes(long sizeBytes) {
+ NumberFormat nf = NumberFormat.getInstance();
+ nf.setMaximumFractionDigits(2);
+ if(sizeBytes >= ONE_TB)
+ return nf.format(sizeBytes / (double) ONE_TB) + " tb";
+ else if(sizeBytes >= ONE_GB)
+ return nf.format(sizeBytes / (double) ONE_GB) + " gb";
+ else if(sizeBytes >= ONE_MB)
+ return nf.format(sizeBytes / (double) ONE_MB) + " mb";
+ else if(sizeBytes >= ONE_KB)
+ return nf.format(sizeBytes / (double) ONE_KB) + " kb";
+ else
+ return sizeBytes + " B";
+ }
}
diff --git a/src/java/azkaban/webapp/servlet/velocity/svgflowincludes.vm b/src/java/azkaban/webapp/servlet/velocity/svgflowincludes.vm
index 2b1765f..70a3ff6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/svgflowincludes.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/svgflowincludes.vm
@@ -18,19 +18,20 @@
<script type="text/javascript" src="${context}/js/jquery.svganim.min.js"></script>
<script type="text/javascript" src="${context}/js/jquery.svgfilter.min.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban/util/svgutils.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban/util/flow-loader.js"></script>
<script type="text/javascript" src="${context}/js/azkaban/util/common.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban/util/date.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban/util/ajax.js"></script>
+
+ <script type="text/javascript" src="${context}/js/azkaban/util/svgutils.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban/util/svg-navigate.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban/util/layout.js"></script>
<script type="text/javascript" src="${context}/js/azkaban/view/context-menu.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban/util/ajax.js"></script>
<script type="text/javascript" src="${context}/js/azkaban/util/job-status.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban/util/layout.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban/util/date.js"></script>
+ <script type="text/javascript" src="${context}/js/azkaban/util/flow-loader.js"></script>
<script type="text/javascript" src="${context}/js/azkaban/view/job-list.js"></script>
<script type="text/javascript" src="${context}/js/azkaban/model/svg-graph.js"></script>
<script type="text/javascript" src="${context}/js/azkaban/view/svg-graph.js"></script>
- <script type="text/javascript" src="${context}/js/azkaban/util/svg-navigate.js"></script>
<link rel="stylesheet" type="text/css" href="${context}/css/azkaban-graph.css" />