X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RooProject.vala;h=d99bcd101eb7b40141f28c2ebe348266861638f2;hb=16c0c90787e727c0c69812b16f647e0530a8f120;hp=cfc95ab7d314d1d45b15ab813b61b1691ade10b5;hpb=bd5ce7c869b301652299d29a1ec39f873dc253a0;p=gitlive

diff --git a/RooProject.vala b/RooProject.vala
index cfc95ab7..d99bcd10 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.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,6 +43,7 @@ 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;
@@ -54,7 +57,7 @@ public class RooProject  : Object
 	{
 		RooTicket._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");