Finished move to generics. Enforced 1.6 compliance for now. No errors or

warnings :)

1 files changed, 7 insertions, 7 deletions

diff --git a/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/source/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
index ea47721..a0d4aab 100755..100644
--- 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()+" <<<<<<<<<");

 	}