[Acmcontester-developers] SF.net SVN: acmcontester: [180] RTE/src/edu/lnu/FireFly/Rte

[<se...@us...>]

Revision: 180
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=180&view=rev
Author:   sem62
Date:     2008-05-29 04:39:23 -0700 (Thu, 29 May 2008)

Log Message:
-----------
* Modified GlobalObjectives class as Siglethon.
* Moved register method for registering global objective from Objectives to GlobalObjectives.
* added resetModel method for reseting cmi model after modifying objectives list in item.

Modified Paths:
--------------
    RTE/src/edu/lnu/FireFly/Rte/CmiManager.java
    RTE/src/edu/lnu/FireFly/Rte/objectives/GlobalObjectives.java
    RTE/src/edu/lnu/FireFly/Rte/objectives/Objectives.java

Modified: RTE/src/edu/lnu/FireFly/Rte/CmiManager.java
===================================================================
--- RTE/src/edu/lnu/FireFly/Rte/CmiManager.java	2008-05-29 09:39:57 UTC (rev 179)
+++ RTE/src/edu/lnu/FireFly/Rte/CmiManager.java	2008-05-29 11:39:23 UTC (rev 180)
@@ -38,6 +38,10 @@
         return activitiesVSModels.get(activity);
     }
     
+    public void resetModelForActivity(TreeItem activity){
+    	activitiesVSModels.put(activity, new Cmi(activity));
+    }
+    
     private static CmiManager obj = null;
     private CmiManager(){
     	

Modified: RTE/src/edu/lnu/FireFly/Rte/objectives/GlobalObjectives.java
===================================================================
--- RTE/src/edu/lnu/FireFly/Rte/objectives/GlobalObjectives.java	2008-05-29 09:39:57 UTC (rev 179)
+++ RTE/src/edu/lnu/FireFly/Rte/objectives/GlobalObjectives.java	2008-05-29 11:39:23 UTC (rev 180)
@@ -4,9 +4,31 @@
 import edu.lnu.FireFly.Rte.ElementName;
 
 public class GlobalObjectives {
-	private static ArrayList<ObjectivesItem> list = new ArrayList<ObjectivesItem>();
+	private ArrayList<ObjectivesItem> list = new ArrayList<ObjectivesItem>();
 	
-	public static boolean registered(String id){
+	private GlobalObjectives(){
+		
+	}
+	
+	private static GlobalObjectives obj = null;
+	
+	public static GlobalObjectives getInstance(){
+		if (obj == null){
+			obj = new GlobalObjectives();
+		}
+		
+		return obj;
+	}
+	
+	public void register(String id){
+		if (!registered(id)){
+			ObjectivesItem item = new ObjectivesItem();
+			item.setValue(new ElementName("id"), id);
+			put(item);
+		}
+	}
+	
+	public boolean registered(String id){
 		for (int i=0; i < list.size(); i++){
 			ObjectivesItem item = (ObjectivesItem) list.get(i);
 			String globalId = item.getValue(new ElementName("globalId"));
@@ -18,7 +40,7 @@
 		return false;
 	}
 	
-	public static void put(ObjectivesItem item){
+	public void put(ObjectivesItem item){
 		String id = item.getValue(new ElementName("id"));
 		
 		if (!registered(id)){
@@ -27,7 +49,7 @@
 		}
 	}
 	
-	public static ObjectivesItem get(String id){
+	public ObjectivesItem get(String id){
 		for (int i=0; i < list.size(); i++){
 			ObjectivesItem item = (ObjectivesItem) list.get(i);
 			String globalId = item.getValue(new ElementName("globalId"));

Modified: RTE/src/edu/lnu/FireFly/Rte/objectives/Objectives.java
===================================================================
--- RTE/src/edu/lnu/FireFly/Rte/objectives/Objectives.java	2008-05-29 09:39:57 UTC (rev 179)
+++ RTE/src/edu/lnu/FireFly/Rte/objectives/Objectives.java	2008-05-29 11:39:23 UTC (rev 180)
@@ -11,14 +11,6 @@
 public class Objectives extends Collection {
 	public static ArrayList<ObjectiveMap> objectiveMap = new ArrayList<ObjectiveMap>();
 	
-	public static void registerGlobalObjective(String id){
-		if (!GlobalObjectives.registered(id)){
-			ObjectivesItem item = new ObjectivesItem();
-			item.setValue(new ElementName("id"), id);
-			GlobalObjectives.put(item);
-		}
-	}
-	
 	public Objectives(Item current, boolean indexed){
 		super(indexed);
 		_children = ObjectivesItem._children;
@@ -32,7 +24,7 @@
 				for (int i = 0; i < current.sequencing.objectives.primaryObjective.mapInfo.size(); i++){
 					String globalId = ((MapInfo)current.sequencing.objectives.primaryObjective.mapInfo.get(i)).targetObjectiveID;
 					
-					registerGlobalObjective(globalId);
+					GlobalObjectives.getInstance().register(globalId);
 					objectiveMap.add(new ObjectiveMap(localId, globalId));
 				};
 
@@ -43,7 +35,7 @@
 
 					for (int j = 0; j < obj.mapInfo.size(); j++){
 						String globalId = ((MapInfo)obj.mapInfo.get(j)).targetObjectiveID.substring(0);
-						registerGlobalObjective(globalId);
+						GlobalObjectives.getInstance().register(globalId);
 						objectiveMap.add(new ObjectiveMap(localId, globalId));
 					};
 				}
@@ -69,8 +61,8 @@
 				if (((ObjectiveMap)objectiveMap.get(i)).activityObjectiveID.equals(id)){
 					String globalId = ((ObjectiveMap)objectiveMap.get(i)).targetObjectiveID;
 
-					if (GlobalObjectives.registered(globalId)){
-						ObjectivesItem obj = GlobalObjectives.get(globalId);
+					if (GlobalObjectives.getInstance().registered(globalId)){
+						ObjectivesItem obj = GlobalObjectives.getInstance().get(globalId);
 						return obj.setValue(new ElementName(name, 1), value);
 					}
 				}
@@ -90,8 +82,8 @@
 				if (((ObjectiveMap)objectiveMap.get(i)).activityObjectiveID.equals(id)){
 					String globalId = ((ObjectiveMap)objectiveMap.get(i)).targetObjectiveID;
 
-					if (GlobalObjectives.registered(globalId)){
-						ObjectivesItem obj = GlobalObjectives.get(globalId);
+					if (GlobalObjectives.getInstance().registered(globalId)){
+						ObjectivesItem obj = GlobalObjectives.getInstance().get(globalId);
 						return obj.getValue(new ElementName(name, 1));
 					}
 				}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.