RooProject.vala

[gitlive] / RooProject.vala

diff --git a/RooProject.vala b/RooProject.vala
index 60a2a7d..b731153 100644 (file)
--- 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,7 +43,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;
@@ -53,9 +55,9 @@ public class RooProject  : Object
        
        static  void loadProjects() // called from singleton...
        {
-               RooTicket._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");