Java7 compatibility and some code refresh

1 files changed, 8 insertions, 2 deletions

diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
index 1a73dc2..051f1dc 100755..100644
--- 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) {