From 4acf38c0ae0d523d6e328971f885b98c60e7921f Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@akbkhome.com>
Date: Thu, 25 Aug 2011 11:21:53 +0800
Subject: [PATCH] Builder/Provider/File/Gtk.js

---
 Builder/Provider/File/Base.js | 381 ----------------------------
 Builder/Provider/File/Gtk.js  | 210 ----------------
 Builder/Provider/File/Lang.js | 155 ------------
 Builder/Provider/File/Roo.js  | 462 ----------------------------------
 JsParser.js                   |  39 ++-
 JsRender/Base.js              |  55 +++-
 JsRender/Gtk.js               |   2 +-
 JsRender/Roo.js               |   8 +-
 rconv.js                      |  23 +-
 9 files changed, 107 insertions(+), 1228 deletions(-)
 delete mode 100644 Builder/Provider/File/Base.js
 delete mode 100755 Builder/Provider/File/Gtk.js
 delete mode 100644 Builder/Provider/File/Lang.js
 delete mode 100644 Builder/Provider/File/Roo.js

diff --git a/Builder/Provider/File/Base.js b/Builder/Provider/File/Base.js
deleted file mode 100644
index c37d992f9..000000000
--- a/Builder/Provider/File/Base.js
+++ /dev/null
@@ -1,381 +0,0 @@
-//<Script type="text/javascript">
-
-console = imports.console;
-XObject = imports.XObject.XObject;
-
-Lang = imports.Builder.Provider.File.Lang.Lang;
-
-File = imports.File.File;
-// File Provider..
-
-Base = XObject.define(
-    
-    function(cfg) {
-        
-        XObject.extend(this, cfg);
-        
-    },
-    Object,
-    {
-        /**
-         * @cfg {Array} doubleStringProps list of properties that can be double quoted.
-         */
-        doubleStringProps : false,
-        
-        id : false,
-        name : false,   // is the JS name of the file.
-        path : '',      // is the full path to the file.
-        parent : false, // JS parent.
-        
-        title : false,  // a title.. ?? nickname.. ??? - 
-        project: false, // name...
-        //Project : false, // link to container project!
-        
-        items : false, // the tree of nodes.
-        
-        cn : false, // array used by project tree.
-        
-        
-        save : function()
-        {
-            var write = { }; 
-            var _this = this;
-            var write = this.toJsonArray()
-            print("WRITE: " + this.path);// + "\n" + JSON.stringify(write));
-            File.write(this.path, JSON.stringify(write, null, 4));
-        },
-        
-        /**
-         * accepts:
-         * { success : , failure : , scope : }
-         * 
-         * 
-         * 
-         */
-         
-        getTree : function( o ) {
-            console.log("File.getTree tree called on base object?!?!");
-        },
-        toJsonArray : function()
-        {
-            var ret = { }; 
-            var _this = this;
-            ['id', 'name', 'parent', 'title', 'path', 'items' , 'permname', 'modOrder' ].forEach( function(k) {
-                ret[k] = typeof(_this[k]) == 'undefined' ? '' : _this[k];
-            });
-            return ret;
-        },
-        getTitle : function()
-        {
-            if (this.title) {
-                return this.title;
-            }
-            return this.path.split('/').pop();
-            
-        },
-        getTitleTip: function()
-        {
-            if (this.title) {
-                return '<b>' + this.title + '</b> ' + this.path;
-            }
-            return this.path;
-        },
-        sortCn: function()
-        {
-            this.cn.sort(function(a,b) {
-                return a.path > b.path;// ? 1 : -1;
-            });
-        },
-        // should be in palete provider really..
-        
-        guessName : function(ar) // turns the object into full name.
-        {
-             // eg. xns: Roo, xtype: XXX -> Roo.xxx
-            if (typeof( ar['|xns'] ) == 'undefined' || typeof( ar['xtype'] ) == 'undefined') {
-                return '';
-               }
-             
-            return ar['|xns'] +'.' + ar['xtype'];
-                            
-                                 
-        },
-        
-        /*
-        Roo specific?
-        toSourceStdClass: function()
-        {
-            var cfg = this.items[0]
-            var fcfg = XObject.extend({ },  this.items[0]);
-            delete fcfg['*class'];
-            delete fcfg['*extends'];
-            delete fcfg['*static'];
-            delete fcfg['|constructor'];
-            
-            var hasExtends = (typeof(cfg['*extends']) != 'undefined') && cfg['*extends'].length;
-            var hasConstructor = (typeof(cfg['|constructor']) != 'undefined');
-            var isStatic = (typeof(cfg['*static']) == '*static');
-            
-            var newline = '';
-            var endline = '';
-            if (hasExtends) {
-                newline =  hasConstructor ? 
-                
-                 
-                    cfg['//constructor'] + "\n" + 
-                    cfg['*class'] + " = " + cfg['|constructor'] + "\n\n"+ 
-                    "Roo.extend(" + cfg['*class'] + ":, " + cfg['*extends'] + ", " :
-                    
-                    cfg['//*class'] + "\n" + 
-                    cfg['*class'] + " = new " + cfg['*extends'] + "(" ;
-                
-                endline = ');';
-            } else {
-                
-                
-                
-                newline  = hasConstructor ? 
-                
-                    cfg['//constructor'] + "\n" + 
-                    cfg['*class'] + " = " + cfg['|constructor'] + "\n\n"+ 
-                    'Roo.apply( ' +  cfg['*class'] + ".prototype , " :
-                    
-                    cfg['//*class'] + "\n" + 
-                    cfg['*class'] + " = ";
-                
-                    
-                endline = hasConstructor ? ');' : ';';
-            }
-                  
-            return this.outputHeader() + 
-                    newline + 
-                    this.objectToJsString(fcfg,1) +
-                    endline;
-            
-            
-            
-         
-        },
-        */
-        
-        copyTo: function(path, cb)
-        {
-            var _this = this;
-            this.loadItems(function() {
-                
-                _this.path = path;
-                cb();
-            });
-            
-        },
-        
-        /**
-         * 
-         * munge JSON tree into Javascript code.
-         * 
-         * FIXME: + or / prefixes to properties hide it from renderer.
-         * FIXME: '*props' - not supported by this.. ?? - upto rendering code..
-         * FIXME: needs to understand what properties might be translatable (eg. double quotes)
-         * 
-         * @arg {object} obj the object or array to munge..
-         * @arg {boolean} isListener - is the array being sent a listener..
-         * @arg {string} pad - the padding to indent with. 
-         */
-        
-        
-        mungeToString:  function(obj, isListener, pad)
-        {
-            pad = pad || '    ';
-            var keys = [];
-            var isArray = false;
-            isListener = isListener || false;
-             
-            // am I munging a object or array...
-            if (obj.constructor.toString() === Array.toString()) {
-                for (var i= 0; i < obj.length; i++) {
-                    keys.push(i);
-                }
-                isArray = true;
-            } else {
-                for (var i in obj) {
-                    keys.push(i);
-                }
-            }
-            
-            
-            var els = []; 
-            var skip = [];
-            if (!isArray && 
-                    typeof(obj['|xns']) != 'undefined' &&
-                    typeof(obj['xtype']) != 'undefined'
-                ) {
-                    this.mungeXtype(obj['|xns'] + '.' + obj['xtype'], els);
-                    //els.push('xtype: '+ obj['|xns'] + '.' + obj['xtype']);
-                    skip.push('|xns','xtype');
-                }
-            
-            
-            if (!isArray && obj.items && obj.items.length) {
-                // look for props..
-                var newitems = [];
-                obj.items.forEach(function(pl) {
-                    if (typeof(pl['*prop']) == 'undefined') {
-                        newitems.push(pl);
-                        return;
-                    }
-                    // we have a prop...
-                    var prop = pl['*prop'] + '';
-                    delete pl['*prop'];
-                    if (!prop.match(/\[\]$/)) {
-                        // it's a standard prop..
-                        obj[prop] = pl;
-                        keys.push(prop);
-                        return;
-                    }
-                    prop  = prop.substring(0, prop.length -2); //strip []
-                    // it's an array type..
-                    obj[prop] = obj[prop]  || [];
-                    obj[prop].push(pl);
-                    print("ADDNG PROP:" + prop + ' ' + keys.indexOf(prop) );
-                    if (keys.indexOf(prop) < 0) {
-                        keys.push(prop);
-                    }
-                    
-                    
-                    
-                });
-                obj.items = newitems;
-                if (!obj.items.length) {
-                    delete obj.items;
-                }
-                
-            }
-            
-            
-            
-            
-            
-            var _this = this;
-            
-            var left =  '';
-            
-            keys.forEach(function(i) {
-              
-                if (typeof(obj[i]) == 'undefined') { // empty or removed.
-                    return;
-                }
-                var el = obj[i];
-                if (!isArray && skip.indexOf(i) > -1) { // things we do not write..
-                    return;
-                }
-                if (!isArray) {
-                    // set the key to be quoted with singel quotes..
-                    var leftv = i[0] == '|' ? i.substring(1) : i;
-                    if (Lang.isKeyword(leftv) || Lang.isBuiltin(leftv)) {
-                        left = "'" + leftv + "'";
-                    } else if (leftv.match(/[^A-Z_]+/i)) { // not plain a-z... - quoted.
-                        var val = JSON.stringify(leftv);
-                        left = "'" + val.substring(1, val.length-1).replace(/'/g, "\\'") + "'";
-                    } else {
-                        left = '' + leftv;
-                    }
-                    left += ' : ';
-                    
-                }
-                if (isListener) {
-                    // change the lines...
-                    var str= ('' + obj[i]).replace(/^\s+|\s+$/g,"");
-                    var lines = str.split("\n");
-                    if (lines.length > 1) {
-                        str = lines.join("\n" + pad);
-                    }
-                    els.push(left  + str);
-                    return;
-                }
-                 
-                
-                
-                //var left = isArray ? '' : (JSON.stringify(i) + " : " )
-                
-                if (i[0] == '|') {
-                    // does not hapepnd with arrays..
-                    if (typeof(el) == 'string' && !obj[i].length) { //skip empty.
-                        return;
-                    }
-                    // this needs to go...
-                    //if (typeof(el) == 'string'  && obj[i].match(new RegExp("Gtk.main" + "_quit"))) { // we can not handle this very well..
-                    //    return;
-                    //}
-                    
-                    var str= ('' + obj[i]).replace(/^\s+|\s+$/g,"");;
-                    var lines = str.split("\n");
-                    if (lines.length > 1) {
-                        str = lines.join("\n" + pad);
-                    }
-                    
-                    els.push(left + str);
-                    return;
-                }
-                
-                
-                
-                
-                if (typeof(el) == 'object') {
-                    
-                    // we can skip empty items lists and empty listeners..
-                    //if (!isArray && i == 'items' && !el.length) {
-                    //    return; 
-                    //}
-                   // 
-                    var right = _this.mungeToString(el, i == 'listeners', pad + '    ');
-                    if (typeof(right) != 'undefined') {
-                        els.push(left + right);
-                    }
-                
-                    return;
-                }
-                // standard. .
-                if (typeof(obj[i]) != 'string') {
-                    els.push(left + JSON.stringify(obj[i]));
-                    return;
-                }
-                // strings..
-                if (!_this.doubleStringProps) {
-                    els.push(left + JSON.stringify(obj[i]));
-                    return;
-                }
-                if (_this.doubleStringProps.indexOf(i) > -1) {
-                    els.push(left + JSON.stringify(obj[i]));
-                    return;
-                }
-                // single quote..
-                els.push(left + "'" + obj[i].replace(/'/g, "\\'") + "'");
-                
-
-            });
-            
-            if (!isArray && !els.length) {
-                return;
-            }
-            //output the thing.
-            var spad = pad.substring(0, pad.length-4);
-            return (isArray ? '[' : '{') + "\n" +
-                pad  + els.join(",\n" + pad ) + 
-                "\n" + spad + (isArray ? ']' : '}');
-               
-            
-            
-        } 
-        
-         
-        
-    }
-    
-     
-    
-);
-
-
-
-
-
-
diff --git a/Builder/Provider/File/Gtk.js b/Builder/Provider/File/Gtk.js
deleted file mode 100755
index 522fb4ed8..000000000
--- a/Builder/Provider/File/Gtk.js
+++ /dev/null
@@ -1,210 +0,0 @@
-//<Script type="text/javascript">
- 
-Gio = imports.gi.Gio;
-GLib = imports.gi.GLib;
-console = imports.console;
-XObject = imports.XObject.XObject;
-File = imports.File.File;
-  
-//----------------------- our roo verison
-Base = imports.Builder.Provider.File.Base.Base;
-
-var gid = 1;
-
-Gtk = XObject.define( 
-    function(cfg) {
-        
-        // id ,
-        //"name":"Edit Module Details",
-        // items : 
-        //"btype":"FORM", // was to be components...
-        //"app":"Builder",
-        //"module":"Pman.Tab.BuilderTop2"
-        //console.dump(cfg);
-        cfg.parent = cfg.parent || '';
-        if (!cfg.name || !cfg.fullname ) {
-            
-            // name is in theory filename without .bjs (or .js eventually...)
-            cfg.name = cfg.path.split('/').pop().replace(/\.(bjs|js)$/, '');
-            
-            cfg.fullname = (cfg.parent.length ? (cfg.parent + '.') : '' ) + cfg.name;
-        }
-        
-        
-        this.items = false;
-        if (cfg.json) {
-            var jstr =  JSON.parse(cfg.json);
-            this.items = [ jstr ];
-            //console.log(cfg.items.length);
-            delete cfg.json; // not needed!
-        }
-        this.cn = [];
-         /*
-        var p = cfg.items && cfg.items.length && cfg.items[0].parent ? cfg.items[0].parent : false;
-        
-        // ensure real data is set...
-        Roo.apply(this, {
-            name : cfg.module,
-            parent : p,
-            title : cfg.name,
-            project : cfg.app
-            
-        });
-        
-        this.cn = [];
-        */
-        Gtk.superclass.constructor.call(this, cfg);
-
-        
-        // super?!?!
-        this.id = 'file-gtk-' + gid++;
-        //console.dump(this);
-        // various loader methods..
-       
-    },
-    Base,   
-    {
-        xtype : 'Gtk',
-        setNSID : function(id)
-        {
-            
-            this.items[0]['*class'] = id;
-            
-            
-        },
-        getType: function() {
-            return 'Gtk';
-        },
-        
-        loadItems : function(cb)
-        {
-          
-            console.log("load Items!");
-            if (this.items !== false) {
-                return false;
-            }
-            if (!cb) {  
-                throw {
-                    name: "ArgumentError", 
-                    message : "no callback for loadItems"
-                };
-            }
-            Seed.print("load: " + this.path);
-            
-            
-
-            
-            var _this = this;     
-            var src = File.read(this.path);
-            
-            var cfg = JSON.parse(src);
-            print("loaded data");
-            //console.dump(cfg);
-            
-            //_this.name = cfg.name; -- this should not happen - name should always match filename!!
-            _this.parent =  cfg.parent;
-            _this.title =  cfg.title;
-            _this.items = cfg.items || []; 
-           
-                cb();
-             
-            
-                
-                // update to new JSDOC api!?
-                /*
-                var tstream =  new JSDOC.TextStream(src);
-                var tr = new  JSDOC.TokenReader( {
-                    keepWhite : true,
-                    keepComments : true
-                });
-                var toks = tr.tokenize(tstream);
-                //console.dump(toks);
-                //Seed.quit();
-                var ts = new JSDOC.Collapse(toks);
-                //console.dump(ts.tokens);
-                var rd = new JSDOC.GtkFile(ts.tokens);
-                try {
-                    rd.parse();
-                } catch (e) {
-                    console.log(e);
-                    _this.items = [ src ];
-                    cb();
-                    return;
-                }
-                 
-                console.dump(rd.cfg);
-                //!!??? have we got engouth!
-                // try parsing self..
-                _this.items = [ rd.cfg ];
-                _this.imports = rd.imports;
-                _this.giImports = rd.giImports ;
-                
-                cb();
-                
-                */
-            
-            
-            
-            
-        },
-        /**
-         * convert xtype for munged output..
-         * 
-         */
-        mungeXtype : function(xtype, els)
-        {
-            els.push('xtype: '+ xtype);
-        },
-        
-        
-        /** 
-         *  saveJS
-         * 
-         * save as a javascript file.
-         * 
-         * 
-         * 
-         */
-        saveJS: function()
-        {
-            if (!this.items[0]) {
-                return false;
-            }
-            var data = JSON.parse(JSON.stringify(this.items[0]));
-            // we should base this on the objects in the tree really..
-            var i = [ 'Gtk', 'Gdk', 'Pango', 'GLib', 'Gio', 'GObject', 
-                'GtkSource', 'WebKit', 'Vte' ]; //, 'GtkClutter' , 'Gdl'];
-            var src = "";
-            i.forEach(function(e) {
-                src += e+" = imports.gi." + e +";\n";
-            });
-            
-            src += "console = imports.console;\n"; // path?!!?
-            src += "XObject = imports.XObject.XObject;\n"; // path?!!?
-            
-            
-            src += this.name + '=new XObject('+ this.mungeToString(data) + ");\n";
-            src += this.name + '.init();\n';
-            // register it in the cache
-            src += "XObject.cache['/" + this.name + "'] = " + this.name + ";\n";
-            
-            
-            var fn = GLib.path_get_dirname(this.path) + '/' + this.name + '.js';
-            print("WRITE : " + fn);
-            File.write(fn, src);
-            
-            return fn;
-        },
-        /*
-        getTree : function( o ) {
-            
-            
-            
-        }
-        */
-        getHelpUrl : function(cls)
-        {
-            return 'http://devel.akbkhome.com/seed/' + cls + '.html';
-        }
-        
-    });
diff --git a/Builder/Provider/File/Lang.js b/Builder/Provider/File/Lang.js
deleted file mode 100644
index 51f9ad52e..000000000
--- a/Builder/Provider/File/Lang.js
+++ /dev/null
@@ -1,155 +0,0 @@
-//<script type="text/javscript">
-
-/**
-	@namespace
-*/
-Lang = {
-    
-    
-    isBuiltin : function(name) {
-        return (this.coreObjects.indexOf(name) > -1);
-    }, 
-    coreObjects : ['_global_', 'Array', 'Boolean', 'Date', 'Error', 
-        'Function', 'Math', 'Number', 'Object', 'RegExp', 'String'],
-        
-
-    whitespace : function(ch) {
-        return this.whitespaceNames[ch];
-    },
-    
-    whitespaceNames : {
-        " ":      "SPACE",
-        "\f":     "FORMFEED",
-        "\t":     "TAB",
-        "\u0009": "UNICODE_TAB",
-        "\u000A": "UNICODE_NBR",
-        "\u0008": "VERTICAL_TAB"
-    },
-
-    newline : function(ch) {
-        return this.newlineNames[ch];
-    },
-    newlineNames : {
-        "\n":     "NEWLINE",
-        "\r":     "RETURN",
-        "\u000A": "UNICODE_LF",
-        "\u000D": "UNICODE_CR",
-        "\u2029": "UNICODE_PS",
-        "\u2028": "UNICODE_LS"
-    },
-
-    keyword : function(word) {
-        return this.keywordNames["="+word];
-    },
-    isKeyword: function(word) {
-        return typeof(this.keywordNames["="+word]) == 'undefined' ? false : true;
-    },
-
-    keywordNames : {
-        "=break":      "BREAK",
-        "=case":       "CASE",
-        "=catch":      "CATCH",
-        "=const":      "VAR",
-        "=continue":   "CONTINUE",
-        "=default":    "DEFAULT",
-        "=delete":     "DELETE",
-        "=do":         "DO",
-        "=else":       "ELSE",
-        "=false":      "FALSE",
-        "=finally":    "FINALLY",
-        "=for":        "FOR",
-        "=function":   "FUNCTION",
-        "=if":         "IF",
-        "=in":         "IN",
-        "=instanceof": "INSTANCEOF",
-        "=new":        "NEW",
-        "=null":       "NULL",
-        "=return":     "RETURN",
-        "=switch":     "SWITCH",
-        "=this":       "THIS",
-        "=throw":      "THROW",
-        "=true":       "TRUE",
-        "=try":        "TRY",
-        "=typeof":     "TYPEOF",
-        "=void":       "VOID",
-        "=while":      "WHILE",
-        "=with":       "WITH",
-        "=var":        "VAR"
-    },
-
-    punc : function(ch) {
-        return this.puncNames[ch];
-    },
-    puncNames : {
-        ";":   "SEMICOLON",
-        ",":   "COMMA",
-        "?":   "HOOK",
-        ":":   "COLON",
-        "||":  "OR", 
-        "&&":  "AND",
-        "|":   "BITWISE_OR",
-        "^":   "BITWISE_XOR",
-        "&":   "BITWISE_AND",
-        "===": "STRICT_EQ", 
-        "==":  "EQ",
-        "=":   "ASSIGN",
-        "!==": "STRICT_NE",
-        "!=":  "NE",
-        "<<":  "LSH",
-        "<=":  "LE", 
-        "<":   "LT",
-        ">>>": "URSH",
-        ">>":  "RSH",
-        ">=":  "GE",
-        ">":   "GT", 
-        "++":  "INCREMENT",
-        "--":  "DECREMENT",
-        "+":   "PLUS",
-        "-":   "MINUS",
-        "*":   "MUL",
-        "/":   "DIV", 
-        "%":   "MOD",
-        "!":   "NOT",
-        "~":   "BITWISE_NOT",
-        ".":   "DOT",
-        "[":   "LEFT_BRACE",
-        "]":   "RIGHT_BRACE",
-        "{":   "LEFT_CURLY",
-        "}":   "RIGHT_CURLY",
-        "(":   "LEFT_PAREN",
-        ")":   "RIGHT_PAREN"
-    },
-
-    matching : function(name) {
-        return this.matchingNames[name];
-    },
-    matchingNames : {
-        "LEFT_PAREN": "RIGHT_PAREN",
-        "RIGHT_PAREN": "LEFT_PAREN",
-        "LEFT_CURLY": "RIGHT_CURLY",
-        "RIGHT_CURLY": "LEFT_CURLY",
-        "LEFT_BRACE": "RIGHT_BRACE",
-        "RIGHT_BRACE": "LEFT_BRACE"
-    },
-
-    isNumber : function(str) {
-        return /^(\.[0-9]|[0-9]+\.|[0-9])[0-9]*([eE][+-][0-9]+)?$/i.test(str);
-    },
-
-    isHexDec : function(str) {
-        return /^0x[0-9A-F]+$/i.test(str);
-    },
-
-    isWordChar : function(str) {
-        return /^[a-zA-Z0-9$_.]+$/.test(str);
-    },
-
-    isSpace : function(str) {
-        return (typeof this.whitespace(str) != "undefined");
-    },
-
-    isNewline : function(str) {
-        return (typeof this.newline(str) != "undefined");
-    }
-    
-};
\ No newline at end of file
diff --git a/Builder/Provider/File/Roo.js b/Builder/Provider/File/Roo.js
deleted file mode 100644
index 3c84d6ef7..000000000
--- a/Builder/Provider/File/Roo.js
+++ /dev/null
@@ -1,462 +0,0 @@
-//<Script type="text/javascript">
-
- 
-Gio = imports.gi.Gio;
-console = imports.console;
-XObject = imports.XObject.XObject;
-
-  
-//----------------------- our roo verison
-Base = imports.Builder.Provider.File.Base.Base;
-Gio = imports.gi.Gio;
-File = imports.File.File;
-
-//JSDOC =  imports['JSDOC.js'];
-//----------------------- our roo verison
-
-var rid = 0;
-
-Roo = XObject.define(
-    function(cfg) {
-        
-        // id ,
-        //"name":"Edit Module Details",
-        // items : 
-        //"btype":"FORM", // was to be components...
-        //"app":"Builder",
-        //"module":"Pman.Tab.BuilderTop2"
-        //console.dump(cfg);
-        
-        if (!cfg.name || !cfg.fullname ) {
-            cfg.name = cfg.path.split('/').pop().replace(/\.bjs$/, '');
-            //cfg.fullname = (cfg.parent && cfg.parent.length ? (cfg.parent + '.') : '' ) + cfg.name;
-            cfg.fullname = cfg.name;
-        }
-        
-        
-        this.items = false;
-        if (cfg.json) {
-            var jstr =  JSON.parse(cfg.json);
-            this.items = [ jstr ];
-            //console.log(cfg.items.length);
-            delete cfg.json; // not needed!
-        }
-        this.cn = [];
-         /*
-        var p = cfg.items && cfg.items.length && cfg.items[0].parent ? cfg.items[0].parent : false;
-        
-        // ensure real data is set...
-        Roo.apply(this, {
-            name : cfg.module,
-            parent : p,
-            title : cfg.name,
-            project : cfg.app
-            
-        });
-        
-        this.cn = [];
-        */
-        Roo.superclass.constructor.call(this, cfg);
-
-        
-        // super?!?!
-        this.id = 'roo-file-' + (rid++);
-        // various loader methods..
-    },
-    Base,
-    {
-        doubleStringProps : [ 
-            'title',
-            'legend',
-            'loadingText',
-            'emptyText',
-            'qtip',
-            'value',
-            'text'
-        ],
-        modOrder : '001', /// sequence id that this uses.
-        region : 'center',
-        parent : '',
-        title : '', // the title on displayed when loading.
-        disable : '', // use a function to that returns false to disable this..
-        permname: '', /// permission name
-        
-        setNSID : function(id)
-        {
-            
-            this.items[0]['|module'] = id;
-       
-            
-        },
-        
-        
-        getType: function() {
-            return 'Roo';
-        },
-        
-      
-        loadItems : function(cb)
-        {
-            console.log("load Items!");
-            if (this.items !== false) {
-                return false;
-            }
-            var file = Gio.file_new_for_path(this.path);
-            
-            var _this = this;                        
-            file.read_async(0, null, function(source,result) {
-                var stream = source.read_finish(result)
-                var dstream = new Gio.DataInputStream.c_new(stream);
-                
-                var src = dstream.read_until("")
-                
-                var cfg = JSON.parse(src);
-                print("loaded data");
-                console.dump(cfg);
-                _this.modOrder = cfg.modOrder || '001';
-                _this.name = cfg.name.replace(/\.bjs/, ''); // BC!
-                _this.parent =  cfg.parent;
-                _this.permname =  cfg.permname || '';
-                _this.title =  cfg.title;
-                _this.items = cfg.items || []; 
-                
-                _this.fixItems(_this, false);
-                
-                
-                
-                cb();
-                /*
-                var tstream =  new JSDOC.TextStream(src);
-                var tr = new  JSDOC.TokenReader( {
-                    keepWhite : true,
-                    keepComments : true
-                });
-                var toks = tr.tokenize(tstream);
-                var ts = new JSDOC.Collapse(toks);
-                //console.dump(ts.tokens);
-                var rd = new JSDOC.RooFile(ts.tokens);
-                try {
-                    rd.parse();
-                } catch (e) {
-                    console.log(e);
-                    _this.items = [ src ];
-                    cb();
-                    return;
-                }
-                 
-                console.dump(rd.cfg);
-                //!!??? have we got engouth!
-                // try parsing self..
-                _this.items = [ rd.cfg ];
-                cb();
-                */
-                
-            });
-            
-            
-            
-        },
-        /**
-         * old code had broken xtypes and used arrays differently,
-         * this code should try and clean it up..
-         * 
-         * 
-         */
-        fixItems : function(node, fixthis)
-        {
-            if (fixthis) {
-                // fix xtype.
-                var fn = this.guessName(node);
-                //print("guessname got " + fn);
-                if (fn) {
-                    var bits = fn.split('.');
-                    node.xtype = bits.pop();
-                    node['|xns'] = bits.join('.');
-                    
-                }
-                // fix array???
-                 
-                
-            }
-            if (!node.items || !node.items.length) {
-                return;
-            }
-            var _this = this;
-            var aitems = [];
-            var nitems = [];
-            node.items.forEach(function(i) {
-                
-                
-                
-                _this.fixItems(i, true);
-                if (i.xtype == 'Array') {
-                    aitems.push(i);
-                    return;
-                }    
-                nitems.push(i);
-            });
-            node.items = nitems; 
-            
-            if (!aitems.length) {
-                return;
-            }
-            
-            aitems.forEach(function(i) {
-                
-                if (!i.items || !i.items.length) {
-                    return;
-                }
-                var prop = i['*prop'] + '[]';
-                // colModel to cm?
-                i.items.forEach(function(c) {
-                    c['*prop']  = prop;
-                    node.items.push(c);
-                    
-                });
-                
-                
-            });
-            
-            
-            // array handling.. 
-            
-            
-            
-            
-            
-        },
-        
-        save : function()
-        {
-            Base.prototype.save.call(this);
-            // now write the js file..
-            var js = this.path.replace(/\.bjs$/, '.js');
-            var d = new Date();
-            var js_src = this.toSource();
-            print("TO SOURCE in " + ((new Date()) - d) + "ms");
-            File.write(js, js_src);
-            
-            
-            
-        },
-         /**
-         * convert xtype for munged output..
-         * 
-         */
-        mungeXtype : function(xtype, els)
-        {
-            var bits = xtype.split('.');
-            // assume it has lenght!
-            
-            els.push("xtype: '"+ bits.pop()+"'");
-            els.push('xns: '+ bits.join('.'));
-        },
-        
-        /**
-         * This needs to use some options on the project
-         * to determine how the file is output..
-         * 
-         * At present we are hard coding it..
-         * 
-         * 
-         */
-        toSource: function()
-        {
-            // dump the file tree back out to a string.
-            
-            // we have 2 types = dialogs and components
-            // 
-            var top = this.guessName(this.items[0]);
-            if (!top) {
-                return false;
-            }
-            if (top.match(/Dialog/)) {
-                return this.toSourceDialog();
-            }
-            return this.toSourceLayout();
-            
-            /*
-            eventually support 'classes??'
-             return this.toSourceStdClass();
-            */
-              
-        },
-       
-        outputHeader : function()
-        {
-            return [
-                "//<script type=\"text/javascript\">",
-                "",
-                "// Auto generated file - created by app.Builder.js- do not edit directly (at present!)",
-                ""
-            ].join("\n");
-            
-       
-        },
-        // a standard dialog module.
-        // fixme - this could be alot neater..
-        toSourceDialog : function() 
-        {
-            var items = JSON.parse(JSON.stringify(this.items[0]));
-            var o = this.mungeToString(items, false, '            ');   
-            return [
-                this.outputHeader(),
-                this.name + " = {",
-                "",
-                "    dialog : false,",
-                "    callback:  false,",
-                "",   
-                "    show : function(data, cb)",
-                "    {",
-                "        if (!this.dialog) {",
-                "            this.create();",
-                "        }",
-                "",
-                "        this.callback = cb;",
-                "        this.data = data;",
-                "        this.dialog.show(this.data._el);",
-                "        if (this.form) {",
-                "           this.form.reset();",
-                "           this.form.setValues(data);",
-                "           this.form.fireEvent('actioncomplete', this.form,  { type: 'setdata', data: data });",
-                "        }",
-                "",   
-                "    },",
-                "",
-                "    create : function()",
-                "    {",
-                "        var _this = this;",
-                "        this.dialog = Roo.factory(" + o +  ");",
-                "    }",
-                "};",
-                ""
-                
-             ].join("\n");
-             
-             
-             
-        },
-        // a layout compoent 
-        toSourceLayout : function() 
-        {
-            var items = JSON.parse(JSON.stringify(this.items[0]));
-            var o = this.mungeToString(items, false, '            ');   
-             
-            var modkey = this.modOrder + '-' + this.name.replace('/[^A-Z]+/ig', '-');
-            
-            
-            if (this.name.match(/^Pman/)) {
-                    
-                
-                // old BC way we did things..
-                return [
-                    this.outputHeader(),
-                    "",
-                    "",
-                    "// register the module first",
-                    "Pman.on('beforeload', function()",
-                    "{",
-                    "    Pman.register({",
-                    "        modKey : '" +modkey+"',",
-                    "        module : " + this.name + ",",
-                    "        region : '" + this.region   +"',",
-                    "        parent : " + (this.parent ||  'false') + ",",
-                    "        name : " + JSON.stringify(this.title  || "unnamed module") + ",",
-                    "        disabled : " + (this.disabled || 'false') +", ",
-                    "        permname: '" + (this.permname|| '') +"' ",
-                    "    });",
-                    "});",
-                    "",
-                    
-                    this.name  +  " = new Roo.util.Observable({",
-                    "",
-                    "    panel : false,",
-                    "    disabled : false,",
-                    "    parentLayout:  false,",
-                    "",
-                    "    add : function(parentLayout, region)",
-                    "    {",
-                    "",
-                    "        var _this = this;", // standard avaialbe..
-                    "        this.parentLayout = parentLayout;",
-                    "",
-                    "        this.panel = parentLayout.addxtype(" + o +  ");",
-                    "        this.layout = this.panel.layout;",
-                    "",
-                    "    }",
-                    "});",
-                    ""
-                     
-                    
-                 ].join("\n");
-            }
-            
-        
-            return [
-                this.outputHeader(),
-                
-                this.name  +  " = new Roo.XComponent({",
-                "    order    : '" +modkey+"',",
-                "    region   : '" + this.region   +"',",
-                "    parent   : "+ (this.parent ?  "'" + this.parent + "'" :  'false') + ",",
-                "    name     : " + JSON.stringify(this.title  || "unnamed module") + ",",
-                "    disabled : " + (this.disabled || 'false') +", ",
-                "    tree : function()",
-                "    {",
-                "        var _this = this;", // bc
-                "        var MODULE = this;", /// this looks like a better name.
-                "        return " + o + ';',
-                "    }",
-                "});",
-                ""
-                 
-             ].join("\n");
-            
-        },
-            
-        guessName : function(ar) // turns the object into full name.
-        {
-             // eg. xns: Roo, xtype: XXX -> Roo.xxx
-            if (!ar) {
-                return false;
-            }
-            var ret = [];
-            ret.push(typeof( ar['|xns'] ) == 'undefined' ? 'Roo' : ar['|xns'] );
-            
-            
-            
-            if (typeof( ar['xtype'] ) == 'undefined' || !ar['xtype'].length) {
-                return false;
-            }
-            var xtype = ar['xtype'] + '';
-            if (xtype[0] == '*') { // prefixes????
-                xtype  = xtype.substring(1);
-            }
-            if (xtype.match(/^Roo/)) {
-                // already starts with roo...
-                ret = [];
-            }
-            ret.push(xtype);
-            var str =  ret.join('.');
-            
-            
-            
-            var pm = imports.Builder.Provider.ProjectManager.ProjectManager;
-            return pm.getPalete('Roo').guessName(ret.join('.'));
-            
-                            
-                                 
-        },
-        /*
-        getTree : function( o ) {
-            
-            
-            
-        }
-        */
-         getHelpUrl : function(cls)
-        {
-            return 'http://www.akbkhome.com/roojs1/docs/symbols/' + cls + '.html';
-        }
-        
-});
\ No newline at end of file
diff --git a/JsParser.js b/JsParser.js
index 439e53bac..adbc921e9 100644
--- a/JsParser.js
+++ b/JsParser.js
@@ -19,8 +19,9 @@ Collapse = imports.JSDOC.Collapse.Collapse;
  * Current issues:
  *  - xtype is combined on generated files. (not xns + xtype)
  *  - listeners are prefixed with '|' ... 
- *
- * 
+ *  - modkey is not getting picked up..
+ *  - suspect some of the elements are not getting flattened
+ *  - parent on 
  */
 
 JsParser  =  XObject.define(
@@ -227,11 +228,28 @@ JsParser  =  XObject.define(
                 throw "could not find top props...";
                 
             }
+            //print(JSON.stringify(topp,null,4));
             
             this.cfg = this.parseProps(topp);
-            this.cfg.name = this.tokens[3].data;
+            for(var k in this.cfg) {
+                this.cfg[k.replace(/^\|/, '')] = this.cfg[k];
+            }
+            if (this.cfg.name) {
+                this.cfg.title = this.cfg.name;
+                delete this.cfg.name;
+            }
+           // this.cfg.fullname = this.cfg.name;
             this.cfg.type = 'Roo';
             
+            
+            
+            // looking for parent / name..
+            
+            
+            this.cfg.modOrder = this.cfg.modKey.split('-').shift(); 
+            print(JSON.stringify(this.cfg,null,4));
+            
+            
             //                  (            {          add    { this.panel (  {
             var cfg = this.tokens[7].items[0][0].props.add.val[2].items[2][3].items[0][0].props;
             this.cfg.items = [ this.parseProps(cfg) ];
@@ -404,12 +422,11 @@ JsParser  =  XObject.define(
                             ret[kv] = add;
                             continue;
                         }
-                        var fake_array = {
-                            xtype : 'Array.' + kv,
-                            '*prop' : kv,
-                            items : add
-                        }
-                        fakeItems.push(fake_array);
+                        add.forEach(function(a) {
+                            a['*prop'] = kv + '[]';
+                            fakeItems.push(a);
+                        });
+                        
                         continue;
                     } 
                     // raw array 
@@ -466,8 +483,8 @@ JsParser  =  XObject.define(
                         
                     }
                 }
-               
-                ret[ '|' + kv ] =  this.expand(o[k].val);
+                // finally give up..
+                ret[ '|' + kv ] =  this.clean_body(this.expand(o[k].val));
                 
             }
             if (!ret.items && fakeItems.length) {
diff --git a/JsRender/Base.js b/JsRender/Base.js
index f25a32ca0..c5b6774f2 100644
--- a/JsRender/Base.js
+++ b/JsRender/Base.js
@@ -1,12 +1,17 @@
 //<Script type="text/javascript">
 
 
-XObject = imports.XObject.XObject;
+var XObject = imports.XObject.XObject;
 
 
-Lang = imports.JsRender.Lang.Lang;
+var Lang = imports.JsRender.Lang.Lang;
 
-File = imports.File.File;
+
+var JsParser = imports.JsParser.JsParser;
+var TokenReader = imports.JSDOC.TokenReader.TokenReader;
+var TextStream = imports.JSDOC.TextStream.TextStream;
+
+var File = imports.File.File;
 // File Provider..
 
 Base = XObject.define(
@@ -45,6 +50,50 @@ Base = XObject.define(
             print("WRITE: " + this.path);// + "\n" + JSON.stringify(write));
             File.write(this.path, JSON.stringify(write, null, 4));
         },
+        /**
+         *
+         * load from a javascript file..
+         * 
+         *
+         */
+         
+        _loadItems : function(cb)
+        {
+            // already loaded..
+            if (this.items !== false) {
+                return false;
+            }
+              
+            
+            
+            var tr = new  TokenReader(  { 
+                keepDocs :true, 
+                keepWhite : true,  
+                keepComments : true, 
+                sepIdents : false,
+                collapseWhite : false,
+                filename : args[0],
+                ignoreBadGrammer: true
+            });
+            
+            var str = File.read(this.path);
+            var toks = tr.tokenize(new TextStream(str));  
+            var rf = new JsParser(toks);
+            rf.parse();
+            var cfg = rf.cfg;
+            
+            this.modOrder = cfg.modOrder || '001';
+            this.name = cfg.name.replace(/\.bjs/, ''); // BC!
+            this.parent =  cfg.parent;
+            this.permname =  cfg.permname || '';
+            this.title =  cfg.title || cfg.name;;
+            this.items = cfg.items || []; 
+            //???
+            //this.fixItems(_this, false);
+            cb();
+            return true;    
+                
+        },
         
         /**
          * accepts:
diff --git a/JsRender/Gtk.js b/JsRender/Gtk.js
index 9cf029d52..77d478eac 100755
--- a/JsRender/Gtk.js
+++ b/JsRender/Gtk.js
@@ -7,7 +7,7 @@ XObject = imports.XObject.XObject;
 File = imports.File.File;
   
 //----------------------- our roo verison
-Base = imports.Builder.Provider.File.Base.Base;
+Base = imports.JsRender.Base.Base;
 
 var gid = 1;
 
diff --git a/JsRender/Roo.js b/JsRender/Roo.js
index 9619f725d..5102e102f 100644
--- a/JsRender/Roo.js
+++ b/JsRender/Roo.js
@@ -26,7 +26,7 @@ Roo = XObject.define(
         //console.dump(cfg);
         
         if (!cfg.name || !cfg.fullname ) {
-            cfg.name = cfg.path.split('/').pop().replace(/\.bjs$/, '');
+            cfg.name = cfg.path.split('/').pop().replace(/\.bjs$/, '').replace(/\.js$/, '');
             //cfg.fullname = (cfg.parent && cfg.parent.length ? (cfg.parent + '.') : '' ) + cfg.name;
             cfg.fullname = cfg.name;
         }
@@ -70,7 +70,9 @@ Roo = XObject.define(
             'emptyText',
             'qtip',
             'value',
-            'text'
+            'text',
+            'emptyMsg',
+            'displayMsg'
         ],
         modOrder : '001', /// sequence id that this uses.
         region : 'center',
@@ -91,7 +93,7 @@ Roo = XObject.define(
         getType: function() {
             return 'Roo';
         },
-        
+       
       
         loadItems : function(cb)
         {
diff --git a/rconv.js b/rconv.js
index f1129fab4..718844b5c 100644
--- a/rconv.js
+++ b/rconv.js
@@ -49,11 +49,23 @@ print( " diff -w -u /tmp/rconv_orig /tmp/rconv_gen/");
 
 
 
-function createTest(fn) { 
+function createTest(fn) {
+    
+    // does it have a .bjs file..
+    var bjs = fn.replace(/\.js$/, '.bjs');
+    if (!File.exists(bjs)) {
+        return true;
+        
+    } 
+    
+    
     print("converting : " + fn);
     // outputs to two directories..
     if (!File.exists('/tmp/rconv_orig')) {
         File.mkdir('/tmp/rconv_orig');
+    }
+      if (!File.exists('/tmp/rconv_genbjs')) {
+        File.mkdir('/tmp/rconv_genbjs');
     }
     if (!File.exists('/tmp/rconv_gen')) {
         File.mkdir('/tmp/rconv_gen');
@@ -77,9 +89,16 @@ function createTest(fn) {
     
     var rf = new JsParser(toks);
     //print(JSON.stringify(rf.tokens, null,4));Seed.quit();
+    rf.parse();
     
     
-    rf.parse();
+    if (File.exists('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs') )) {
+        File.remove('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs') );
+    }
+    File.write('/tmp/rconv_genbjs/' + GLib.basename(fn).replace(/\.js$/,'.bjs'),
+               JSON.stringify(rf.cfg,null,4));
+
+    
      
     // now try and render it back to javascript.
     var rclass = imports.JsRender[rf.cfg.type][rf.cfg.type];
-- 
2.39.2