Changeset 999

Timestamp:

07/30/08 00:23:11 (1 month ago)

Author:

MaierMan

Message:

* Rework filtermanager to use preferences.jsm
* #822: Preferences Filters doesn't update

Files:

• trunk/components/filterManager.js (modified) (15 diffs)

trunk/components/filterManager.js

@@ -43 +43 @@
-
-const Exception = Components.Exception;
+const BASE = 'extensions.dta.filters.';
-
-const NS_ERROR_NO_INTERFACE = Cr.NS_ERROR_NO_INTERFACE;
@@ -51 +52 @@
-const LINK_FILTER = Ci.dtaIFilter.LINK_FILTER;
-const IMAGE_FILTER = Ci.dtaIFilter.IMAGE_FILTER;
+const TOPIC_FILTERSCHANGED = 'DTA:filterschanged';
+
+const nsITimer = Ci.nsITimer;
+const Timer = Components.Constructor('@mozilla.org/timer;1', 'nsITimer', 'init');
+ 
+let Preferences = {};
-
-// no not create DTA_Filter yourself, managed by DTA_FilterManager
-, prefs
+
-        this._id = name;
-        this._prefs = prefs;
-}
-Filter.prototype = {
@@ -179 +185 @@
-        load: function F_load(localizedLabel) {
-                this._localizedLabel = localizedLabel;
-this.getMultiBytePref
+Preferences.get
-                if (!this._label || !this._label.length) {
-                        throw Components.Exception("Empty filter!");
-                }
-                // localize the label, but only if user didn't change it.
-this._prefs.prefH
+Preferences.h
-                        this._label = localizedLabel;
-                }
-
-this._prefs.getBoolPref
-this._prefs.getIntPref
+               
+Preferences.get
+Preferences.get
-                this._defFilter = this._id.search(/^deffilter/) != -1;
-                
-                // may throw
-this.getMultiBytePref
+Preferences.get
-                
-                this._modified = false;
@@ -200 +206 @@
-        // exported
-        save: function F_save() {
-                if (!this._prefs) {
-                        throw NS_ERROR_INVALID_ARG;
-                }
-                if (!this._modified) {
-                        return;
-                }
-
-
-
-
+
+
+
-                        
-                // save this last as FM will test for it.
-this.setMultiBytePref
+Preferences.set
-
-                this._modified = false;
@@ -218 +220 @@
-
-        _reset: function F_reset() {
-
-
-
-
-
-
-
-
+
-        },
-
@@ -244 +239 @@
-        },
-
-        getMultiBytePref: function F_getMultiBytePref(pref) {
-                var rv = this._prefs.getComplexValue(
-                        pref,
-                        Ci.nsISupportsString
-                );
-                return rv.data;
-        },
-
-        setMultiBytePref: function F_setMultiBytePref(pref, value) {
-                var str = Cc["@mozilla.org/supports-string;1"]
-                        .createInstance(Ci.nsISupportsString);
-                str.data = value;
-                this._prefs.setComplexValue(
-                        pref,
-                        Ci.nsISupportsString,
-                        str
-                );
-        },
-        toString: function() {
-                return this._label + " (" + this._id + ")";
-        },
+
-        toSource: function() {
-                return this.toString() + ": " + this._regs.toSource();
@@ -305 +283 @@
-var FilterManager = {
-        _done: true,
-tru
+fals
-        
-
-
-
-
-
-
+
+
-
-        init: function FM_init() {
-this._prefs = this._prefs.QueryInterface(Ci.nsIPrefBranch2
+Components.utils.import('resource://dta/preferences.jsm', Preferences
-
-                // load those localized labels for default filters.
-                this._localizedLabels = {};
-var
+let
-                        .getService(Ci.nsIStringBundleService)
-                        .createBundle("chrome://dta/locale/filters.properties");
-var
+let
-                while (e.hasMoreElements()) {
-                        var prop = e.getNext().QueryInterface(Ci.nsIPropertyElement);
-                        this._localizedLabels[prop.key] = prop.value;
-                }
+                
+                // init the observer service
+                this._obs = Cc["@mozilla.org/observer-service;1"]
+                        .getService(Ci.nsIObserverService);
-
-                // register (the observer) and initialize our timer, so that we'll get a reload event.
-                this.register();
-
-
-
-
-
+
-                this.init = new Function();
-        },
-
-        _delayedReload: function FM_delayedReload() {
+                if (this._mustReload) {
+                        return;
+                }
-                this._mustReload = true;
-.delay = 100
+ = new Timer(this, 100, nsITimer.TYPE_ONE_SHOT)
-        },
-
@@ -352 +329 @@
-                }
-                this._mustReload = false;
+                
-
-                this._filters = {};
-                this._all = [];
-                this._count = 0;
-
-                // hmmm. since we use uuids for the filters we've to enumerate the whole branch.
-
-
-
-
+
-                        // we test for label (as we get all the other props as well)
-s[i]
+
-                                continue;
-                        }
-                        // cut of the label part to get the actual name
-
-
+
-                        try {
-var filter = new Filter(name, this._prefs
+let filter = new Filter(name
-                                // overwrite with localized labels.
-
-
-
+
+
+
+
-                                }
-                                filter.load(localizedLabel);
-                                this._filters[filter.id] = filter;
-                                this._all.push(filter);
-                                this._count++;
-                        }
-                        catch (ex) {
-
-
-
+
+
+
+
+
+
-                this._all.sort(
-                        function(a,b) {
@@ -406 +382 @@
-
-                // notify all observers
-
-
-
+
+
+
+
+
+
-        },
-
@@ -439 +418 @@
-                // we will use unique ids for user-supplied filters.
-                // no need to keep track of the actual number of filters or an index.
-var
+let
-                        .getService(Ci.nsIUUIDGenerator)
-                        .generateUUID();
-
-                //
-var filter = new Filter(uuid.toString(), this._prefs
+let filter = new Filter(BASE + uuid.toString()
-                // I'm a friend, hence I'm allowed to access private members :p
-                filter._label = label;
@@ -474 +453 @@
-                        }
-                        catch (ex) {
-
+'Failed to save filters', 
-                        }
-                }
@@ -493 +472 @@
-        // nsIObserver
-        observe: function FM_observe(subject, topic, prefName) {
-
+
+
+
+
+
+
-        },
-
@@ -500 +484 @@
-                try {
-                        // Put self as observer to desired branch
-this._prefs.addObserver("", this, true
+Preferences.addObserver(BASE, this
-                }
-                catch (ex) {
@@ -507 +491 @@
-                }
-                return true;
-        },
-
-        // nsITimerCallback
-        notify: function FM_notify() {
-                //error("DTAFM: notify");
-                this.reload();
-        }
-};
@@ -520 +498 @@
-        "@downthemall.net/filtermanager;2",
-        "DownThemAll! Filtermanager",
-TimerCallback, Ci.nsI
+
-);
-