From 5664fd4644c78f4571a1a72e6b9f0511fb10720a Mon Sep 17 00:00:00 2001
From: abranson <andrew.branson@cern.ch>
Date: Tue, 2 Aug 2011 22:10:28 +0200
Subject: Finished move to generics. Enforced 1.6 compliance for now. No errors
 or warnings :)

---
 source/com/c2kernel/gui/tabs/execution/ActivityItem.java   | 2 +-
 source/com/c2kernel/gui/tabs/execution/ActivityViewer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/gui/tabs/execution/ActivityViewer.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
index 051f1dc..ba5e76b 100644
--- a/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
+++ b/source/com/c2kernel/gui/tabs/execution/ActivityItem.java
@@ -8,7 +8,7 @@ public class ActivityItem {
     public String stepPath;
     public int state;
     public String name;
-    ArrayList<Job> jobs = new ArrayList<>();
+    ArrayList<Job> jobs = new ArrayList<Job>();
     
     public ActivityItem() {
     	stepPath = "";
diff --git a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
old mode 100755
new mode 100644
index 4250a37..b0417f4
--- a/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
+++ b/source/com/c2kernel/gui/tabs/execution/ActivityViewer.java
@@ -40,7 +40,7 @@ public class ActivityViewer extends JPanel implements Runnable {
     OutcomeHandler outcomePanel;
     JPanel outcomeView = new JPanel(new GridLayout(1,1));
     ActivityItem thisAct;
-    ArrayList requestButtons = new ArrayList();
+    ArrayList<RequestButton> requestButtons = new ArrayList<RequestButton>();
     JLabel noOutcome = new JLabel(Language.translate("No outcome data is required for this activity"));
     ExecutionPane parent;
     JLabel status;    
-- 
cgit v1.2.3