X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RooProject.vala;h=b731153bcf608f0e9522e92fbeed981c46d8afbd;hb=351a7bb2683845c7c29a58583ac4c5f5a4b507e1;hp=d869bbea0c991190f82edd3bd669a7691d30c39c;hpb=2573b2897cb15085423ed1e1cdf3fe340f187532;p=gitlive

diff --git a/RooProject.vala b/RooProject.vala
index d869bbea..b731153b 100644
--- a/RooProject.vala
+++ b/RooProject.vala
@@ -3,15 +3,18 @@
 static RooProject  _RooProject;
 public class RooProject  : Object 
 {
+	static Gee.ArrayList<RooProject> _projects;
+	static int loadcount = 0;
+	
 	public static RooProject singleton()
     {
-       
+       if (_RooProject == null) {
             _RooProject = new RooProject();
-            RooTicket.projects = new Gee.ArrayList<RooProject>();
-            RooTicket.loadProjects();
+	        RooProject.loadcount = 0;
+            RooProject.loadProjects();
 
         }
-        return _RooTicket;
+        return _RooProject;
     }
 	
 	public string  id; // not really important that they are numbers..
@@ -19,7 +22,7 @@ public class RooProject  : Object
 	public string name;
 	public string type;
 
-	static Gee.ArrayList<RooProject> _projects;
+	
 	public static Gee.ArrayList<RooProject> projects()
 	{
 		RooProject.singleton();
@@ -27,9 +30,8 @@ public class RooProject  : Object
 		return RooProject._projects;
 	}
 	
-	static public RooProject addProject(Json.Object t)
+	public static  RooProject addProject(Json.Object t)
 	{
-		
 		RooProject.singleton(); // init...
 		
 		var add = new RooProject();
@@ -41,13 +43,21 @@ public class RooProject  : Object
 		GLib.debug("ADD project  %s : %s : %s", add.id, add.code, add.name);
 		return add;
 	}
-	
+
+	static void reloadProjects()  /// has to be called on singleton..
+	{
+		RooProject.loadcount = 0;
+		RooProject.singleton();
+		if (RooProject.loadcount == 0 ) {
+			RooProject.loadProjects();
+		}
+	}
 	
 	static  void loadProjects() // called from singleton...
 	{
-		RooTicket.singleton().projects = new Gee.ArrayList<RooProject>();
+		RooProject._projects = new Gee.ArrayList<RooProject>();
 	 
-    		
+    	RooProject.loadcount ++;	
 		var table = new GLib.HashTable<string, string>(str_hash, str_equal);
 	 
 		table.insert("query[project_filter]","P,N,U");