[Pkg-mozext-commits] [requestpolicy] 107/280: also write "lib/" when importing modules

David Prévot taffit at moszumanska.debian.org
Sat May 2 20:30:07 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 4d52cc4d847b5cc61d335ae4099aeacee7a38b03
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 6 00:38:29 2015 +0100

    also write "lib/" when importing modules
    
    this is a preparation step for moving several modules into
    other directories
---
 src/content/lib/about-uri.jsm                   |  2 +-
 src/content/lib/content-policy.jsm              | 12 +++++------
 src/content/lib/environment.jsm                 |  2 +-
 src/content/lib/gui-location.jsm                |  2 +-
 src/content/lib/http-response.jsm               |  6 +++---
 src/content/lib/logger.jsm                      |  4 ++--
 src/content/lib/observer-manager.jsm            |  4 ++--
 src/content/lib/policy-manager.jsm              | 10 ++++-----
 src/content/lib/process-environment.jsm         |  8 ++++----
 src/content/lib/request-processor.jsm           | 20 +++++++++---------
 src/content/lib/request-processor.redirects.js  | 20 +++++++++---------
 src/content/lib/request-set.jsm                 |  6 +++---
 src/content/lib/request.jsm                     |  6 +++---
 src/content/lib/requestpolicy-service.jsm       | 20 +++++++++---------
 src/content/lib/ruleset-storage.jsm             |  4 ++--
 src/content/lib/ruleset.jsm                     |  6 +++---
 src/content/lib/script-loader.jsm               |  2 +-
 src/content/lib/subscription.jsm                |  8 ++++----
 src/content/lib/utils.jsm                       |  6 +++---
 src/content/lib/utils/domains.jsm               |  2 +-
 src/content/lib/utils/xul.jsm                   |  2 +-
 src/content/lib/window-manager-toolbarbutton.js |  2 +-
 src/content/lib/window-manager.jsm              |  8 ++++----
 src/content/settings/common.js                  | 18 ++++++++---------
 src/content/ui/classicmenu.js                   |  4 ++--
 src/content/ui/frame.dom-content-loaded.js      |  4 ++--
 src/content/ui/frame.js                         |  4 ++--
 src/content/ui/menu.js                          | 27 ++++++++++---------------
 src/content/ui/overlay.js                       | 18 ++++++++---------
 src/content/ui/request-log.filtering.js         |  2 +-
 src/content/ui/request-log.interface.js         |  6 +++---
 src/content/ui/request-log.js                   |  4 ++--
 src/content/ui/request-log.tree-view.js         |  2 +-
 33 files changed, 123 insertions(+), 128 deletions(-)

diff --git a/src/content/lib/about-uri.jsm b/src/content/lib/about-uri.jsm
index 2fae90b..5a5e459 100644
--- a/src/content/lib/about-uri.jsm
+++ b/src/content/lib/about-uri.jsm
@@ -32,7 +32,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
 let EXPORTED_SYMBOLS = ["AboutRequestPolicy"];
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-ScriptLoader.importModule("process-environment", this);
+ScriptLoader.importModule("lib/process-environment", this);
 
 var filenames = {
   "basicprefs": "basicprefs.html",
diff --git a/src/content/lib/content-policy.jsm b/src/content/lib/content-policy.jsm
index dfb7746..03fc62a 100644
--- a/src/content/lib/content-policy.jsm
+++ b/src/content/lib/content-policy.jsm
@@ -34,12 +34,12 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "constants", // e.g. CP_OK
-  "logger",
-  "request",
-  "utils",
-  "request-processor",
-  "process-environment"
+  "lib/constants", // e.g. CP_OK
+  "lib/logger",
+  "lib/request",
+  "lib/utils",
+  "lib/request-processor",
+  "lib/process-environment"
 ], globalScope);
 
 
diff --git a/src/content/lib/environment.jsm b/src/content/lib/environment.jsm
index e4c266f..530f552 100644
--- a/src/content/lib/environment.jsm
+++ b/src/content/lib/environment.jsm
@@ -34,7 +34,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(globalScope, "ScriptLoader",
     "chrome://requestpolicy/content/lib/script-loader.jsm");
 XPCOMUtils.defineLazyGetter(globalScope, "ObserverManager", function() {
-  return ScriptLoader.importModule("observer-manager").ObserverManager;
+  return ScriptLoader.importModule("lib/observer-manager").ObserverManager;
 });
 
 
diff --git a/src/content/lib/gui-location.jsm b/src/content/lib/gui-location.jsm
index 1c9eb24..fd57be4 100644
--- a/src/content/lib/gui-location.jsm
+++ b/src/content/lib/gui-location.jsm
@@ -33,7 +33,7 @@ let EXPORTED_SYMBOLS = [
 ];
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-ScriptLoader.importModules(["constants"], this);
+ScriptLoader.importModules(["lib/constants"], this);
 
 
 function GUILocation(value, properties) {
diff --git a/src/content/lib/http-response.jsm b/src/content/lib/http-response.jsm
index e9ca6f7..decb3f5 100644
--- a/src/content/lib/http-response.jsm
+++ b/src/content/lib/http-response.jsm
@@ -34,9 +34,9 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "utils/domains",
-  "utils"
+  "lib/logger",
+  "lib/utils/domains",
+  "lib/utils"
 ], this);
 
 
diff --git a/src/content/lib/logger.jsm b/src/content/lib/logger.jsm
index d339430..59b865a 100644
--- a/src/content/lib/logger.jsm
+++ b/src/content/lib/logger.jsm
@@ -31,8 +31,8 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "process-environment",
-  "prefs"
+  "lib/process-environment",
+  "lib/prefs"
 ], this);
 
 
diff --git a/src/content/lib/observer-manager.jsm b/src/content/lib/observer-manager.jsm
index efbe16c..51a08f8 100644
--- a/src/content/lib/observer-manager.jsm
+++ b/src/content/lib/observer-manager.jsm
@@ -30,13 +30,13 @@ let EXPORTED_SYMBOLS = ["ObserverManager"];
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 
-let {ProcessEnvironment} = ScriptLoader.importModule("process-environment");
+let {ProcessEnvironment} = ScriptLoader.importModule("lib/process-environment");
 
 // Load the Logger at startup-time, not at load-time!
 // ( On load-time Logger might be null. )
 let Logger;
 ProcessEnvironment.enqueueStartupFunction(function() {
-  Logger = ScriptLoader.importModule("logger").Logger;
+  Logger = ScriptLoader.importModule("lib/logger").Logger;
 });
 
 
diff --git a/src/content/lib/policy-manager.jsm b/src/content/lib/policy-manager.jsm
index d93efe7..b93fbf9 100644
--- a/src/content/lib/policy-manager.jsm
+++ b/src/content/lib/policy-manager.jsm
@@ -33,11 +33,11 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "request-result",
-  "ruleset",
-  "ruleset-storage",
-  "constants"
+  "lib/logger",
+  "lib/request-result",
+  "lib/ruleset",
+  "lib/ruleset-storage",
+  "lib/constants"
 ], this);
 
 
diff --git a/src/content/lib/process-environment.jsm b/src/content/lib/process-environment.jsm
index f4488eb..6f09b7e 100644
--- a/src/content/lib/process-environment.jsm
+++ b/src/content/lib/process-environment.jsm
@@ -61,7 +61,7 @@ Cu.import(scriptLoaderURI, globalScope);
 // =======================================
 // Step 2: load the Environment class
 // ----------------------------------
-ScriptLoader.importModule("environment", globalScope);
+ScriptLoader.importModule("lib/environment", globalScope);
 // =======================================
 
 
@@ -120,9 +120,9 @@ if (ProcessEnvironment.isMainProcess) {
 
       // import the Logger as the first module so that its startup-function
       // will be called after this one
-      ScriptLoader.importModule("logger", globalScope);
-      ScriptLoader.importModules(["requestpolicy-service", "window-manager",
-                                  "about-uri"], globalScope);
+      ScriptLoader.importModule("lib/logger", globalScope);
+      ScriptLoader.importModules(["lib/requestpolicy-service", "lib/window-manager",
+                                  "lib/about-uri"], globalScope);
     }
   });
   // =======================================
diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index fecd15b..0fe0601 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -40,18 +40,18 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "prefs",
-  "policy-manager",
-  "utils/domains",
-  "utils",
-  "request",
-  "request-result",
-  "request-set"
+  "lib/logger",
+  "lib/prefs",
+  "lib/policy-manager",
+  "lib/utils/domains",
+  "lib/utils",
+  "lib/request",
+  "lib/request-result",
+  "lib/request-set"
 ], this);
 ScriptLoader.defineLazyModuleGetters({
-  "content-policy": ["PolicyImplementation"],
-  "requestpolicy-service": ["rpService"]
+  "lib/content-policy": ["PolicyImplementation"],
+  "lib/requestpolicy-service": ["rpService"]
 }, this);
 
 
diff --git a/src/content/lib/request-processor.redirects.js b/src/content/lib/request-processor.redirects.js
index 0644ee9..4c60a4a 100644
--- a/src/content/lib/request-processor.redirects.js
+++ b/src/content/lib/request-processor.redirects.js
@@ -28,18 +28,18 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "prefs",
-  "policy-manager",
-  "utils/domains",
-  "utils",
-  "request",
-  "request-result",
-  "http-response",
-  "process-environment"
+  "lib/logger",
+  "lib/prefs",
+  "lib/policy-manager",
+  "lib/utils/domains",
+  "lib/utils",
+  "lib/request",
+  "lib/request-result",
+  "lib/http-response",
+  "lib/process-environment"
 ], this);
 ScriptLoader.defineLazyModuleGetters({
-  "requestpolicy-service": ["rpService"]
+  "lib/requestpolicy-service": ["rpService"]
 }, this);
 
 
diff --git a/src/content/lib/request-set.jsm b/src/content/lib/request-set.jsm
index 7355270..a9870a8 100644
--- a/src/content/lib/request-set.jsm
+++ b/src/content/lib/request-set.jsm
@@ -29,9 +29,9 @@ let EXPORTED_SYMBOLS = ["RequestSet"];
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "utils/domains",
-  "request-result"
+  "lib/logger",
+  "lib/utils/domains",
+  "lib/request-result"
 ], this);
 
 
diff --git a/src/content/lib/request.jsm b/src/content/lib/request.jsm
index a19494e..3c1549a 100644
--- a/src/content/lib/request.jsm
+++ b/src/content/lib/request.jsm
@@ -37,9 +37,9 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "utils/domains",
-  "utils"
+  "lib/logger",
+  "lib/utils/domains",
+  "lib/utils"
 ], this);
 
 
diff --git a/src/content/lib/requestpolicy-service.jsm b/src/content/lib/requestpolicy-service.jsm
index 85364de..b78919c 100644
--- a/src/content/lib/requestpolicy-service.jsm
+++ b/src/content/lib/requestpolicy-service.jsm
@@ -33,16 +33,16 @@ Cu.import("resource://gre/modules/AddonManager.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "prefs",
-  "utils/domains",
-  "policy-manager",
-  "request-processor",
-  "subscription",
-  "utils",
-  "content-policy",
-  "constants",
-  "process-environment"
+  "lib/logger",
+  "lib/prefs",
+  "lib/utils/domains",
+  "lib/policy-manager",
+  "lib/request-processor",
+  "lib/subscription",
+  "lib/utils",
+  "lib/content-policy",
+  "lib/constants",
+  "lib/process-environment"
 ], this);
 
 
diff --git a/src/content/lib/ruleset-storage.jsm b/src/content/lib/ruleset-storage.jsm
index e9d9f1d..33e406a 100644
--- a/src/content/lib/ruleset-storage.jsm
+++ b/src/content/lib/ruleset-storage.jsm
@@ -29,8 +29,8 @@ let EXPORTED_SYMBOLS = ["RulesetStorage"];
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "ruleset",
-  "utils/files"
+  "lib/ruleset",
+  "lib/utils/files"
 ], this);
 
 
diff --git a/src/content/lib/ruleset.jsm b/src/content/lib/ruleset.jsm
index 13b2940..69151a0 100644
--- a/src/content/lib/ruleset.jsm
+++ b/src/content/lib/ruleset.jsm
@@ -32,9 +32,9 @@ let EXPORTED_SYMBOLS = [
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "utils/domains",
-  "constants"
+  "lib/logger",
+  "lib/utils/domains",
+  "lib/constants"
 ], this);
 
 
diff --git a/src/content/lib/script-loader.jsm b/src/content/lib/script-loader.jsm
index d820dca..42135aa 100644
--- a/src/content/lib/script-loader.jsm
+++ b/src/content/lib/script-loader.jsm
@@ -38,7 +38,7 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 const rpChromeContentURI = 'chrome://requestpolicy/content/';
 
 function getModuleURI(id) {
-  return rpChromeContentURI + "lib/" + id + ".jsm";
+  return rpChromeContentURI + id + ".jsm";
 }
 
 /**
diff --git a/src/content/lib/subscription.jsm b/src/content/lib/subscription.jsm
index 1068b50..a53103e 100644
--- a/src/content/lib/subscription.jsm
+++ b/src/content/lib/subscription.jsm
@@ -38,10 +38,10 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "logger",
-  "ruleset",
-  "utils/files",
-  "ruleset-storage"
+  "lib/logger",
+  "lib/ruleset",
+  "lib/utils/files",
+  "lib/ruleset-storage"
 ], this);
 
 const SUBSCRIPTION_UPDATED_TOPIC = 'requestpolicy-subscription-policy-updated';
diff --git a/src/content/lib/utils.jsm b/src/content/lib/utils.jsm
index 02897c6..4b98908 100644
--- a/src/content/lib/utils.jsm
+++ b/src/content/lib/utils.jsm
@@ -33,9 +33,9 @@ Cu.import("resource://gre/modules/AddonManager.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "prefs",
-  "constants",
-  "process-environment"
+  "lib/prefs",
+  "lib/constants",
+  "lib/process-environment"
 ], this);
 
 
diff --git a/src/content/lib/utils/domains.jsm b/src/content/lib/utils/domains.jsm
index 903979a..4a884c3 100644
--- a/src/content/lib/utils/domains.jsm
+++ b/src/content/lib/utils/domains.jsm
@@ -30,7 +30,7 @@ let EXPORTED_SYMBOLS = ["DomainUtil"];
 Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-ScriptLoader.importModules(["logger"], this);
+ScriptLoader.importModules(["lib/logger"], this);
 
 /*
  * It's worth noting that many of the functions in this module will convert ACE
diff --git a/src/content/lib/utils/xul.jsm b/src/content/lib/utils/xul.jsm
index 600f17d..01f3fde 100644
--- a/src/content/lib/utils/xul.jsm
+++ b/src/content/lib/utils/xul.jsm
@@ -28,7 +28,7 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-ScriptLoader.importModules(["logger", "utils/strings"], this);
+ScriptLoader.importModules(["lib/logger", "lib/utils/strings"], this);
 
 let EXPORTED_SYMBOLS = ["XULUtils"];
 
diff --git a/src/content/lib/window-manager-toolbarbutton.js b/src/content/lib/window-manager-toolbarbutton.js
index 98f27ac..984a0ce 100644
--- a/src/content/lib/window-manager-toolbarbutton.js
+++ b/src/content/lib/window-manager-toolbarbutton.js
@@ -29,7 +29,7 @@ const toolbarButtonId = "requestpolicyToolbarButton";
 
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-ScriptLoader.importModules(["utils/xul", "utils", "logger"], this);
+ScriptLoader.importModules(["lib/utils/xul", "lib/utils", "lib/logger"], this);
 
 if (Utils.info.isAustralis) {
   Components.utils.import("resource:///modules/CustomizableUI.jsm");
diff --git a/src/content/lib/window-manager.jsm b/src/content/lib/window-manager.jsm
index 8c0156b..0fc5e02 100644
--- a/src/content/lib/window-manager.jsm
+++ b/src/content/lib/window-manager.jsm
@@ -37,10 +37,10 @@ let rpWindowManager = (function(self) {
 
   Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", globalScope);
   ScriptLoader.importModules([
-    "utils",
-    "utils/xul",
-    "constants",
-    "process-environment"
+    "lib/utils",
+    "lib/utils/xul",
+    "lib/constants",
+    "lib/process-environment"
   ], globalScope);
 
   // import the WindowListener
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index e864b1d..c499cfb 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -7,15 +7,15 @@ Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
-  "constants",
-  "utils/strings",
-  "prefs",
-  "utils/domains",
-  "logger",
-  "subscription",
-  "policy-manager",
-  "requestpolicy-service",
-  "environment"
+  "lib/constants",
+  "lib/utils/strings",
+  "lib/prefs",
+  "lib/utils/domains",
+  "lib/logger",
+  "lib/subscription",
+  "lib/policy-manager",
+  "lib/requestpolicy-service",
+  "lib/environment"
 ], this);
 
 // create a new Environment for this window
diff --git a/src/content/ui/classicmenu.js b/src/content/ui/classicmenu.js
index 8c7e39c..06c1c0b 100644
--- a/src/content/ui/classicmenu.js
+++ b/src/content/ui/classicmenu.js
@@ -38,8 +38,8 @@ requestpolicy.classicmenu = (function() {
     Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
     ScriptLoader = mod.ScriptLoader;
   }
-  let {rpPrefBranch} = ScriptLoader.importModule("prefs");
-  let {StringUtils} = ScriptLoader.importModule("utils/strings");
+  let {rpPrefBranch} = ScriptLoader.importModule("lib/prefs");
+  let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
 
 
   /**
diff --git a/src/content/ui/frame.dom-content-loaded.js b/src/content/ui/frame.dom-content-loaded.js
index f947a00..c48acf9 100644
--- a/src/content/ui/frame.dom-content-loaded.js
+++ b/src/content/ui/frame.dom-content-loaded.js
@@ -36,8 +36,8 @@ let ManagerForDOMContentLoaded = (function() {
     Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
     ScriptLoader = mod.ScriptLoader;
   }
-  let {DomainUtil} = ScriptLoader.importModule("utils/domains");
-  let {Logger} = ScriptLoader.importModule("logger");
+  let {DomainUtil} = ScriptLoader.importModule("lib/utils/domains");
+  let {Logger} = ScriptLoader.importModule("lib/logger");
 
 
   function htmlAnchorTagClicked(event) {
diff --git a/src/content/ui/frame.js b/src/content/ui/frame.js
index 054bf90..a5196e3 100644
--- a/src/content/ui/frame.js
+++ b/src/content/ui/frame.js
@@ -42,7 +42,7 @@ Components.utils.import("chrome://requestpolicy/content/lib/script-loader.jsm");
  *     have the same Environment as the modules that will be loaded.
  */
 var WinEnv = (function getWindowEnvironment() {
-  var {ProcessEnvironment} = ScriptLoader.importModule("process-environment");
+  var {ProcessEnvironment} = ScriptLoader.importModule("lib/process-environment");
 
   let env;
 
@@ -50,7 +50,7 @@ var WinEnv = (function getWindowEnvironment() {
   if (ProcessEnvironment.isMainProcess === true) {
     // This is the main process. The `ProcessEnvironment` can't be used as the
     // content window's Environment, so a new Environment has to be created.
-    let {Environment} = ScriptLoader.importModules(["environment"]);
+    let {Environment} = ScriptLoader.importModules(["lib/environment"]);
     env = new Environment();
   } else {
     // This is a child process. The `ProcessEnvironment` can be used for this
diff --git a/src/content/ui/menu.js b/src/content/ui/menu.js
index 165ce4a..2cb8ab1 100644
--- a/src/content/ui/menu.js
+++ b/src/content/ui/menu.js
@@ -37,23 +37,18 @@ requestpolicy.menu = (function() {
   }
   // iMod: Alias for ScriptLoader.importModule
   let iMod = ScriptLoader.importModule;
-  let {Logger} = iMod("logger");
-  let {rpPrefBranch, Prefs} = iMod("prefs");
-  let {RequestProcessor} = iMod("request-processor");
-  let {PolicyManager} = iMod("policy-manager");
-  let {DomainUtil} = iMod("utils/domains");
-  let {Ruleset} = iMod("ruleset");
+  let {Logger} = iMod("lib/logger");
+  let {rpPrefBranch, Prefs} = iMod("lib/prefs");
+  let {RequestProcessor} = iMod("lib/request-processor");
+  let {PolicyManager} = iMod("lib/policy-manager");
+  let {DomainUtil} = iMod("lib/utils/domains");
+  let {Ruleset} = iMod("lib/ruleset");
   let {GUIOrigin, GUIDestination,
-       GUILocation, GUILocationProperties} = iMod("gui-location");
-  let {StringUtils} = iMod("utils/strings");
-  let {DOMUtils} = iMod("utils/dom");
-  let {rpService} = iMod("requestpolicy-service");
-  let {RULE_ACTION_ALLOW, RULE_ACTION_DENY} = iMod("constants");
-
-
-  Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
-  ScriptLoader.importModules([
-  ], this);
+       GUILocation, GUILocationProperties} = iMod("lib/gui-location");
+  let {StringUtils} = iMod("lib/utils/strings");
+  let {DOMUtils} = iMod("lib/utils/dom");
+  let {rpService} = iMod("lib/requestpolicy-service");
+  let {RULE_ACTION_ALLOW, RULE_ACTION_DENY} = iMod("lib/constants");
 
 
   let initialized = false;
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index a1c1779..cd4200c 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -42,15 +42,15 @@ requestpolicy.overlay = (function() {
   }
   // iMod: Alias for ScriptLoader.importModule
   let iMod = ScriptLoader.importModule;
-  let {Logger} = iMod("logger");
-  let {rpPrefBranch, Prefs} = iMod("prefs");
-  let {RequestProcessor} = iMod("request-processor");
-  let {PolicyManager} = iMod("policy-manager");
-  let {DomainUtil} = iMod("utils/domains");
-  let {StringUtils} = iMod("utils/strings");
-  let {DOMUtils} = iMod("utils/dom");
-  let {rpService} = iMod("requestpolicy-service");
-  let {MMID} = iMod("constants");
+  let {Logger} = iMod("lib/logger");
+  let {rpPrefBranch, Prefs} = iMod("lib/prefs");
+  let {RequestProcessor} = iMod("lib/request-processor");
+  let {PolicyManager} = iMod("lib/policy-manager");
+  let {DomainUtil} = iMod("lib/utils/domains");
+  let {StringUtils} = iMod("lib/utils/strings");
+  let {DOMUtils} = iMod("lib/utils/dom");
+  let {rpService} = iMod("lib/requestpolicy-service");
+  let {MMID} = iMod("lib/constants");
 
   let $ = function(id) {
     return document.getElementById(id);
diff --git a/src/content/ui/request-log.filtering.js b/src/content/ui/request-log.filtering.js
index ec26df4..a665bbf 100644
--- a/src/content/ui/request-log.filtering.js
+++ b/src/content/ui/request-log.filtering.js
@@ -36,7 +36,7 @@ window.requestpolicy.requestLog = (function (self) {
     ScriptLoader = mod.ScriptLoader;
     Services = mod.Services;
   }
-  let {Utils} = ScriptLoader.importModule("utils");
+  let {Utils} = ScriptLoader.importModule("lib/utils");
 
   let filterText = null;
 
diff --git a/src/content/ui/request-log.interface.js b/src/content/ui/request-log.interface.js
index 20e668c..8c8fd03 100644
--- a/src/content/ui/request-log.interface.js
+++ b/src/content/ui/request-log.interface.js
@@ -37,9 +37,9 @@ window.requestpolicy.requestLog = (function (self) {
     ScriptLoader = mod.ScriptLoader;
     Services = mod.Services;
   }
-  let {DomainUtil} = ScriptLoader.importModule("utils/domains");
-  let {StringUtils} = ScriptLoader.importModule("utils/strings");
-  let {Utils} = ScriptLoader.importModule("utils");
+  let {DomainUtil} = ScriptLoader.importModule("lib/utils/domains");
+  let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
+  let {Utils} = ScriptLoader.importModule("lib/utils");
 
 
 
diff --git a/src/content/ui/request-log.js b/src/content/ui/request-log.js
index e64938c..2ef4643 100644
--- a/src/content/ui/request-log.js
+++ b/src/content/ui/request-log.js
@@ -35,8 +35,8 @@ window.requestpolicy.requestLog = (function (self) {
     Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
     ScriptLoader = mod.ScriptLoader;
   }
-  let {StringUtils} = ScriptLoader.importModule("utils/strings");
-  let {Utils} = ScriptLoader.importModule("utils");
+  let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
+  let {Utils} = ScriptLoader.importModule("lib/utils");
 
 
   self.isEmptyMessageDisplayed = true;
diff --git a/src/content/ui/request-log.tree-view.js b/src/content/ui/request-log.tree-view.js
index 8dd1af2..2f639cc 100644
--- a/src/content/ui/request-log.tree-view.js
+++ b/src/content/ui/request-log.tree-view.js
@@ -36,7 +36,7 @@ window.requestpolicy.requestLog = (function (self) {
     Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm", mod);
     ScriptLoader = mod.ScriptLoader;
   }
-  let {StringUtils} = ScriptLoader.importModule("utils/strings");
+  let {StringUtils} = ScriptLoader.importModule("lib/utils/strings");
 
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git



More information about the Pkg-mozext-commits mailing list