From 29bbf451a22916d39017ec1a3f53f4e0f0e65ee0 Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Mon, 1 Aug 2011 13:57:20 +0200
Subject: Java7 compatibility and some code refresh

---
 source/com/c2kernel/gui/tabs/execution/ActivityItem.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/execution/ActivityItem.java

(limited to 'source/com/c2kernel/gui/tabs/execution')

diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
old mode 100755
new mode 100644
index 1a73dc2..051f1dc
--- a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
+++ b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
@@ -8,7 +8,13 @@ public class ActivityItem {
     public String stepPath;
     public int state;
     public String name;
-    ArrayList jobs = new ArrayList();
+    ArrayList<Job> jobs = new ArrayList<>();
+    
+    public ActivityItem() {
+    	stepPath = "";
+    	state = -1;
+    	name = "--";
+    }
 
     public ActivityItem(Job thisJob) {
         stepPath = thisJob.getStepPath();
@@ -30,7 +36,7 @@ public class ActivityItem {
     }
 
     public String toString() {
-        return name+" ("+States.getStateName(state)+")";
+        return name+(state>-1?" ("+States.getStateName(state)+")":"");
     }
 
     public boolean equals(Object other) {
-- 
cgit v1.2.3