From 7b5981207cb11f3b2e936cf896c7b69fe7ed4f06 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Sat, 5 May 2007 04:36:35 +0000
Subject: [PATCH] Bug 229903 remove bogus QueryInterface methods from
 bookmarks.js r=pch sr=dbaron

---
 suite/common/bookmarks/bookmarks.js | 70 +++++++----------------------
 1 file changed, 15 insertions(+), 55 deletions(-)

diff --git a/suite/common/bookmarks/bookmarks.js b/suite/common/bookmarks/bookmarks.js
index e0e50b0876b..c7c0cdf02b0 100644
--- a/suite/common/bookmarks/bookmarks.js
+++ b/suite/common/bookmarks/bookmarks.js
@@ -1599,12 +1599,21 @@ BookmarkTransaction.prototype = {
     if (this.item.length > this.BATCH_LIMIT) {
       this.BMDS.endUpdateBatch();
     }
-  }
+  },
+
+  // nsITransaction method stubs
+  doTransaction: function() {},
+  undoTransaction: function() {},
+  redoTransaction: function() { this.doTransaction(); },
+  get isTransient() { return false; },
+  merge: function(aTransaction) { return false; },
+
+  // debugging helper
+  get wrappedJSObject() { return this; }
 }
 
 function BookmarkInsertTransaction (aAction)
 {
-  this.wrappedJSObject = this;
   this.type    = "insert";
   this.action  = aAction;
   this.item    = null;
@@ -1617,8 +1626,6 @@ BookmarkInsertTransaction.prototype =
 {
   __proto__: BookmarkTransaction.prototype,
 
-  isTransient: false,
-
   doTransaction: function ()
   {
     this.beginUpdateBatch();
@@ -1643,24 +1650,12 @@ BookmarkInsertTransaction.prototype =
       }
     }
     this.endUpdateBatch();
-  },
-   
-  redoTransaction: function ()
-  {
-    this.doTransaction();
-  },
-
-  merge               : function (aTransaction) {return false},
-  QueryInterface      : function (aUID)         {return this},
-  getHelperForLanguage: function (aCount)       {return null},
-  getInterfaces       : function (aCount)       {return null},
-  canCreateWrapper    : function (aIID)         {return "AllAccess"}
+  }
 
 }
 
 function BookmarkRemoveTransaction (aAction)
 {
-  this.wrappedJSObject = this;
   this.type    = "remove";
   this.action  = aAction;
   this.item    = null;
@@ -1673,8 +1668,6 @@ BookmarkRemoveTransaction.prototype =
 {
   __proto__: BookmarkTransaction.prototype,
 
-  isTransient: false,
-
   doTransaction: function ()
   {
     this.beginUpdateBatch();
@@ -1697,24 +1690,12 @@ BookmarkRemoveTransaction.prototype =
       }
     }
     this.endUpdateBatch();
-  },
-   
-  redoTransaction: function ()
-  {
-    this.doTransaction();
-  },
-
-  merge               : function (aTransaction) {return false},
-  QueryInterface      : function (aUID)         {return this},
-  getHelperForLanguage: function (aCount)       {return null},
-  getInterfaces       : function (aCount)       {return null},
-  canCreateWrapper    : function (aIID)         {return "AllAccess"}
+  }
 
 }
 
 function BookmarkMoveTransaction (aAction, aSelection, aTarget)
 {
-  this.wrappedJSObject = this;
   this.type      = "move";
   this.action    = aAction;
   this.selection = aSelection;
@@ -1726,8 +1707,6 @@ BookmarkMoveTransaction.prototype =
 {
   __proto__: BookmarkTransaction.prototype,
 
-  isTransient: false,
-
   beginUpdateBatch: function()
   {
     if (this.selection.length > this.BATCH_LIMIT) {
@@ -1750,19 +1729,12 @@ BookmarkMoveTransaction.prototype =
     this.endUpdateBatch();
   },
 
-  undoTransaction     : function () {},
-  redoTransaction     : function () {},
-  merge               : function (aTransaction) {return false},
-  QueryInterface      : function (aUID)         {return this},
-  getHelperForLanguage: function (aCount)       {return null},
-  getInterfaces       : function (aCount)       {return null},
-  canCreateWrapper    : function (aIID)         {return "AllAccess"}
+  redoTransaction     : function () {}
 
 }
 
 function BookmarkImportTransaction (aAction)
 {
-  this.wrappedJSObject = this;
   this.type    = "import";
   this.action  = aAction;
   this.item    = [];
@@ -1775,12 +1747,6 @@ BookmarkImportTransaction.prototype =
 {
   __proto__: BookmarkTransaction.prototype,
 
-  isTransient: false,
-
-  doTransaction: function ()
-  {
-  },
-
   undoTransaction: function ()
   {
     this.beginUpdateBatch();
@@ -1803,12 +1769,6 @@ BookmarkImportTransaction.prototype =
       }
     }
     this.endUpdateBatch();
-  },
-
-  merge               : function (aTransaction) {return false},
-  QueryInterface      : function (aUID)         {return this},
-  getHelperForLanguage: function (aCount)       {return null},
-  getInterfaces       : function (aCount)       {return null},
-  canCreateWrapper    : function (aIID)         {return "AllAccess"}
+  }
 
 }