Changeset 866

Timestamp:

2008-03-09 01:22:05 (10 months ago)

Author:

MaierMan

Message:

Simplify Service/Component code

Files:

• trunk/chrome/content/common/module.js (added)
• trunk/components/debugService.js (modified) (6 diffs)
• trunk/components/filterManager.js (modified) (13 diffs)
• trunk/components/migrationService.js (modified) (10 diffs)

trunk/components/debugService.js

@@ -41 +41 @@
-const FileStream = new Components.Constructor('@mozilla.org/network/file-output-stream;1', 'nsIFileOutputStream', 'init');
-const ScriptError = new Components.Constructor('@mozilla.org/scripterror;1', 'nsIScriptError', 'init');
-
+
+
+
+
+
+
+
+
-var DebugService = {
-        // nsIClassInfo
-        classID: Components.ID("{0B82FEBB-59A1-41d7-B31D-D5A686E11A69}"),
-        contractID: "@downthemall.net/debug-service;1",
-        classDescription: "DownThemAll! Debug Service",
-        implementationLanguage: 0x02,
-        flags: (1 << 0) | (1 << 2), // SINGLETON | MAIN_THREAD_ONLY
-        classIDNoAlloc: this.classID,
-        getHelperForLanguage: function() {
-                return null;
-        },
-        getInterfaces: function(count) {
-                // XXX
-                count.value = 0;
-                return null;
-        },
-
-        implementsIID: function DS_implementID(iid) {
-                        return [
-                                Ci.nsISupports,
-                                Ci.nsISupportsWeakReference,
-                                Ci.nsIWeakReference,
-                                Ci.nsIObserver,
-                                Ci.nsIClassInfo,
-                                Ci.nsIFactory,
-                                Ci.dtaIDebugService
-                        ].some(function(e) { return iid.equals(e); });
-        },
-        // nsiSupports
-        QueryInterface: function DS_QI(iid) {
-                if (this.implementsIID(iid)) {
-                        return this;
-                }
-                throw res.NS_ERROR_NO_INTERFACE;
-        },
-
-        // nsiWeakReference
-        QueryReferent: function DS_QR(iid) {
-                return this;
-        },
-
-        // nsiSupportsWeakReference
-        GetWeakReference: function DS_GWR() {
-                return this;
-        },
-
-        // nsIFactory
-        createInstance: function (outer, iid) {
-                if (outer != null) {
-                        throw res.NS_ERROR_NO_AGGREGATION;
-                }
-                if (this.implementsIID(iid)) {
-                        this._init();           
-                        return this;
-                }
-                throw res.NS_ERROR_INVALID_ARG;
-        },
-
-        // nsIObserver
-        observe: function DS_observe(subject, topic, prefName) {
@@ -105 +55 @@
-        },
-        
-_init: function DS_
+init: function DS
-                this._cs = Cc['@mozilla.org/consoleservice;1'].getService(Ci.nsIConsoleService);
-                this._pb = Cc['@mozilla.org/preferences-service;1'].getService(Ci.nsIPrefBranch2);
@@ -122 +72 @@
-                        // No-Op
-                }
-this._init = new Function()
+delete this.init
-        },
-        get file() {
@@ -142 +92 @@
-                return String(value).replace(/\b(\d)\b/g, "0$1");
-        },
-dump
+log
-                try {
-                        if (msg == "" && typeof(e) != "object") {
@@ -187 +137 @@
-                        }
-                        
-_
+
-                        f.write(text, text.length);
-                        f.close();
@@ -209 +159 @@
-                        throw res.NS_ERROR_FAILURE;
-                }
-        },
-
-        _firstTime: true,
-        registerSelf: function DS_registerSelf(compMgr, fileSpec, location, type) {
-                try {
-                        error("registering");
-                        
-                        if (!this._firstTime) {
-                                return;
-                        }
-                        this._firstTime = false;
-        
-                        compMgr.QueryInterface(Ci.nsIComponentRegistrar)
-                                .registerFactoryLocation(
-                                        this.classID,
-                                        this.classDescription,
-                                        this.contractID,
-                                        fileSpec,
-                                        location,
-                                        type
-                                );
-                }
-                catch (ex) {
-                        error(ex);
-                }
-        },
-        unregisterSelf: function DS_unregisterSelf(compMgr, fileSpec, location) {
-                compMgr.QueryInterface(Ci.nsIComponentRegistrar)
-                        .unregisterFactoryLocation(
-                                this.classID,
-                                fileSpec
-                        );
-        },
-        getClassObject: function DS_getClassObject(compMgr, cid, iid) {
-                if (cid.equals(this.classID)) {
-                        return this;
-                }
-                throw Components.results.NS_ERROR_NO_INTERFACE;
-        },
-        canUnload: function DS_canUnload(compMgr) {
-                return true;
-        }
-};
+implementComponent(
+        DebugService,
+        Components.ID("{0B82FEBB-59A1-41d7-B31D-D5A686E11A69}"),
+        "@downthemall.net/debug-service;1",
+        "DownThemAll! Debug Service",
+        [Ci.nsIObserver, Ci.dtaIDebugService]
+);
-
-// entrypoint
-function NSGetModule(compMgr, fileSpec) {
-DebugService
+new ServiceModule(DebugService, false)
-}

trunk/components/filterManager.js

@@ -35 +35 @@
- * ***** END LICENSE BLOCK ***** */
-
-
-
+
+
+
+
-const Exception = Components.Exception;
-
@@ -44 +46 @@
-const NS_ERROR_INVALID_ARG = Components.results.NS_ERROR_INVALID_ARG;
-
-I
-I
+i
+i
-
-function include(uri) {
-C
-I
+c
+i
-                .loadSubScript(uri);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-// no not create DTA_Filter yourself, managed by DTA_FilterManager
@@ -78 +62 @@
-}
-Filter.prototype = {
-
-        LINK_FILTER: (1 << 0),
-        IMAGE_FILTER: (1 << 1),
-
-        _modified: false,
-        _regs: [],
-
-        // nsIClassInfo
-        classID: Components.ID("{1CF86DC0-33A7-43b3-BDDE-7ADC3B35D114}"),
-        contractID: "@downthemall.net/filter;2",
-        classDescription: "DownThemAll! Filter",
-        implementationLanguage: 0x02,
-        flags: (1 << 2), // MAIN_THREAD_ONLY
-        classIDNoAlloc: this.classID,
-        getHelperForLanguage: function() {
-                return null;
-        },
-        getInterfaces: function(count) {
-                // XXX
-                count.value = 0;
-                return null;
-        },
-
-        QueryInterface: function F_QI(iid) {
-                if (
-                        iid.equals(CI.nsISupports)
-                        || iid.equals(CI.nsIClassInfo)
-                        || iid.equals(CI.dtaIFilter)
-                ) {
-                        return this;
-                }
-                throw NS_ERROR_NO_INTERFACE;
-        },
-
-        // exported
-        get id() {
@@ -304 +254 @@
-                var rv = this._prefs.getComplexValue(
-                        pref,
-I
+i
-                );
-                return rv.data;
@@ -310 +260 @@
-
-        setMultiBytePref: function F_setMultiBytePref(pref, value) {
-C
-I
+c
+i
-                str.data = value;
-                this._prefs.setComplexValue(
-                        pref,
-I
+i
-                        str
-                );
@@ -326 +276 @@
-        }
-};
+implementComponent(
+        Filter.prototype,
+        Components.ID("{1CF86DC0-33A7-43b3-BDDE-7ADC3B35D114}"),
+        "@downthemall.net/filter;2",
+        "DownThemAll! Filter",
+        [Ci.dtaIFilter]
+);
-
-function FilterEnumerator(filters) {
@@ -334 +291 @@
-        QueryInterface: function FE_QI(iid) {
-                if (
-omponents.intefaces
-omponents.intefaces
+i
+i
-                ) {
-                        return this;
@@ -354 +311 @@
-// XXX: reload() should be called delayed when we observe changes (as many changes might come in)
-var FilterManager = {
-
-        // nsIClassInfo
-        classID: Components.ID("{435FC5E5-D4F0-47a1-BDC1-F325B78188F3}"),
-        contractID: "@downthemall.net/filtermanager;2",
-        classDescription: "DownThemAll! Filtermanager",
-        implementationLanguage: 0x02,
-        flags: (1 << 0) | (1 << 2), // SINGLETON | MAIN_THREAD_ONLY
-        classIDNoAlloc: this.classID,
-        getHelperForLanguage: function() {
-                return null;
-        },
-        getInterfaces: function(count) {
-                // XXX
-                count.value = 0;
-                return null;
-        },
-
-        implementsIID: function FM_implementID(iid) {
-                return [
-                        CI.nsISupports,
-                        CI.nsISupportsWeakReference,
-                        CI.nsIWeakReference,
-                        CI.nsIObserver,
-                        CI.nsIClassInfo,
-                        CI.nsITimerCallback,
-                        this.classID
-                ].some(function(e) { return iid.equals(e); });
-        },
-
-        _done: true,
-        _mustReload: true,
-
-
+
+
+
-                .getBranch("extensions.dta.filters."),
-
-
+
+
+
-
-        _init: function FM_init() {
-I
+i
-
-                // load those localized labels for default filters.
-                this._localizedLabels = {};
-C
-I
+c
+i
-                        .createBundle("chrome://dta/locale/filters.properties");
-                var e = b.getSimpleEnumeration();
-                while (e.hasMoreElements()) {
-I
+i
-                        this._localizedLabels[prop.key] = prop.value;
-                }
@@ -482 +412 @@
-
-                // notify all observers
-C
-I
+c
+i
-                observerService.notifyObservers(this, 'DTA:filterschanged', null);
-        },
@@ -504 +434 @@
-                        return this._filters[id];
-                }
-Components.
+
-        },
-
@@ -515 +445 @@
-                // we will use unique ids for user-supplied filters.
-                // no need to keep track of the actual number of filters or an index.
-C
-I
+c
+i
-                        .generateUUID();
-
@@ -570 +500 @@
-        },
-
-                // nsiSupports
-        QueryInterface: function FM_QI(iid) {
-                if (this.implementsIID(iid)) {
-                        return this;
-                }
-                throw NS_ERROR_NO_INTERFACE;
-        },
-
-        // nsiWeakReference
-        QueryReferent: function FM_QR(iid) {
-                return this;
-        },
-
-        // nsiSupportsWeakReference
-        GetWeakReference: function FM_GWR() {
-                return this;
-        },
-
-        // nsIObserver
-        observe: function FM_observe(subject, topic, prefName) {
@@ -611 +523 @@
-                this.reload();
-        }
-
-};
+implementComponent(
+        FilterManager,
+        Components.ID("{435FC5E5-D4F0-47a1-BDC1-F325B78188F3}"),
+        "@downthemall.net/filtermanager;2",
+        "DownThemAll! Filtermanager",
+        [Ci.nsITimerCallback, Ci.nsIObserver, Ci.dtaIFilterManager]
+);
-FilterManager._init();
-
-var Module = {
-        _firstTime: true,
-
-        registerSelf: function M_registerSelf(compMgr, fileSpec, location, type) {
-                if (!this._firstTime) {
-                        return;
-                }
-                this._firstTime = false;
-
-                compMgr.QueryInterface(CI.nsIComponentRegistrar)
-                        .registerFactoryLocation(
-                                FilterManager.classID,
-                                FilterManager.classDescription,
-                                FilterManager.contractID,
-                                fileSpec,
-                                location,
-                                type
-                        );
-                CC['@mozilla.org/categorymanager;1']
-                        .getService(CI.nsICategoryManager)
-                        .addCategoryEntry('app-startup', FilterManager.contractID, FilterManager.contractID, true, true, null);
-        },
-        unregisterSelf: function(compMgr, fileSpec, location) {
-                compMgr.QueryInterface(CI.nsIComponentRegistrar)
-                        .unregisterFactoryLocation(
-                                FileManager.classID,
-                                fileSpec
-                        );
-                CC['@mozilla.org/categorymanager;1']
-                        .getService(CI.nsICategoryManager)
-                        .deleteCategoryEntry('app-startup', FileManager.contractID, true);
-        },
-        getClassObject: function (compMgr, cid, iid) {
-                if (cid.equals(FilterManager.classID)) {
-                        return this;
-                }
-                throw NS_ERROR_NO_INTERFACE;
-        },
-        canUnload: function(compMgr) {
-                return true;
-        },
-
-        // nsIFactory
-        QueryInterface : function(aIID) {
-                if (aIID.equals(CI.nsIFactory)) {
-                        return this;
-                }
-
-                return NS_ERROR_NO_INTERFACE;
-        },
-        createInstance: function (outer, iid) {
-                if (outer != null) {
-                        throw NS_ERROR_NO_AGGREGATION;
-                }
-                if (FilterManager.implementsIID(iid)) {
-                        return FilterManager;
-                }
-                throw NS_ERROR_INVALID_ARG;
-        }
-}
-
-// entrypoint
-function NSGetModule(compMgr, fileSpec) {
-Module
+new ServiceModule(FilterManager, true)
-}

trunk/components/migrationService.js

@@ -35 +35 @@
- * ***** END LICENSE BLOCK ***** */
-
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
-function include(uri) {
-C
-I
+c
+i
-                .loadSubScript(uri);
-}
-
-
-
-
+
+
-
-var MigrationService = {
-
-        // nsIClassInfo
-        classID: Components.ID("{F66539C8-2590-4e69-B189-F9F8595A7670}"),
-        contractID: "@downthemall.net/migration-service;1",
-        classDescription: "DownThemAll! Migration Service",
-        implementationLanguage: 0x02,
-        flags: (1 << 0) | (1 << 2), // SINGLETON | MAIN_THREAD_ONLY
-        classIDNoAlloc: this.classID,
-        getHelperForLanguage: function() {
-                return null;
-        },
-        getInterfaces: function(count) {
-                // XXX
-                count.value = 0;
-                return null;
-        },
-
-        implementsIID: function FM_implementID(iid) {
-                        return [
-                                CI.nsISupports,
-                                CI.nsISupportsWeakReference,
-                                CI.nsIWeakReference,
-                                CI.nsIObserver,
-                                CI.nsIClassInfo
-                        ].some(function(e) { return iid.equals(e); });
-        },
-
-        _init: function MM_init() {
-    // observer registration
-C
-I
+c
+i
-                        .addObserver(this, "final-ui-startup", true);
-        },
@@ -85 +60 @@
-                
-                try {
-DTA_debug.logStrin
+debu
-                        var vc = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
-                                .getService(Components.interfaces.nsIVersionComparator);
@@ -93 +68 @@
-                                return;
-                        }
-DTA_
+
-                        if (vc.compare(lastVersion, "1.0a1") < 0) {
-                                this._execute(['Prefs', 'DropDowns', 'Filters', 'Remove']);
@@ -112 +87 @@
-                }
-                catch(ex) {
-DTA_debug.lo
+debu
-                        try {
-                                DTA_preferences.resetDTA("version");
@@ -137 +112 @@
-        // pre-1.0: convert prefs
-        _migratePrefs: function MM_migratePrefs() {
-DTA_debug.logStrin
+debu
-                const toMigrate = [
-                        ['context.infophrases', 'infophrases', true],
@@ -183 +158 @@
-        // pre 1.0: migrate Filters
-        _migrateFilters: function MM_migrateFilters() {
-DTA_debug.lo
+debu
-                const defFilters = [
-                        "/\./", "/\\./", '/(\\.*)/',
@@ -193 +168 @@
-                        "/\\/[^\\/\\?]+\\.png$/"
-                ];
-I
-I
-C
+i
+i
+c
-                        .getService(Components.interfaces.nsIPrefService)
-                        .getBranch("extensions.dta.context.")
@@ -230 +205 @@
-        // pre 1.0: dropdown history
-        _migrateDropDowns: function MM_migrateDropdowns() {
-DTA_debug.logStrin
+debu
-                ['renaming', 'filter', 'directory'].forEach(
-                        function(e) {
@@ -255 +230 @@
-        },
-        
-                // nsiSupports
-        QueryInterface: function MM_QI(iid) {
-                if (this.implementsIID(iid)) {
-                        return this;
-                }
-                throw Components.results.NS_ERROR_NO_INTERFACE;
-        },
-
-        // nsiWeakReference
-        QueryReferent: function MM_QR(iid) {
-                return this;
-        },
-
-        // nsiSupportsWeakReference
-        GetWeakReference: function MM_GWR() {
-                return this;
-        },
-
-        // nsIObserver
-        observe: function MM_observe(subject, topic, prefName) {
@@ -280 +237 @@
-        }
-};
+implementComponent(
+        MigrationService,
+        Components.ID("{F66539C8-2590-4e69-B189-F9F8595A7670}"),
+        "@downthemall.net/migration-service;1",
+        "DownThemAll! Migration Service",
+        [Ci.nsIObserver]
+);
-MigrationService._init();
-
-var Module = {
-        _firstTime: true,
-
-        registerSelf: function M_registerSelf(compMgr, fileSpec, location, type) {
-                if (!this._firstTime) {
-                        return;
-                }
-                this._firstTime = false;
-
-                compMgr.QueryInterface(CI.nsIComponentRegistrar)
-                        .registerFactoryLocation(
-                                MigrationService.classID,
-                                MigrationService.classDescription,
-                                MigrationService.contractID,
-                                fileSpec,
-                                location,
-                                type
-                        );
-                CC['@mozilla.org/categorymanager;1']
-                        .getService(CI.nsICategoryManager)
-                        .addCategoryEntry('app-startup', MigrationService.contractID, MigrationService.contractID, true, true, null);
-        },
-        unregisterSelf: function(compMgr, fileSpec, location) {
-                compMgr.QueryInterface(CI.nsIComponentRegistrar)
-                        .unregisterFactoryLocation(
-                                MigrationService.classID,
-                                fileSpec
-                        );
-                CC['@mozilla.org/categorymanager;1']
-                        .getService(CI.nsICategoryManager)
-                        .deleteCategoryEntry('app-startup', MigrationService.contractID, true);
-        },
-        getClassObject: function (compMgr, cid, iid) {
-                if (cid.equals(MigrationService.classID)) {
-                        return this;
-                }
-                throw Components.results.NS_ERROR_NO_INTERFACE;
-        },
-        canUnload: function(compMgr) {
-                return true;
-        },
-
-        // nsIFactory
-        QueryInterface : function(aIID) {
-                if (aIID.equals(CI.nsIFactory)) {
-                        return this;
-                }
-
-                return Components.results.NS_ERROR_NO_INTERFACE;
-        },
-        createInstance: function (outer, iid) {
-                if (outer != null) {
-                        throw Components.results.NS_ERROR_NO_AGGREGATION;
-                }
-                if (MigrationService.implementsIID(iid)) {
-                        return MigrationService;
-                }
-                throw Components.results.NS_ERROR_INVALID_ARG;
-        }
-}
-
-// entrypoint
-function NSGetModule(compMgr, fileSpec) {
-Module
+new ServiceModule(MigrationService, true)
-}