Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 821510 - Settings: remove debug statements. r=sicking

Browse Source
This commit is contained in:
Gregor Wagner 2012-12-14 10:20:16 -08:00
parent 990badbcb2
commit aeef591b0c
3 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dom/settings/SettingsChangeNotifier.jsm
View File

@ -4,8 +4,9 @@
"use strict"
const DEBUG = false;
function debug(s) {
// dump("-*- SettingsChangeNotifier: " + s + "\n");
if (DEBUG) dump("-*- SettingsChangeNotifier: " + s + "\n");
}
const Cu = Components.utils;
@ -27,7 +28,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
this.SettingsChangeNotifier = {
init: function() {
debug("init");
if (DEBUG) debug("init");
this.children = [];
this._messages = ["Settings:Changed", "Settings:RegisterForMessages", "child-process-shutdown"];
this._messages.forEach((function(msgName) {
@ -39,7 +40,7 @@ this.SettingsChangeNotifier = {
},
observe: function(aSubject, aTopic, aData) {
debug("observe");
if (DEBUG) debug("observe");
switch (aTopic) {
case kXpcomShutdownObserverTopic:
this._messages.forEach((function(msgName) {
@ -62,20 +63,20 @@ this.SettingsChangeNotifier = {
break;
}
default:
debug("Wrong observer topic: " + aTopic);
if (DEBUG) debug("Wrong observer topic: " + aTopic);
break;
}
},
broadcastMessage: function broadcastMessage(aMsgName, aContent) {
debug("Broadast");
if (DEBUG) debug("Broadast");
this.children.forEach(function(msgMgr) {
msgMgr.sendAsyncMessage(aMsgName, aContent);
});
},
receiveMessage: function(aMessage) {
debug("receiveMessage");
if (DEBUG) debug("receiveMessage");
let msg = aMessage.data;
let mm = aMessage.target;
switch (aMessage.name) {
@ -100,21 +101,21 @@ this.SettingsChangeNotifier = {
" from a content process with no 'settings-read' privileges.");
return null;
}
debug("Register!");
if (DEBUG) debug("Register!");
if (this.children.indexOf(mm) == -1) {
this.children.push(mm);
}
break;
case "child-process-shutdown":
debug("Unregister");
if (DEBUG) debug("Unregister");
let index;
if ((index = this.children.indexOf(mm)) != -1) {
debug("Unregister index: " + index);
if (DEBUG) debug("Unregister index: " + index);
this.children.splice(index, 1);
}
break;
default:
debug("Wrong message: " + aMessage.name);
if (DEBUG) debug("Wrong message: " + aMessage.name);
}
}
}

9
dom/settings/SettingsDB.jsm
View File

@ -8,8 +8,9 @@ let Cu = Components.utils;
this.EXPORTED_SYMBOLS = ["SettingsDB", "SETTINGSDB_NAME", "SETTINGSSTORE_NAME"];
const DEBUG = false;
function debug(s) {
//dump("-*- SettingsDB: " + s + "\n");
if (DEBUG) dump("-*- SettingsDB: " + s + "\n");
}
this.SETTINGSDB_NAME = "settings";
@ -30,7 +31,7 @@ SettingsDB.prototype = {
let objectStore = aDb.createObjectStore(SETTINGSSTORE_NAME,
{ keyPath: "settingName" });
objectStore.createIndex("settingValue", "settingValue", { unique: false });
debug("Created object stores and indexes");
if (DEBUG) debug("Created object stores and indexes");
if (aOldVersion != 0) {
return;
@ -62,12 +63,12 @@ SettingsDB.prototype = {
try {
settings = JSON.parse(rawstr);
} catch(e) {
debug("Error parsing " + settingsFile.path + " : " + e);
if (DEBUG) debug("Error parsing " + settingsFile.path + " : " + e);
return;
}
for (let setting in settings) {
debug("Adding setting " + setting);
if (DEBUG) debug("Adding setting " + setting);
objectStore.put({ settingName: setting,
settingValue: settings[setting] });
}

47
dom/settings/SettingsManager.js
View File

@ -4,8 +4,9 @@
"use strict";
const DEBUG = false;
function debug(s) {
// dump("-*- SettingsManager: " + s + "\n");
if (DEBUG) dump("-*- SettingsManager: " + s + "\n");
}
const Cc = Components.classes;
@ -43,7 +44,7 @@ SettingsLock.prototype = {
while (!lock._requests.isEmpty()) {
let info = lock._requests.dequeue();
debug("info: " + info.intent);
if (DEBUG) debug("info: " + info.intent);
let request = info.request;
switch (info.intent) {
case "clear":
@ -58,12 +59,12 @@ SettingsLock.prototype = {
for (let i = 0; i < keys.length; i++) {
let key = keys[i];
let last = i === keys.length - 1;
debug("key: " + key + ", val: " + JSON.stringify(info.settings[key]) + ", type: " + typeof(info.settings[key]));
if (DEBUG) debug("key: " + key + ", val: " + JSON.stringify(info.settings[key]) + ", type: " + typeof(info.settings[key]));
let checkKeyRequest = store.get(key);
checkKeyRequest.onsuccess = function (event) {
if (!event.target.result) {
debug("MOZSETTINGS-SET-WARNING: " + key + " is not in the database. Please add it to build/settings.js\n");
if (DEBUG) debug("MOZSETTINGS-SET-WARNING: " + key + " is not in the database. Please add it to build/settings.js\n");
}
}
@ -96,12 +97,12 @@ SettingsLock.prototype = {
: store.mozGetAll(info.name);
req.onsuccess = function(event) {
debug("Request for '" + info.name + "' successful. " +
if (DEBUG) debug("Request for '" + info.name + "' successful. " +
"Record count: " + event.target.result.length);
debug("result: " + JSON.stringify(event.target.result));
if (DEBUG) debug("result: " + JSON.stringify(event.target.result));
if (event.target.result.length == 0) {
debug("MOZSETTINGS-GET-WARNING: " + info.name + " is not in the database. Please add it to build/settings.js\n");
if (DEBUG) debug("MOZSETTINGS-GET-WARNING: " + info.name + " is not in the database. Please add it to build/settings.js\n");
}
let results = {
@ -166,7 +167,7 @@ SettingsLock.prototype = {
this.createTransactionAndProcess();
return req;
} else {
debug("get not allowed");
if (DEBUG) debug("get not allowed");
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
}
},
@ -179,12 +180,12 @@ SettingsLock.prototype = {
if (this._settingsManager.hasWritePrivileges) {
let req = Services.DOMRequest.createRequest(this._settingsManager._window);
debug("send: " + JSON.stringify(aSettings));
if (DEBUG) debug("send: " + JSON.stringify(aSettings));
this._requests.enqueue({request: req, intent: "set", settings: aSettings});
this.createTransactionAndProcess();
return req;
} else {
debug("set not allowed");
if (DEBUG) debug("set not allowed");
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
}
},
@ -201,7 +202,7 @@ SettingsLock.prototype = {
this.createTransactionAndProcess();
return req;
} else {
debug("clear not allowed");
if (DEBUG) debug("clear not allowed");
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
}
},
@ -260,7 +261,7 @@ SettingsManager.prototype = {
},
createLock: function() {
debug("get lock!");
if (DEBUG) debug("get lock!");
var lock = new SettingsLock(this);
this._locks.enqueue(lock);
this._settingsDB.ensureDB(
@ -272,14 +273,14 @@ SettingsManager.prototype = {
},
receiveMessage: function(aMessage) {
debug("Settings::receiveMessage: " + aMessage.name);
if (DEBUG) debug("Settings::receiveMessage: " + aMessage.name);
let msg = aMessage.json;
switch (aMessage.name) {
case "Settings:Change:Return:OK":
debug("Settings:Change:Return:OK");
if (DEBUG) debug("Settings:Change:Return:OK");
if (this._onsettingchange || this._callbacks) {
debug('data:' + msg.key + ':' + msg.value + '\n');
if (DEBUG) debug('data:' + msg.key + ':' + msg.value + '\n');
if (this._onsettingchange) {
let event = new this._window.MozSettingsEvent("settingchanged", {
@ -289,23 +290,23 @@ SettingsManager.prototype = {
this._onsettingchange.handleEvent(event);
}
if (this._callbacks && this._callbacks[msg.key]) {
debug("observe callback called! " + msg.key + " " + this._callbacks[msg.key].length);
if (DEBUG) debug("observe callback called! " + msg.key + " " + this._callbacks[msg.key].length);
this._callbacks[msg.key].forEach(function(cb) {
cb({settingName: msg.key, settingValue: msg.value,
__exposedProps__: {settingName: 'r', settingValue: 'r'}});
});
}
} else {
debug("no observers stored!");
if (DEBUG) debug("no observers stored!");
}
break;
default:
debug("Wrong message: " + aMessage.name);
if (DEBUG) debug("Wrong message: " + aMessage.name);
}
},
addObserver: function addObserver(aName, aCallback) {
debug("addObserver " + aName);
if (DEBUG) debug("addObserver " + aName);
if (!this._callbacks) {
cpmm.sendAsyncMessage("Settings:RegisterForMessages");
this._callbacks = {};
@ -318,16 +319,16 @@ SettingsManager.prototype = {
},
removeObserver: function removeObserver(aName, aCallback) {
debug("deleteObserver " + aName);
if (DEBUG) debug("deleteObserver " + aName);
if (this._callbacks && this._callbacks[aName]) {
let index = this._callbacks[aName].indexOf(aCallback)
if (index != -1) {
this._callbacks[aName].splice(index, 1)
} else {
debug("Callback not found for: " + aName);
if (DEBUG) debug("Callback not found for: " + aName);
}
} else {
debug("No observers stored for " + aName);
if (DEBUG) debug("No observers stored for " + aName);
}
},
@ -354,7 +355,7 @@ SettingsManager.prototype = {
},
observe: function(aSubject, aTopic, aData) {
debug("Topic: " + aTopic);
if (DEBUG) debug("Topic: " + aTopic);
if (aTopic == "inner-window-destroyed") {
let wId = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
if (wId == this.innerWindowID) {