src/Palete/Palete.vala

[app.Builder.js] / src / Palete / GirObject.vala

diff --git a/src/Palete/GirObject.vala b/src/Palete/GirObject.vala
index 5354165..d3da377 100644 (file)
--- a/src/Palete/GirObject.vala
+++ b/src/Palete/GirObject.vala
@@ -23,7 +23,8 @@ namespace Palete {
                public string propertyof;
                public string type;
                public string nodetype;
-               public string  package;
+               public string package;
+               public string direction; // used for vala in/out/ref...
                
                public GirObject paramset = null;
                public GirObject return_value = null;
@@ -38,7 +39,7 @@ namespace Palete {
         
                public  string sig;
 
-               bool is_overlaid;
+               public bool is_overlaid;
 
                public  GirObject gparent;
                public Gee.ArrayList<GirObject> params;
@@ -51,6 +52,8 @@ namespace Palete {
                public Gee.HashMap<string,GirObject> props;
                public Gee.HashMap<string,GirObject> consts;
                public Gee.HashMap<string,GirObject> signals;
+               
+               public Gee.ArrayList<string> optvalues; // used by Roo only..
                public string doctxt;
 
 
@@ -85,6 +88,8 @@ namespace Palete {
                        this.props      = new Gee.HashMap<string,GirObject>();
                        this.consts     = new Gee.HashMap<string,GirObject>();
                        this.signals    = new Gee.HashMap<string,GirObject>();
+                       
+                       this.optvalues = new Gee.ArrayList<string>();
                        this.is_overlaid = false;
                        this.paramset = null;
                }
@@ -107,12 +112,14 @@ namespace Palete {
                                this.is_overlaid = true;
                                return;
                        }
-                       // print("Overlaying " +this.name + " with " + this.parent + "\n");
+                        
+                       //print("Overlaying " +this.name + " with " + this.parent + "\n");
 
                        var pcls = this.clsToObject( this.parent);
                        if (pcls == null) {
-                               throw new GirError.INVALID_VALUE("Could not find class : " + 
-                                       this.parent + " of " + this.name  + " in " + this.ns);
+                               return;
+                               //throw new GirError.INVALID_VALUE("Could not find class : " + 
+                               //      this.parent + " of " + this.name  + " in " + this.ns);
                        }
                        
                        pcls.overlayParent( );
@@ -406,9 +413,9 @@ namespace Palete {
                        }
                        */
                        
-                       var gir = VapiParser.factory (this.ns);
+                       var gir = Gir.factory (this.ns);
                        if (in_pn.contains(".")) {
-                               gir =  VapiParser.factory(in_pn.split(".")[0]);
+                               gir =  Gir.factory(in_pn.split(".")[0]);
                                pn = in_pn.split(".")[1];
                        }