RooProject.vala

[gitlive] / RooProject.vala

diff --git a/RooProject.vala b/RooProject.vala
index 60a2a7d..69000f2 100644 (file)
--- a/RooProject.vala
+++ b/RooProject.vala
@@ -5,10 +5,10 @@ public class RooProject  : Object
 {
        public static RooProject singleton()
     {
-       
+       if (_RooProject == null) {
             _RooProject = new RooProject();
- 
-            RooTicket.loadProjects();
+               RooProject.loadcount = 0;
+            RooProject.loadProjects();
 
         }
         return _RooTicket;
@@ -27,9 +27,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,7 +40,7 @@ public class RooProject  : Object
                GLib.debug("ADD project  %s : %s : %s", add.id, add.code, add.name);
                return add;
        }
-       static int loadcount = 0;
+
        static void reloadProjects()  /// has to be called on singleton..
        {
                RooProject.loadcount = 0;
@@ -55,7 +54,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");