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 :)

---
 .../c2kernel/lifecycle/instance/AdvancementCalculator.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java

(limited to 'source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java')

diff --git a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
old mode 100755
new mode 100644
index ea47721..a0d4aab
--- a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
+++ b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
@@ -10,9 +10,9 @@ import com.c2kernel.lifecycle.instance.stateMachine.States;
 public class AdvancementCalculator implements Serializable
 {
 	private CompositeActivity activity;
-	private Hashtable isMarked;
-	private Hashtable HasNextMarked;
-	public Hashtable hasprevActive;
+	private Hashtable<Vertex, Serializable> isMarked;
+	private Hashtable<Vertex, Vertex> HasNextMarked;
+	public Hashtable<String, Vertex> hasprevActive;
 	private long mCurrentNbActExp = 0;
 	private long mMaximuNbActexp = 0;
 	private long mNbActpassed = 0;
@@ -24,9 +24,9 @@ public class AdvancementCalculator implements Serializable
 	private boolean mHasPrevActive = false;
 	public AdvancementCalculator()
 	{
-		isMarked = new Hashtable();
-		HasNextMarked = new Hashtable();
-		hasprevActive = new Hashtable();
+		isMarked = new Hashtable<Vertex, Serializable>();
+		HasNextMarked = new Hashtable<Vertex, Vertex>();
+		hasprevActive = new Hashtable<String, Vertex>();
 	}
 	public void calculate(CompositeActivity act)
 	{
@@ -39,7 +39,7 @@ public class AdvancementCalculator implements Serializable
 		activity = act;
 		Vertex v = activity.getChildGraphModel().getStartVertex();
 		check(v, this);
-		isMarked = new Hashtable();
+		isMarked = new Hashtable<Vertex, Serializable>();
 		calc(v, this);
 //		Logger.debug(0, act.getName()+" <<<<<<<<<");
 	}
-- 
cgit v1.2.3