From 6d79590a7e48311211a12f46bc7fde6274b670d9 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Thu, 15 Aug 2002 00:22:41 +0000
Subject: [PATCH] Forking bookmarks, adding QS.

---
 browser/components/Makefile.in                |    2 +-
 browser/components/bookmarks/.cvsignore       |    0
 browser/components/bookmarks/Makefile.in      |   30 +
 .../bookmarks/content/MANIFEST-content        |    0
 .../components/bookmarks/content/Makefile.in  |    0
 .../bookmarks/content/addBookmark.js          |  341 ++++++
 .../bookmarks/content/addBookmark.xul         |  118 ++
 .../components/bookmarks/content/bm-panel.xul |    0
 .../components/bookmarks/content/bm-props.js  |    0
 .../components/bookmarks/content/bm-props.xul |    0
 .../bookmarks/content/bookmarks-temp.js       |    0
 .../bookmarks/content/bookmarks.css           |   14 +
 .../components/bookmarks/content/bookmarks.js |    0
 .../bookmarks/content/bookmarks.xml           |    0
 .../bookmarks/content/bookmarks.xul           |  237 ++++
 .../bookmarks/content/bookmarksDD-temp.js     |    0
 .../bookmarks/content/bookmarksDD.js          |    0
 .../bookmarks/content/bookmarksOverlay.js     | 1002 +++++++++++++++++
 .../bookmarks/content/bookmarksOverlay.xul    |    0
 .../bookmarks/content/bookmarksPanel.js       |   64 ++
 .../bookmarks/content/bookmarksTree.js        |    0
 .../bookmarks/content/findBookmark.js         |   97 ++
 .../bookmarks/content/findBookmark.xul        |   69 ++
 .../components/bookmarks/content/manifest.jm  |    0
 .../components/bookmarks/content/oTest.css    |    0
 .../components/bookmarks/content/oTest.xul    |    0
 .../bookmarks/content/pref-bookmarks.xul      |    0
 browser/components/bookmarks/jar.mn           |   47 +
 browser/components/bookmarks/locale/MANIFEST  |    4 +
 .../bookmarks/locale/addBookmark.dtd          |   46 +
 .../components/bookmarks/locale/bm-props.dtd  |    0
 .../bookmarks/locale/bookmark.properties      |    0
 .../components/bookmarks/locale/bookmarks.dtd |   89 ++
 .../bookmarks/locale/bookmarksOverlay.dtd     |    0
 .../bookmarks/locale/findBookmark.dtd         |    0
 .../bookmarks/locale/pref-bookmarks.dtd       |    0
 36 files changed, 2159 insertions(+), 1 deletion(-)
 create mode 100644 browser/components/bookmarks/.cvsignore
 create mode 100644 browser/components/bookmarks/Makefile.in
 create mode 100644 browser/components/bookmarks/content/MANIFEST-content
 create mode 100644 browser/components/bookmarks/content/Makefile.in
 create mode 100644 browser/components/bookmarks/content/addBookmark.js
 create mode 100644 browser/components/bookmarks/content/addBookmark.xul
 create mode 100644 browser/components/bookmarks/content/bm-panel.xul
 create mode 100644 browser/components/bookmarks/content/bm-props.js
 create mode 100644 browser/components/bookmarks/content/bm-props.xul
 create mode 100644 browser/components/bookmarks/content/bookmarks-temp.js
 create mode 100644 browser/components/bookmarks/content/bookmarks.css
 create mode 100644 browser/components/bookmarks/content/bookmarks.js
 create mode 100644 browser/components/bookmarks/content/bookmarks.xml
 create mode 100644 browser/components/bookmarks/content/bookmarks.xul
 create mode 100644 browser/components/bookmarks/content/bookmarksDD-temp.js
 create mode 100644 browser/components/bookmarks/content/bookmarksDD.js
 create mode 100644 browser/components/bookmarks/content/bookmarksOverlay.js
 create mode 100644 browser/components/bookmarks/content/bookmarksOverlay.xul
 create mode 100644 browser/components/bookmarks/content/bookmarksPanel.js
 create mode 100644 browser/components/bookmarks/content/bookmarksTree.js
 create mode 100644 browser/components/bookmarks/content/findBookmark.js
 create mode 100644 browser/components/bookmarks/content/findBookmark.xul
 create mode 100644 browser/components/bookmarks/content/manifest.jm
 create mode 100644 browser/components/bookmarks/content/oTest.css
 create mode 100644 browser/components/bookmarks/content/oTest.xul
 create mode 100644 browser/components/bookmarks/content/pref-bookmarks.xul
 create mode 100644 browser/components/bookmarks/jar.mn
 create mode 100644 browser/components/bookmarks/locale/MANIFEST
 create mode 100644 browser/components/bookmarks/locale/addBookmark.dtd
 create mode 100644 browser/components/bookmarks/locale/bm-props.dtd
 create mode 100644 browser/components/bookmarks/locale/bookmark.properties
 create mode 100644 browser/components/bookmarks/locale/bookmarks.dtd
 create mode 100644 browser/components/bookmarks/locale/bookmarksOverlay.dtd
 create mode 100644 browser/components/bookmarks/locale/findBookmark.dtd
 create mode 100644 browser/components/bookmarks/locale/pref-bookmarks.dtd

diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index b05026bd331..42192584505 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -42,6 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = prefwindow history
+DIRS = prefwindow history bookmarks
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/bookmarks/.cvsignore b/browser/components/bookmarks/.cvsignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/Makefile.in b/browser/components/bookmarks/Makefile.in
new file mode 100644
index 00000000000..e07fb7c964b
--- /dev/null
+++ b/browser/components/bookmarks/Makefile.in
@@ -0,0 +1,30 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/browser/components/bookmarks/content/MANIFEST-content b/browser/components/bookmarks/content/MANIFEST-content
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/Makefile.in b/browser/components/bookmarks/content/Makefile.in
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/addBookmark.js b/browser/components/bookmarks/content/addBookmark.js
new file mode 100644
index 00000000000..6e9acfca56c
--- /dev/null
+++ b/browser/components/bookmarks/content/addBookmark.js
@@ -0,0 +1,341 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add Bookmark Dialog. 
+ * ====================
+ * 
+ * This is a generic bookmark dialog that allows for bookmark addition
+ * and folder selection. It can be opened with various parameters that 
+ * result in appearance/purpose differences and initial state. 
+ * 
+ * Use: Open with 'openDialog', with the flags 
+ *        'centerscreen,chrome,dialog=no,resizable=yes'
+ * 
+ * Parameters: 
+ *   Apart from the standard openDialog parameters, this dialog can 
+ *   be passed additional information, which gets mapped to the 
+ *   window.arguments array:
+ * 
+ *   window.arguments[0]: Bookmark Name. The value to be prefilled
+ *                        into the "Name: " field (if visible).
+ *   window.arguments[1]: Bookmark URL: The location of the bookmark.
+ *                        The value to be filled in the "Location: "
+ *                        field (if visible).
+ *   window.arguments[2]: Bookmark Folder. The RDF Resource URI of the
+ *                        folder that this bookmark should be created in.
+ *   window.arguments[3]: Bookmark Charset. The charset that should be
+ *                        used when adding a bookmark to the specified
+ *                        URL. (Usually the charset of the current 
+ *                        document when launching this window). 
+ *   window.arguments[4]: The mode of operation. See notes for details.
+ *   window.arguments[5]: If the mode is "addGroup", this is an array
+ *                        of objects with name, URL and charset
+ *                        properties, one for each group member.
+ *
+ * Mode of Operation Notes:
+ * ------------------------
+ * This dialog can be opened in four different ways by using a parameter
+ * passed through the call to openDialog. The 'mode' of operation
+ * of the window is expressed in window.arguments[4]. The valid modes are:
+ *
+ * 1) <default> (no fifth open parameter).
+ *      Opens this dialog with the bookmark Name, URL and folder selection
+ *      components visible. 
+ * 2) "newBookmark" (fifth open parameter = String("newBookmark"))
+ *      Opens the dialog as in (1) above except the folder selection tree
+ *      is hidden. This type of mode is useful when the creation folder 
+ *      is pre-determined.
+ * 3) "selectFolder" (fifth open parameter = String("selectFolder"))
+ *      Opens the dialog as in (1) above except the Name/Location section
+ *      is hidden, and the dialog takes on the utility of a Folder chooser.
+ *      Used when the user must select a Folder for some purpose. 
+ * 4) "addGroup" (fifth open parameter = String("addGroup"))
+ *      Opens the dialog like <default>, with a checkbox to select between
+ *      filing a single bookmark or a group. For the single bookmark the
+ *      values are taken from the name, URL and charset arguments.
+ *      For the group, the values are taken from the sixth argument.
+ *      This parameter can also be String("addGroup,group") where "group"
+ *      specifies that the dialog starts in filing as a group.
+ */
+
+var gFld_Name   = null;
+var gFld_URL    = null; 
+var gFolderTree = null;
+var gCB_AddGroup = null;
+
+var gBookmarkCharset = null;
+
+const kRDFSContractID = "@mozilla.org/rdf/rdf-service;1";
+const kRDFSIID = Components.interfaces.nsIRDFService;
+const kRDF = Components.classes[kRDFSContractID].getService(kRDFSIID);
+
+var gSelectItemObserver = null;
+
+var gCreateInFolder = "NC:NewBookmarkFolder";
+
+function Startup()
+{
+  gFld_Name = document.getElementById("name");
+  gFld_URL = document.getElementById("url");
+  gCB_AddGroup = document.getElementById("addgroup");
+  var bookmarkView = document.getElementById("bookmarks-view");
+
+  var shouldSetOKButton = true;
+  var dialogElement = document.documentElement;
+  if ("arguments" in window) {
+    var ind;
+    var folderItem = null;
+    var arg;
+    if (window.arguments.length < 5)
+      arg = null;
+    else
+      arg = window.arguments[4];
+    switch (arg) {
+    case "selectFolder":
+      // If we're being opened as a folder selection window
+      document.getElementById("bookmarknamegrid").setAttribute("hidden", "true");
+      document.getElementById("createinseparator").setAttribute("hidden", "true");
+      document.getElementById("nameseparator").setAttribute("hidden", "true");
+      sizeToContent();
+      dialogElement.setAttribute("title", dialogElement.getAttribute("title-selectFolder"));
+      shouldSetOKButton = false;
+      if (window.arguments[2])
+        folderItem = bookmarkView.rdf.GetResource(window.arguments[2]);
+      if (folderItem) {
+        ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
+        bookmarkView.treeBoxObject.selection.select(ind);
+      }
+      break;
+    case "newBookmark":
+      setupFields();
+      if (window.arguments[2])
+        gCreateInFolder = window.arguments[2];
+      document.getElementById("folderbox").setAttribute("hidden", "true");
+      sizeToFit();
+      break;
+    case "addGroup":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      setupFields();
+      sizeToFit();
+      break;
+    case "addGroup,group":
+      document.getElementById("showaddgroup").setAttribute("hidden", "false");
+      gCB_AddGroup.setAttribute("checked", "true");
+      setupFields();
+      toggleGroup();
+      sizeToFit();
+      break;
+    default:
+      // Regular Add Bookmark
+      setupFields();
+      if (window.arguments[2]) {
+        gCreateInFolder = window.arguments[2];
+        folderItem = bookmarkView.rdf.GetResource(gCreateInFolder);
+        if (folderItem) {
+          ind = bookmarkView.treeBuilder.getIndexOfResource(folderItem);
+          bookmarkView.treeBoxObject.selection.select(ind);
+        }
+      }
+    }
+  }
+  
+  if (shouldSetOKButton)
+    onFieldInput();
+  if (document.getElementById("bookmarknamegrid").hasAttribute("hidden")) {
+    bookmarkView.tree.focus();
+    if (bookmarkView.currentIndex == -1)
+      bookmarkView.treeBoxObject.selection.select(0);
+  }
+  else {
+    gFld_Name.select();
+    gFld_Name.focus();
+  }
+} 
+
+function sizeToFit()
+{
+  var dialogElement = document.documentElement;
+  dialogElement.removeAttribute("persist");
+  dialogElement.removeAttribute("height");
+  dialogElement.removeAttribute("width");
+  dialogElement.setAttribute("style", dialogElement.getAttribute("style"));
+  sizeToContent();
+}
+
+function setupFields()
+{
+  // New bookmark in predetermined folder. 
+  gFld_Name.value = window.arguments[0] || "";
+  gFld_URL.value = window.arguments[1] || "";
+  onFieldInput();
+  gFld_Name.select();
+  gFld_Name.focus();
+  gBookmarkCharset = window.arguments[3] || null;
+}
+
+function onFieldInput()
+{
+  const ok = document.documentElement.getButton("accept");
+  ok.disabled = gFld_URL.value == "" && !addingGroup() ||
+                gFld_Name.value == "";
+}    
+
+function onOK()
+{
+  if (!document.getElementById("folderbox").hasAttribute("hidden")) {
+    var bookmarkView = document.getElementById("bookmarks-view");
+    var currentIndex = bookmarkView.currentIndex;
+    if (currentIndex != -1)
+      gCreateInFolder = bookmarkView.treeBuilder.getResourceAtIndex(currentIndex).Value;
+  }
+  // In Select Folder Mode, do nothing but tell our caller what
+  // folder was selected. 
+  if (window.arguments.length > 4 && window.arguments[4] == "selectFolder")
+    window.arguments[5].selectedFolder = gCreateInFolder;
+  else {
+    // Otherwise add a bookmark to the selected folder. 
+
+    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+    const kBMSContractID = "@mozilla.org/browser/bookmarks-service;1";
+    const kBMSIID = Components.interfaces.nsIBookmarksService;
+    const kBMS = Components.classes[kBMSContractID].getService(kBMSIID);
+    var rFolder = kRDF.GetResource(gCreateInFolder, true);
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFIID = Components.interfaces.nsIRDFContainer;
+    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
+    try {
+      kRDFC.Init(kBMDS, rFolder);
+    }
+    catch (e) {
+      // No "NC:NewBookmarkFolder" exists, just append to the root.
+      rFolder = kRDF.GetResource("NC:BookmarksRoot", true);
+      kRDFC.Init(kBMDS, rFolder);
+    }
+
+    // if no URL was provided and we're not filing as a group, do nothing
+    if (!gFld_URL.value && !addingGroup())
+      return;
+
+    var url;
+    if (addingGroup()) {
+      const group = kBMS.createGroup(gFld_Name.value, rFolder);
+      const groups = window.arguments[5];
+      for (var i = 0; i < groups.length; ++i) {
+        url = getNormalizedURL(groups[i].url);
+        kBMS.createBookmarkWithDetails(groups[i].name, url,
+                                       groups[i].charset, group, -1);
+      }
+    } else {
+      url = getNormalizedURL(gFld_URL.value);
+      var newBookmark = kBMS.createBookmarkWithDetails(gFld_Name.value, url, gBookmarkCharset, rFolder, -1);
+      if (window.arguments.length > 4 && window.arguments[4] == "newBookmark") {
+        window.arguments[5].newBookmark = newBookmark;
+      }
+    }
+  }
+}
+
+function getNormalizedURL(url)
+{
+  // Check to see if the item is a local directory path, and if so, convert
+  // to a file URL so that aggregation with rdf:files works
+  try {
+    const kLF = Components.classes["@mozilla.org/file/local;1"]
+                          .createInstance(Components.interfaces.nsILocalFile);
+    kLF.initWithPath(url);
+    if (kLF.exists()) {
+      var ioService = Components.classes["@mozilla.org/network/io-service;1"]
+                                .getService(Components.classes.nsIIOService);
+
+      url = ioService.getURLSpecFromFile(kLF);
+    }
+  }
+  catch (e) {
+  }
+
+  return url;
+}
+
+var gBookmarksShell = null;
+function createNewFolder ()
+{
+  var bookmarksView = document.getElementById("bookmarks-view");
+  bookmarksView.createNewFolder();
+}
+
+function useDefaultFolder ()
+{
+  var bookmarkView = document.getElementById("bookmarks-view");
+  var folder = BookmarksUtils.getNewBookmarkFolder();
+  var ind = bookmarkView.treeBuilder.getIndexOfResource(folder);
+  if (ind != -1) {
+    bookmarkView.tree.focus();
+    bookmarkView.treeBoxObject.selection.select(ind);
+  } else {
+    bookmarkView.treeBoxObject.selection.clearSelection();
+  }
+  gCreateInFolder = folder.Value;
+}
+
+var gOldNameValue = "";
+var gOldURLValue = "";
+
+function toggleGroup()
+{
+  // swap between single bookmark and group name
+  var temp = gOldNameValue;
+  gOldNameValue = gFld_Name.value;
+  gFld_Name.value = temp;
+
+  // swap between single bookmark and group url
+  temp = gOldURLValue;
+  gOldURLValue = gFld_URL.value;
+  gFld_URL.value = temp;
+  gFld_URL.disabled = gCB_AddGroup.getAttribute("checked") == "true";
+
+  gFld_Name.select();
+  gFld_Name.focus();
+  onFieldInput();
+}
+
+function addingGroup()
+{
+  const showAddGroup = document.getElementById("showaddgroup");
+  return showAddGroup.getAttribute("hidden") != "true" && gCB_AddGroup.getAttribute("checked") == "true";
+}
diff --git a/browser/components/bookmarks/content/addBookmark.xul b/browser/components/bookmarks/content/addBookmark.xul
new file mode 100644
index 00000000000..b7895efd0a1
--- /dev/null
+++ b/browser/components/bookmarks/content/addBookmark.xul
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  The contents of this file are subject to the Netscape Public
+  License Version 1.1 (the "License"); you may not use this file
+  except in compliance with the License. You may obtain a copy of
+  the License at http://www.mozilla.org/NPL/
+ 
+  Software distributed under the License is distributed on an "AS
+  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  implied. See the License for the specific language governing
+  rights and limitations under the License.
+ 
+  The Original Code is mozilla.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com> (Original Author)
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
+%addBookmarkDTD;
+]>
+
+<dialog id="newBookmarkDialog" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        ondialogaccept="return onOK(event)"
+        title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
+        onload="Startup();"
+        persist="screenX screenY width height"
+        screenX="24" screenY="24">
+   
+  
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/addBookmark.js"/>
+
+  <stringbundle id="bookmarksbundle"
+                src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+
+  <broadcaster id="showaddgroup" hidden="true"/>
+
+  <separator id="nameseparator" class="thin"/>
+  
+  <grid id="bookmarknamegrid">
+    <columns>
+      <column/>
+      <column flex="5"/>
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row align="center">
+        <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
+        <textbox id="name" oninput="onFieldInput();"/>
+        <spacer/>
+      </row>
+      <row>
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spacer/>
+      </row>
+      <row align="center">
+        <label value="&url.label;" accesskey="&url.accesskey;" control="url"/>
+        <textbox id="url" oninput="onFieldInput();"/>
+        <spacer/>
+      </row>
+      <row observes="showaddgroup">
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spacer/>
+      </row>
+      <row observes="showaddgroup">
+        <spacer/>
+        <hbox pack="start">
+          <checkbox id="addgroup" label="&addGroup.label;"
+                    accesskey="&addGroup.accesskey;" oncommand="toggleGroup();"/>
+        </hbox>
+        <spacer/>
+      </row>
+    </rows>
+  </grid>
+
+  <separator id="createinseparator"/>
+
+  <vbox id="folderbox" flex="1">
+    <separator/>
+    <hbox flex="1">
+      <label id="createinlabel" value="&createin.label;"/>
+      <hbox flex="1">
+        <bookmarks-tree id="bookmarks-view" flex="1" type="folders"/>
+        <vbox>
+          <button label="&button.newfolder.label;" accesskey="&button.newfolder.accesskey;"
+                  oncommand="createNewFolder();"/>
+          <button label="&button.defaultfolder.label;" 
+                  accesskey="&button.defaultfolder.accesskey;"
+                  oncommand="useDefaultFolder();"/>
+        </vbox>
+      </hbox>
+    </hbox>
+  </vbox>
+
+  <separator/>
+
+</dialog>
diff --git a/browser/components/bookmarks/content/bm-panel.xul b/browser/components/bookmarks/content/bm-panel.xul
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bm-props.js b/browser/components/bookmarks/content/bm-props.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bm-props.xul b/browser/components/bookmarks/content/bm-props.xul
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarks-temp.js b/browser/components/bookmarks/content/bookmarks-temp.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarks.css b/browser/components/bookmarks/content/bookmarks.css
new file mode 100644
index 00000000000..e1c98523482
--- /dev/null
+++ b/browser/components/bookmarks/content/bookmarks.css
@@ -0,0 +1,14 @@
+bookmarks-tree, bookmarks-tree[type="multi-column"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-full");
+  }
+  
+bookmarks-tree[type="single-column"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-name");
+  }
+
+bookmarks-tree[type="folders"]
+  {
+    -moz-binding          : url("chrome://communicator/content/bookmarks/bookmarks.xml#bookmarks-tree-folders");
+  }
\ No newline at end of file
diff --git a/browser/components/bookmarks/content/bookmarks.js b/browser/components/bookmarks/content/bookmarks.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarks.xml b/browser/components/bookmarks/content/bookmarks.xml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarks.xul b/browser/components/bookmarks/content/bookmarks.xul
new file mode 100644
index 00000000000..8f1a34e0244
--- /dev/null
+++ b/browser/components/bookmarks/content/bookmarks.xul
@@ -0,0 +1,237 @@
+<?xml version="1.0"?>  
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  The contents of this file are subject to the Netscape Public
+  License Version 1.1 (the "License"); you may not use this file
+  except in compliance with the License. You may obtain a copy of
+  the License at http://www.mozilla.org/NPL/
+ 
+  Software distributed under the License is distributed on an "AS
+  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  implied. See the License for the specific language governing
+  rights and limitations under the License.
+ 
+  The Original Code is mozilla.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com>
+    Blake Ross <blakeross@telocity.com>
+    Dean Tessman <dean_tessman@hotmail.com>
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://browser/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
+%utilDTD;
+<!ENTITY % bmDTD SYSTEM "chrome://browser/locale/bookmarks/bookmarks.dtd">
+%bmDTD;
+]>
+
+<window id="bookmark-window" windowtype="bookmarks:manager"
+        title="&bookmarksWindowTitle.label;" 
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns:web="http://home.netscape.com/WEB-rdf#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        width="630" height="400" screenX="20" screenY="20"
+        persist="width height screenX screenY sizemode"
+        onload="Startup();" onunload="Shutdown();">
+
+  <!-- The order of loading of these script files is IMPORTANT -->
+
+  <!-- Shared Libraries -->
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"></script>
+
+  <!-- XXX - This should SO become an XBL widget -->
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
+  
+  <!-- Shared Bookmarks Utility Library -->
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksOverlay.js"/>
+  <!-- Tree-based Bookmarks UI Utility Library -->
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksTree.js"/>
+  <!-- Bookmarks Window -->
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
+
+  <!-- Bookmarks Window Drag & Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksDD.js"/>
+
+  <popupset id="bookmarksPopupset"/>
+
+  <commands id="commands">
+    <commandset id="CommandUpdate_Bookmarks"
+                commandupdater="true"
+                events="focus,tree-select"
+                oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
+    </commandset>                
+
+    <commandset id="tasksCommands"/> 
+
+    <!-- File Menu -->
+    <command id="cmd_close" oncommand="close()"/>
+    <!-- Edit Menu -->
+    <command id="cmd_undo"/>
+  </commands>
+
+  <stringbundleset id="stringbundleset"/>
+
+  <keyset id="tasksKeys">
+    <!-- File Menu -->
+    <key id="key_close"/>
+    <key id="key_quit"/>
+    <!-- Edit Menu -->
+    <key id="key_undo"/>
+
+    <!-- These keybindings do not have a command specified in the overlay, 
+         which is good, but we need to specify it ourselves here -->
+    <key id="key_cut" command="cmd_bm_cut"/>
+    <key id="key_copy" command="cmd_bm_copy"/>
+    <key id="key_paste" command="cmd_bm_paste"/>
+    <key id="key_selectAll" command="cmd_bm_selectAll"/>
+
+    <!-- We need to provide our own delete key binding because the key_delete
+         handler in platformGlobalOverlay.xul maps command to "cmd_delete" which
+         is NOT what we want! -->
+    <key id="key_bm_delete" keycode="VK_DELETE" command="cmd_bm_delete"/>
+
+    <key id="bm_key_find"  
+         key="&edit.find.keybinding;"  
+         command="cmd_bm_find" modifiers="accel"/>
+    <key id="bm_key_properties" 
+         key="&edit.properties.keybinding;"  
+         command="cmd_bm_properties" modifiers="accel"/>
+  </keyset>
+  
+  <toolbox id="bookmarks-toolbox">
+    <menubar id="main-menubar" grippytooltiptext="&menuBar.tooltip;">
+      <menu label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
+        <menupopup>
+          <menuitem label="&menuitem.newBookmark.label;" 
+                    accesskey="&command.newBookmark.accesskey;"
+                    observes="cmd_bm_newbookmark"/>
+          <menuitem label="&button.newFolder.label;" 
+                    accesskey="&command.newFolder.accesskey;"
+                    observes="cmd_bm_newfolder"/>
+          <menuitem label="&button.newSeparator.label;"
+                    accesskey="&command.newSeparator.accesskey;"
+                    observes="cmd_bm_newseparator"/>
+          <menuseparator/>
+          <menuitem id="menu_close"/>
+        </menupopup>
+      </menu>
+      <menu id="menu_Edit">
+        <menupopup>
+          <menuitem id="menu_undo" disabled="true"/>
+          <menuseparator/>
+          <menuitem id="menu_bm_cut"    
+                    label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" 
+          key="key_cut" command="cmd_bm_cut"/>
+          <menuitem id="menu_bm_copy"
+                    label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
+                    key="key_copy" command="cmd_bm_copy"/>
+          <menuitem id="menu_bm_paste"  
+                    label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"     
+                    key="key_paste" command="cmd_bm_paste"/>
+          <menuitem id="menu_bm_delete" 
+                    label="&deleteCmd.label;" accesskey="&deleteCmd.label;"     
+                    key="key_bm_delete" command="cmd_bm_delete"/>
+          <menuseparator/>
+          <menuitem id="menu_bm_selectAll" 
+                label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
+                    key="key_selectAll" command="cmd_bm_selectAll"/>
+          <menuseparator/>
+          <menuitem label="&command.fileBookmark.label;"
+                    accesskey="&command.fileBookmark.accesskey;"
+                    command="cmd_bm_fileBookmark"/>
+          <menuseparator/>
+            <menuitem observes="cmd_bm_properties" key="bm_key_properties" 
+                      label="&command.properties.label;" 
+                      accesskey="&command.properties.accesskey;" />
+        </menupopup>
+      </menu>
+  
+      <menu id="menu_View">
+        <menupopup onpopupshowing="fillViewMenu(event)"
+                   oncommand="onViewMenuSortItemSelected(event);">
+          <menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
+                    label="&menuitem.view.command.toolbar.label;"
+                    accesskey="&menuitem.view.command.toolbar.accesskey;"
+                    oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
+                    persist="checked"/>
+          <menuseparator id="fill-after-this-node"/>
+          <menuitem id="natural" label="&menuitem.view.unsorted.label;"
+                    accesskey="&menuitem.view.unsorted.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortSet"/>
+          <menuseparator id="fill-before-this-node"/>
+          <menuitem id="ascending" label="&menuitem.view.ascending.label;"
+                    accesskey="&menuitem.view.ascending.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortDirectionSet"/>
+          <menuitem id="descending" label="&menuitem.view.descending.label;"
+                    accesskey="&menuitem.view.descending.accesskey;"
+                    type="radio"
+                    resource="direction" name="sortDirectionSet"/>
+          <menuseparator/>
+          <menu id="descending" label="&menuitem.view.show_columns.label;"
+                accesskey="&menuitem.view.show_columns.accesskey;">
+            <menupopup id="columnsPopup" onpopupshowing="fillColumnsMenu(event);"
+                       oncommand="onViewMenuColumnItemSelected(event);"/>
+          </menu>
+          <menuseparator/>
+          <menuitem label="&menuitem.newbookmarkfolder.label;" 
+                    command="cmd_bm_setnewbookmarkfolder"
+                    accesskey="&menuitem.newbookmarkfolder.accesskey;"/>
+          <menuitem label="&menuitem.newinternetsearchfolder.label;"
+                    command="cmd_bm_setnewsearchfolder"
+                    accesskey="&menuitem.newinternetsearchfolder.accesskey;"/>
+          <menuitem label="&menuitem.personaltoolbarfolder.label;"    
+                    command="cmd_bm_setpersonaltoolbarfolder"
+                    accesskey="&menuitem.personaltoolbarfolder.accesskey;"/>
+        </menupopup>
+      </menu>
+      <menu id="menu_Help"/>
+    </menubar>
+
+    <toolbar id="command-toolbar" tbalign="stretch" grippytooltiptext="&bookmarkToolbar.tooltip;">
+      <toolbarbutton id="newfolder" label="&button.newFolder.label;" 
+                     command="cmd_bm_newfolder"/>
+      <toolbarbutton id="newseparator" label="&button.newSeparator.label;" 
+                     command="cmd_bm_newseparator"/>
+      <toolbarseparator/>
+      <toolbarbutton id="fileBookmark" label="&command.fileBookmark.label;"
+                     command="cmd_bm_fileBookmark"/>
+      <toolbarseparator/>
+      <toolbarbutton id="properties" label="&command.properties.label;"
+                     command="cmd_bm_properties"/>
+      <toolbarbutton id="rename" label="&command.rename.label;"
+                     command="cmd_bm_rename"/>
+      <toolbarbutton id="delete" label="&command.delete.label;"
+                     command="cmd_bm_delete"/>
+    </toolbar>
+    <toolbar align="center" pack="center">
+      <label value="&find.label;" accesskey="&find.accesskey;" control="search-box"/>
+      <textbox id="search-box" flex="1"
+               type="timed" timeout="500"
+               callback="searchBookmarks(gSearchBox.value);"/>
+    </toolbar>
+  </toolbox>
+  
+  <bookmarks-tree id="bookmarks-view" flex="1"/>
+
+</window>
+
diff --git a/browser/components/bookmarks/content/bookmarksDD-temp.js b/browser/components/bookmarks/content/bookmarksDD-temp.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarksDD.js b/browser/components/bookmarks/content/bookmarksDD.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarksOverlay.js b/browser/components/bookmarks/content/bookmarksOverlay.js
new file mode 100644
index 00000000000..9d4a31d6577
--- /dev/null
+++ b/browser/components/bookmarks/content/bookmarksOverlay.js
@@ -0,0 +1,1002 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+const NC_NS_CMD = NC_NS + "command?cmd=";
+
+/**
+ * XXX - 04/16/01
+ *  ACK! massive command name collision problems are causing big issues
+ *  in getting this stuff to work in the Navigator window. For sanity's 
+ *  sake, we need to rename all the commands to be of the form cmd_bm_*
+ *  otherwise there'll continue to be problems. For now, we're just 
+ *  renaming those that affect the personal toolbar (edit operations,
+ *  which were clashing with the textfield controller)
+ *
+ * There are also several places that need to be updated if you need
+ * to change a command name. 
+ *   1) the controller in ALL clients (bookmarksTree.js, personalToolbar.js)
+ *   2) the command nodes in the overlay
+ *   3) the command human-readable name key in bookmark.properties
+ *   4) the function 'getAllCmds' in bookmarksOverlay.js
+ *   5) the function 'execCommand' in bookmarksOverlay.js
+ * Yes, this blows crusty dead goats through straws, and I should probably
+ * create some constants somewhere to bring this number down to 3. 
+ * However, if you fail to do one of these, you WILL break something
+ * and I WILL come after you with a knife. 
+ */
+
+function LITERAL (aDB, aElement, aPropertyID)
+{
+  var RDF = BookmarksUIElement.prototype.RDF;
+  var rSource = RDF.GetResource(aElement.id);
+  var rProperty = RDF.GetResource(aPropertyID);
+  var node = aDB.GetTarget(rSource, rProperty, true);
+  return node ? node.QueryInterface(Components.interfaces.nsIRDFLiteral).Value : "";
+}
+
+function BookmarksUIElement () { }
+BookmarksUIElement.prototype = {
+  _rdf: null,
+  get RDF ()
+  {
+    if (!this._rdf) {
+      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFIID = Components.interfaces.nsIRDFService;
+      this._rdf = Components.classes[kRDFContractID].getService(kRDFIID);
+    }
+    return this._rdf;
+  },
+
+  propertySet: function (sourceID, propertyID, newValue)
+  {
+    if (!newValue) return;
+    const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+    const kRDFIID = Components.interfaces.nsIRDFService;
+    const kRDF = Components.classes[kRDFContractID].getService(kRDFIID);
+    // need to shuffle this into an API. 
+    const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+    const krProperty = kRDF.GetResource(propertyID);
+    const krItem = kRDF.GetResource(sourceID);
+    var rCurrValue = kBMDS.GetTarget(krItem, krProperty, true);
+    const krNewValue = kRDF.GetLiteral(newValue);
+    if (!rCurrValue)
+      kBMDS.Assert(krItem, krProperty, krNewValue, true);
+    else {
+      rCurrValue = rCurrValue.QueryInterface(Components.interfaces.nsIRDFLiteral);
+      if (rCurrValue.Value != newValue) 
+        kBMDS.Change(krItem, krProperty, rCurrValue, krNewValue);
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Fill a context menu popup with menuitems that are appropriate for the current
+  // selection.
+  createContextMenu: function (aEvent)
+  {
+    var popup = aEvent.target;
+    // clear out the old context menu contents (if any)
+    while (popup.hasChildNodes()) 
+      popup.removeChild(popup.firstChild);
+    
+    var popupNode = document.popupNode;
+    
+    if (!("findRDFNode" in this))
+      throw "Clients must implement findRDFNode!";
+    var itemNode = this.findRDFNode(popupNode, true);
+    if (!itemNode || !itemNode.getAttributeNS(RDF_NS, "type") || itemNode.getAttribute("mode") == "edit") {
+      aEvent.preventDefault();
+      return;
+    }
+    if (!("getContextSelection" in this)) 
+      throw "Clients must implement getContextSelection!";
+    var selection = this.getContextSelection (itemNode);
+    var commonCommands = [];
+    for (var i = 0; i < selection.length; ++i) {
+      var commands = this.getAllCmds(selection[i].id);
+      if (!commands) {
+        aEvent.preventDefault();
+        return;
+      }
+      commands = this.flattenEnumerator(commands);
+      if (!commonCommands.length) commonCommands = commands;
+      commonCommands = this.findCommonNodes(commands, commonCommands);
+    }
+
+    if (!commonCommands.length) {
+      aEvent.preventDefault();
+      return;
+    }
+    
+    // Now that we should have generated a list of commands that is valid
+    // for the entire selection, build a context menu.
+    for (i = 0; i < commonCommands.length; ++i) {
+      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+      var currCommand = commonCommands[i].QueryInterface(Components.interfaces.nsIRDFResource).Value;
+      var element = null;
+      if (currCommand != NC_NS_CMD + "bm_separator") {
+        var commandName = this.getCommandName(currCommand);
+        element = this.createMenuItem(commandName, currCommand, itemNode);
+      }
+      else if (i != 0 && i < commonCommands.length-1) {
+        // Never append a separator as the first or last element in a context
+        // menu.
+        element = document.createElementNS(kXULNS, "menuseparator");
+      }
+      
+      if (element) 
+        popup.appendChild(element);
+    }
+    return;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Given two unique arrays, return an array that contains only the elements
+  // common to both. 
+  findCommonNodes: function (aNewArray, aOldArray)
+  {
+    var common = [];
+    for (var i = 0; i < aNewArray.length; ++i) {
+      for (var j = 0; j < aOldArray.length; ++j) {
+        if (common.length > 0 && common[common.length-1] == aNewArray[i])
+          continue;
+        if (aNewArray[i] == aOldArray[j])
+          common.push(aNewArray[i]);
+      }
+    }
+    return common;
+  },
+
+  flattenEnumerator: function (aEnumerator)
+  {
+    if ("_index" in aEnumerator)
+      return aEnumerator._inner;
+    
+    var temp = [];
+    while (aEnumerator.hasMoreElements()) 
+      temp.push(aEnumerator.getNext());
+    return temp;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // For a given URI (a unique identifier of a resource in the graph) return 
+  // an enumeration of applicable commands for that URI. 
+  getAllCmds: function (aNodeID)
+  {
+    var type = BookmarksUtils.resolveType(aNodeID);
+    if (!type) {
+      if (aNodeID == "NC:PersonalToolbarFolder" || aNodeID == "NC:BookmarksRoot")
+        type = "http://home.netscape.com/NC-rdf#Folder";
+      else
+        return null;
+    }
+    var commands = [];
+    // menu order:
+    // 
+    // bm_open
+    // bm_openfolder
+    // bm_openinnewwindow
+    // /* bm_openinnewtab not yet supported */
+    // ---------------------
+    // /* bm_find removed */
+    // bm_newfolder
+    // ---------------------
+    // bm_cut
+    // bm_copy
+    // bm_paste
+    // bm_fileBookmark
+    // ---------------------
+    // bm_delete
+    // bm_rename
+    // ---------------------
+    // bm_properties
+    switch (type) {
+    case "http://home.netscape.com/NC-rdf#BookmarkSeparator":
+      commands = ["bm_newfolder", "bm_separator", 
+                  "bm_cut", "bm_copy", "bm_paste", "bm_separator",
+                  "bm_delete"];
+      break;
+    case "http://home.netscape.com/NC-rdf#Bookmark":
+      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
+                  "bm_newfolder", "bm_separator",
+                  "bm_cut", "bm_copy", "bm_paste", "bm_fileBookmark", "bm_separator",
+                  "bm_delete", "bm_rename", "bm_separator",
+                  "bm_properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#Folder":
+      commands = ["bm_openfolder", "bm_openinnewwindow", "bm_separator", 
+                  "bm_newfolder", "bm_separator",
+                  "bm_cut", "bm_copy", "bm_paste", "bm_fileBookmark", "bm_separator",
+                  "bm_delete", "bm_rename", "bm_separator",
+                  "bm_properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#IEFavoriteFolder":
+      commands = ["bm_openfolder", "bm_separator",
+                  "bm_delete"];
+      break;
+    case "http://home.netscape.com/NC-rdf#IEFavorite":
+      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
+                  "bm_copy"];
+      break;
+    case "http://home.netscape.com/NC-rdf#FileSystemObject":
+      commands = ["bm_open", "bm_openinnewwindow", /* "bm_openinnewtab", */ "bm_separator",
+                  "bm_copy"];
+      break;
+    default: 
+      var source = this.RDF.GetResource(aNodeID);
+      return this.db.GetAllCmds(source);
+    }
+    return new CommandArrayEnumerator(commands);
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Retrieve the human-readable name for a particular command. Used when 
+  // manufacturing a UI to invoke commands.
+  getCommandName: function (aCommand) 
+  {
+    var cmdName = aCommand.substring(NC_NS_CMD.length);
+    try {
+      // Note: this will succeed only if there's a string in the bookmarks
+      //       string bundle for this command name. Otherwise, <xul:stringbundle/>
+      //       will throw, we'll catch & stifle the error, and look up the command
+      //       name in the datasource. 
+      return BookmarksUtils.getLocaleString ("cmd_" + cmdName);
+    }
+    catch (e) {
+    }   
+    // XXX - WORK TO DO HERE! (rjc will cry if we don't fix this) 
+    // need to ask the ds for the commands for this node, however we don't
+    // have the right params. This is kind of a problem. 
+    dump("*** BAD! EVIL! WICKED! NO! ACK! ARGH! ORGH!\n");
+    const rName = this.RDF.GetResource(NC_NS + "Name");
+    const rSource = this.RDF.GetResource(aNodeID);
+    return this.db.GetTarget(rSource, rName, true).Value;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Perform a command based on a UI event. XXX - work to do here. 
+  preExecCommand: function (aEvent)
+  {
+    var commandID = aEvent.target.getAttribute("cmd");
+    if (!commandID) return;
+    goDoCommand("cmd_" + commandID.substring(NC_NS_CMD.length));
+  },
+  
+  execCommand: function (aCommandID) 
+  {
+    var args = [];
+    var selection = this.getSelection ();
+    if (selection.length >= 1) 
+      var selectedItem = selection[0];
+    switch (aCommandID) {
+    case "bm_open":
+      this.open(null, selectedItem, false);
+      break;
+    case "bm_openfolder":
+      this.commands.openFolder(selectedItem);
+      break;
+    case "bm_openinnewwindow":
+      if (BookmarksUtils.resolveType(selectedItem.id) == NC_NS + "Folder")
+        this.openFolderInNewWindow(selectedItem);
+      else
+        this.open(null, selectedItem, true);
+      break;
+    case "bm_rename":
+      // XXX - this is SO going to break if we ever do column re-ordering.
+      this.commands.editCell(selectedItem, 0);
+      break;
+    case "bm_editurl":
+      this.commands.editCell(selectedItem, 1);
+      break;
+    case "bm_setnewbookmarkfolder":
+    case "bm_setpersonaltoolbarfolder":
+    case "bm_setnewsearchfolder":
+      BookmarksUtils.doBookmarksCommand(selectedItem.id, NC_NS_CMD + aCommandID, args);
+      // XXX - The containing node seems to be closed here and the 
+      //       focus/selection is destroyed.
+      this.selectElement(selectedItem);
+      break;
+    case "bm_properties":
+      this.showPropertiesForNode(selectedItem);
+      break;
+    case "bm_find":
+      this.findInBookmarks();
+      break;
+    case "bm_cut":
+      this.copySelection(selection);
+      this.deleteSelection(selection);
+      break;
+    case "bm_copy":
+      this.copySelection(selection);
+      break;
+    case "bm_paste":
+      this.paste(selection);
+      break;
+    case "bm_delete":
+      this.deleteSelection(selection);
+      break;
+    case "bm_fileBookmark":
+      var rv = { selectedFolder: null };      
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=yes", null, null, folder, null, "selectFolder", rv);
+      if (rv.selectedFolder) {
+        for (var k = 0; k < selection.length; ++k) {
+          if (selection[k].id == rv.selectedFolder)
+            return; // Selection contains the target folder. Just fail silently.
+        }
+        var additiveFlag = false;
+        var selectedItems = [].concat(this.getSelection())
+        for (var i = 0; i < selectedItems.length; ++i) {
+          var currItem = selectedItems[i];
+          var currURI = currItem.id;
+          var parent = gBookmarksShell.findRDFNode(currItem, false);
+          gBookmarksShell.moveBookmark(currURI, parent.id, rv.selectedFolder);
+          gBookmarksShell.selectFolderItem(rv.selectedFolder, currURI, additiveFlag);
+          if (!additiveFlag) additiveFlag = true;
+        }
+        gBookmarksShell.flushDataSource();
+      }
+      break;
+    case "bm_newfolder":
+      var nfseln = document.popupNode;
+      this.commands.createBookmarkItem("folder", nfseln);
+      break;
+    case "bm_newbookmark":
+      var folder = this.getSelectedFolder();
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,modal=yes,dialog=yes,resizable=no", null, null, folder, null, "newBookmark");
+      break;
+    case "bm_newseparator":
+      nfseln = this.getBestItem();
+      var parentNode = this.findRDFNode(nfseln, false);
+      args = [{ property: NC_NS + "parent", 
+                resource: parentNode.id }];
+      BookmarksUtils.doBookmarksCommand(nfseln.id, NC_NS_CMD + "newseparator", args);
+      break;
+    case "bm_import":
+    case "bm_export":
+      const isImport = aCommandID == "bm_import";
+      try {
+        const kFilePickerContractID = "@mozilla.org/filepicker;1";
+        const kFilePickerIID = Components.interfaces.nsIFilePicker;
+        const kFilePicker = Components.classes[kFilePickerContractID].createInstance(kFilePickerIID);
+        
+        const kTitle = BookmarksUtils.getLocaleString(isImport ? "SelectImport": "EnterExport");
+        kFilePicker.init(window, kTitle, kFilePickerIID[isImport ? "modeOpen" : "modeSave"]);
+        kFilePicker.appendFilters(kFilePickerIID.filterHTML | kFilePickerIID.filterAll);
+        if (!isImport) kFilePicker.defaultString = "bookmarks.html";
+        if (kFilePicker.show() != kFilePickerIID.returnCancel) {
+          var fileName = kFilePicker.fileURL.spec;
+          if (!fileName) break;
+        }
+        else break;
+      }
+      catch (e) {
+        break;
+      }
+      var seln = this.getBestItem();
+      args = [{ property: NC_NS + "URL", literal: fileName}];
+      BookmarksUtils.doBookmarksCommand(seln.id, NC_NS_CMD + aCommandID, args);
+      break;
+    }
+  },
+  
+  openFolderInNewWindow: function (aSelectedItem)
+  {
+    openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
+               "", "chrome,all,dialog=no", aSelectedItem.id);
+  },
+  
+  copySelection: function (aSelection)
+  {
+    const kSuppArrayContractID = "@mozilla.org/supports-array;1";
+    const kSuppArrayIID = Components.interfaces.nsISupportsArray;
+    var itemArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+
+    const kSuppWStringContractID = "@mozilla.org/supports-string;1";
+    const kSuppWStringIID = Components.interfaces.nsISupportsString;
+    var bmstring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
+    var unicodestring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
+    var htmlstring = Components.classes[kSuppWStringContractID].createInstance(kSuppWStringIID);
+  
+    var sBookmarkItem = ""; var sTextUnicode = ""; var sTextHTML = "";
+    for (var i = 0; i < aSelection.length; ++i) {
+      var url = LITERAL(this.db, aSelection[i], NC_NS + "URL");
+      var name = LITERAL(this.db, aSelection[i], NC_NS + "Name");
+      sBookmarkItem += aSelection[i].id + "\n";
+      sTextUnicode += url + "\n";
+      sTextHTML += "<A HREF=\"" + url + "\">" + name + "</A>";
+    }    
+    
+    const kXferableContractID = "@mozilla.org/widget/transferable;1";
+    const kXferableIID = Components.interfaces.nsITransferable;
+    var xferable = Components.classes[kXferableContractID].createInstance(kXferableIID);
+
+    xferable.addDataFlavor("moz/bookmarkclipboarditem");
+    bmstring.data = sBookmarkItem;
+    xferable.setTransferData("moz/bookmarkclipboarditem", bmstring, sBookmarkItem.length*2)
+    
+    xferable.addDataFlavor("text/html");
+    htmlstring.data = sTextHTML;
+    xferable.setTransferData("text/html", htmlstring, sTextHTML.length*2)
+    
+    xferable.addDataFlavor("text/unicode");
+    unicodestring.data = sTextUnicode;
+    xferable.setTransferData("text/unicode", unicodestring, sTextUnicode.length*2)
+    
+    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
+    const kClipboardIID = Components.interfaces.nsIClipboard;
+    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
+    clipboard.setData(xferable, null, kClipboardIID.kGlobalClipboard);
+  },
+
+  paste: function (aSelection)
+  {
+    const kXferableContractID = "@mozilla.org/widget/transferable;1";
+    const kXferableIID = Components.interfaces.nsITransferable;
+    var xferable = Components.classes[kXferableContractID].createInstance(kXferableIID);
+    xferable.addDataFlavor("moz/bookmarkclipboarditem");
+    xferable.addDataFlavor("text/x-moz-url");
+    xferable.addDataFlavor("text/unicode");
+
+    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
+    const kClipboardIID = Components.interfaces.nsIClipboard;
+    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
+    clipboard.getData(xferable, kClipboardIID.kGlobalClipboard);
+    
+    var flavour = { };
+    var data = { };
+    var length = { };
+    xferable.getAnyTransferData(flavour, data, length);
+    var nodes = []; var names = [];
+    data = data.value.QueryInterface(Components.interfaces.nsISupportsString).data;
+    switch (flavour.value) {
+    case "moz/bookmarkclipboarditem":
+      nodes = data.split("\n");
+      break;
+    case "text/x-moz-url":
+      var ix = data.indexOf("\n");
+      nodes.push(data.substring(0, ix != -1 ? ix : data.length));
+      names.push(data.substring(ix));
+      break;
+    default: 
+      return;
+    }
+    
+    const lastSelected = aSelection[aSelection.length-1];  
+    const kParentNode = this.resolvePasteFolder(aSelection);
+    const krParent = this.RDF.GetResource(kParentNode.id);
+    const krSource = this.RDF.GetResource(lastSelected.id);
+    
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+
+    var additiveFlag = false;
+    for (var i = 0; i < nodes.length; ++i) {
+      if (!nodes[i]) continue;
+      var rCurrent = this.RDF.GetResource(nodes[i]);
+      const krTypeProperty = this.RDF.GetResource(RDF_NS + "type");
+      var rType = this.db.GetTarget(rCurrent, krTypeProperty, true);
+      try {
+        rType = rType.QueryInterface(Components.interfaces.nsIRDFResource);
+      }
+      catch (e) {
+        try {
+          rType = rType.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        }
+        catch (e) {
+          // OK, no type exists, so node does not exist in the graph. 
+          // (e.g. user pastes url as text)
+          // Do some housekeeping. 
+          const krName = this.RDF.GetResource(names[i]);
+          const krNameProperty = this.RDF.GetResource(NC_NS + "Name");
+          const krBookmark = this.RDF.GetResource(NC_NS + "Bookmark");
+          kBMDS.Assert(rCurrent, krNameProperty, krName, true);
+          kBMDS.Assert(rCurrent, krTypeProperty, krBookmark, true);
+        }
+      }
+
+      // If the node is a folder, then we need to create a new anonymous 
+      // resource and copy all the arcs over.
+      if (rType && rType.Value == NC_NS + "Folder")
+        rCurrent = BookmarksUtils.cloneFolder(rCurrent, krParent, krSource);
+
+      // If this item already exists in this container, don't paste, as 
+      // this will result in the creation of multiple copies in the datasource
+      // but will not result in an update of the UI. (In Short: we don't
+      // handle multiple bookmarks well)
+      ksRDFC.Init(kBMDS, krParent);
+      ix = ksRDFC.IndexOf(rCurrent);
+      if (ix != -1)
+        continue;
+
+      ix = ksRDFC.IndexOf(krSource);
+      if (ix != -1) 
+        ksRDFC.InsertElementAt(rCurrent, ix+1, true);
+      else
+        ksRDFC.AppendElement(rCurrent);
+      this.selectFolderItem(krSource.Value, rCurrent.Value, additiveFlag);
+      if (!additiveFlag) additiveFlag = true;
+
+      var rds = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+      rds.Flush();
+    }
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // For the given selection, determines the element that should form the 
+  // container to paste items into.
+  resolvePasteFolder: function (aSelection)
+  {
+    const lastSelected = aSelection[aSelection.length-1];  
+    if (lastSelected.getAttribute("container") == "true" &&
+        aSelection.length == 1)
+      return lastSelected;
+    return this.findRDFNode(lastSelected, false);
+  },
+  
+  canPaste: function ()
+  {
+    const kClipboardContractID = "@mozilla.org/widget/clipboard;1";
+    const kClipboardIID = Components.interfaces.nsIClipboard;
+    var clipboard = Components.classes[kClipboardContractID].getService(kClipboardIID);
+    const kSuppArrayContractID = "@mozilla.org/supports-array;1";
+    const kSuppArrayIID = Components.interfaces.nsISupportsArray;
+    var flavourArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+    const kSuppStringContractID = "@mozilla.org/supports-cstring;1";
+    const kSuppStringIID = Components.interfaces.nsISupportsCString;
+    
+    var flavours = ["moz/bookmarkclipboarditem", "text/x-moz-url"];
+    for (var i = 0; i < flavours.length; ++i) {
+      const kSuppString = Components.classes[kSuppStringContractID].createInstance(kSuppStringIID);
+      kSuppString.data = flavours[i];
+      flavourArray.AppendElement(kSuppString);
+    }
+    var hasFlavours = clipboard.hasDataMatchingFlavors(flavourArray, kClipboardIID.kGlobalClipboard);
+    return hasFlavours;
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // aSelection is a mutable array, not a NodeList. 
+  deleteSelection: function (aSelection)
+  {
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+
+    var nextElement;
+    var count = 0;
+
+    var selectionLength = aSelection.length;
+    while (aSelection.length && aSelection[count]) {
+      const currParent = this.findRDFNode(aSelection[count], false);
+      const kSelectionURI = aSelection[count].id;
+
+      // Disallow the removal of certain 'special' nodes
+      if (kSelectionURI == "NC:BookmarksRoot") {
+        aSelection.splice(count++,1);
+        continue;
+      }
+
+      // If the current bookmark is the IE Favorites folder, we have a little
+      // extra work to do - set the pref |browser.bookmarks.import_system_favorites|
+      // to ensure that we don't re-import next time. 
+      if (aSelection[count].getAttribute("type") == (NC_NS + "IEFavoriteFolder")) {
+        const kPrefSvcContractID = "@mozilla.org/preferences-service;1";
+        const kPrefSvcIID = Components.interfaces.nsIPrefBranch;
+        const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+        kPrefSvc.setBoolPref("browser.bookmarks.import_system_favorites", false);
+      }
+        
+      const krParent = this.RDF.GetResource(currParent.id);
+      const krBookmark = this.RDF.GetResource(kSelectionURI);
+      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+
+      ksRDFC.Init(kBMDS, krParent);
+      nextElement = this.getNextElement(aSelection[count]);
+      ksRDFC.RemoveElement(krBookmark, true);
+
+      try {
+        // XXX - UGH. Template builder is NOT removing the element from the
+        //       tree, and so selection remains non-zero in length and we go into
+        //       an infinite loop here. Tear the node out of the document. 
+        var parent = aSelection[count].parentNode;
+        parent.removeChild(aSelection[count]);
+      }
+      catch (e) {
+      }
+      // Manipulate the selection array ourselves. 
+      aSelection.splice(count,1);
+    }
+    this.selectElement(nextElement);
+  },
+
+  moveBookmark: function (aBookmarkURI, aFromFolderURI, aToFolderURI)
+  {
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    const kRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+    const krSrc = this.RDF.GetResource(aBookmarkURI);
+    const krOldParent = this.RDF.GetResource(aFromFolderURI);
+    const krNewParent = this.RDF.GetResource(aToFolderURI);
+    kRDFC.Init(kBMDS, krNewParent);
+    kRDFC.AppendElement(krSrc);
+    kRDFC.Init(kBMDS, krOldParent);
+    kRDFC.RemoveElement(krSrc, true);
+  },
+  
+  open: function (aEvent, aRDFNode, aInNewWindow) 
+  { 
+    var urlValue = LITERAL(this.db, aRDFNode, NC_NS + "URL");
+    
+    // Ignore "NC:" and empty urls.
+    if (urlValue.substring(0,3) == "NC:" || !urlValue) return;
+    
+    if (aEvent && aEvent.altKey)   
+      this.showPropertiesForNode (aRDFNode);
+    else if (aInNewWindow)
+      openDialog (getBrowserURL(), "_blank", "chrome,all,dialog=no", urlValue);
+    else
+      openTopWin (urlValue);
+    if (aEvent) 
+      aEvent.preventBubble();
+  },
+
+  showPropertiesForNode: function (aBookmarkItem) 
+  {
+    if (aBookmarkItem.getAttribute("type") != NC_NS + "BookmarkSeparator") 
+      openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
+                 "", "centerscreen,chrome,resizable=no", aBookmarkItem.id);
+  },
+
+  findInBookmarks: function ()
+  {
+    openDialog("chrome://communicator/content/bookmarks/findBookmark.xul",
+               "FindBookmarksWindow",
+               "centerscreen,resizable=no,chrome,dependent");
+  },
+
+  flushDataSource: function ()
+  {
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    remoteDS.Flush();
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // takes a node and adds the appropriate adornments for a bookmark container. 
+  createBookmarkFolderDecorations: function (aNode)
+  {
+    aNode.setAttribute("type", "http://home.netscape.com/NC-rdf#Folder");
+    aNode.setAttribute("container", "true");
+    return aNode;
+  }
+};
+
+function CommandArrayEnumerator (aCommandArray)
+{
+  this._inner = [];
+  const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+  const kRDFIID = Components.interfaces.nsIRDFService;
+  const RDF = Components.classes[kRDFContractID].getService(kRDFIID);
+  for (var i = 0; i < aCommandArray.length; ++i)
+    this._inner.push(RDF.GetResource(NC_NS_CMD + aCommandArray[i]));
+    
+  this._index = 0;
+}
+
+CommandArrayEnumerator.prototype = {
+  getNext: function () 
+  {
+    return this._inner[this._index];
+  },
+  
+  hasMoreElements: function ()
+  {
+    return this._index < this._inner.length;
+  }
+};
+
+var BookmarksUtils = {
+
+  _rdf: null,
+  get RDF ()
+  {
+    if (!this._rdf) {
+      const kRDFContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFIID = Components.interfaces.nsIRDFService;
+      this._rdf = Components.classes[kRDFContractID].getService(kRDFIID);
+    }
+    return this._rdf;
+  },
+
+  _bmds: null,
+  get BMDS ()
+  {
+    if (!this._bmds) {
+      this._bmds = this.RDF.GetDataSource("rdf:bookmarks");
+    }
+    return this._bmds;
+  },
+
+  _bundle        : null,
+  _brandShortName: null,
+
+  /////////////////////////////////////////////////////////////////////////////////////
+  // returns a property from chrome://communicator/locale/bookmarks/bookmark.properties
+  getLocaleString: function (aStringKey)
+  {
+    if (!this._bundle) {
+      this._bundle         = document.getElementById("bundle_bookmarks");
+      this._brandShortName = document.getElementById("bundle_brand")
+                                     .getString("brandShortName");
+    }
+    bundle = this._bundle.getString(aStringKey)
+                 .replace(/%brandShortName%/, this._brandShortName);
+    return bundle;
+  },
+    
+  /////////////////////////////////////////////////////////////////////////////
+  // Determine the rdf:type property for the given resource.
+  resolveType: function (aResource)
+  {
+    var rElement;
+    if (typeof(aResource) == "string")
+      rElement = this.RDF.GetResource(aResource);
+    else
+      rElement = aResource;
+
+    const typeArc = this.RDF.GetResource(RDF_NS + "type");
+    const type    = this.BMDS.GetTarget(rElement, typeArc, true);
+    try {
+      return type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
+    }
+    catch (e) {
+      try { 
+        return type.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+      }
+      catch (e) {
+        return null;
+      }
+    }    
+  },
+
+  ///////////////////////////////////////////////////////////////////////////
+  // Execute a command with the given source and arguments
+  doBookmarksCommand: function (aSourceURI, aCommand, aArgumentsArray)
+  {
+    var rCommand = this.RDF.GetResource(aCommand);
+  
+    var kSuppArrayContractID = "@mozilla.org/supports-array;1";
+    var kSuppArrayIID = Components.interfaces.nsISupportsArray;
+    var sourcesArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+    if (aSourceURI) {
+      var rSource = this.RDF.GetResource(aSourceURI);
+      sourcesArray.AppendElement (rSource);
+    }
+  
+    var argsArray = Components.classes[kSuppArrayContractID].createInstance(kSuppArrayIID);
+    for (var i = 0; i < aArgumentsArray.length; ++i) {
+      var rArc = this.RDF.GetResource(aArgumentsArray[i].property);
+      argsArray.AppendElement(rArc);
+      var rValue = null;
+      if ("resource" in aArgumentsArray[i]) { 
+        rValue = this.RDF.GetResource(aArgumentsArray[i].resource);
+      }
+      else
+        rValue = this.RDF.GetLiteral(aArgumentsArray[i].literal);
+      argsArray.AppendElement(rValue);
+    }
+
+    // Exec the command in the Bookmarks datasource. 
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    kBMDS.DoCommand(sourcesArray, rCommand, argsArray);
+  },
+
+  cloneFolder: function (aFolder, aParent, aRelativeItem) 
+  {
+    var BMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    
+    var nameArc = this.RDF.GetResource(NC_NS + "Name");
+    var rName = BMDS.GetTarget(aFolder, nameArc, true);
+    rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+    
+    var newFolder = this.createFolderWithID(rName.Value, aRelativeItem, aParent);
+    
+    // Now need to append kiddies. 
+    try {
+      const kRDFCContractID = "@mozilla.org/rdf/container;1";
+      const kRDFCIID = Components.interfaces.nsIRDFContainer;
+      var RDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+      const kRDFCUContractID = "@mozilla.org/rdf/container-utils;1";
+      const kRDFCUIID = Components.interfaces.nsIRDFContainerUtils;
+      var RDFCU = Components.classes[kRDFCUContractID].getService(kRDFCUIID);
+
+      RDFC.Init(BMDS, aFolder);
+      var elts = RDFC.GetElements();
+      RDFC.Init(BMDS, newFolder);
+
+      while (elts.hasMoreElements()) {
+        var curr = elts.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+        if (RDFCU.IsContainer(BMDS, curr))
+          BookmarksUtils.cloneFolder(curr, newFolder);
+        else
+          RDFC.AppendElement(curr);
+      }
+    }
+    catch (e) {
+    }
+    return newFolder;
+  },
+  
+  createFolderWithID: function (aTitle, aRelativeItem, aParentFolder)
+  {
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFCIID = Components.interfaces.nsIRDFContainer;
+    var RDFC = Components.classes[kRDFCContractID].createInstance(kRDFCIID);
+    var BMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    try {
+      RDFC.Init(BMDS, aParentFolder);
+    }
+    catch (e) {
+      return null;
+    }
+
+    var ix = RDFC.IndexOf(aRelativeItem);
+    var BMSvc = BMDS.QueryInterface(Components.interfaces.nsIBookmarksService);
+    return BMSvc.createFolderWithDetails(aTitle, aParentFolder, ix);
+  },
+
+  addBookmarkForTabBrowser: function( aTabBrowser, aSelect )
+  {
+    var tabsInfo = [];
+    var currentTabInfo = { name: "", url: "", charset: null };
+
+    const activeBrowser = aTabBrowser.selectedBrowser;
+    const browsers = aTabBrowser.browsers;
+    for (var i = 0; i < browsers.length; ++i) {
+      var webNav = browsers[i].webNavigation;
+      var url = webNav.currentURI.spec;
+      var name = "";
+      var charset;
+      try {
+        var doc = webNav.document;
+        name = doc.title || url;
+        charset = doc.characterSet;
+      } catch (e) {
+        name = url;
+      }
+
+      tabsInfo[i] = { name: name, url: url, charset: charset };
+
+      if (browsers[i] == activeBrowser)
+        currentTabInfo = tabsInfo[i];
+    }
+
+    openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "",
+               "centerscreen,chrome,dialog=yes,resizable,dependent",
+               currentTabInfo.name, currentTabInfo.url, null,
+               currentTabInfo.charset, "addGroup" + (aSelect ? ",group" : ""), tabsInfo);
+  },
+
+  addBookmarkForBrowser: function (aDocShell, aShowDialog)
+  {
+    // Bug 52536: We obtain the URL and title from the nsIWebNavigation 
+    //            associated with a <browser/> rather than from a DOMWindow.
+    //            This is because when a full page plugin is loaded, there is
+    //            no DOMWindow (?) but information about the loaded document
+    //            may still be obtained from the webNavigation. 
+    var url = aDocShell.currentURI.spec;
+    var title, docCharset = null;
+    try {
+      title = aDocShell.document.title || url;
+      docCharset = aDocShell.document.characterSet;
+    }
+    catch (e) {
+      title = url;
+    }
+
+    this.addBookmark(url, title, docCharset, aShowDialog);
+  },
+  
+  addBookmark: function (aURL, aTitle, aCharset, aShowDialog)
+  {
+    if (aCharset === undefined) {
+      var fw = document.commandDispatcher.focusedWindow;
+      aCharset = fw.document.characterSet;
+    }
+
+    if (aShowDialog)
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,dialog=yes,resizable,dependent", aTitle, aURL, null, aCharset);
+    else {
+      // User has elected to override the file dialog and always file bookmarks
+      // into the default bookmark folder. 
+      const kBMSvcContractID = "@mozilla.org/browser/bookmarks-service;1";
+      const kBMSvcIID = Components.interfaces.nsIBookmarksService;
+      const kBMSvc = Components.classes[kBMSvcContractID].getService(kBMSvcIID);
+      kBMSvc.addBookmarkImmediately(aURL, aTitle, kBMSvcIID.BOOKMARK_DEFAULT_TYPE, aCharset);
+    }
+  },
+
+  getSpecialFolder: function (aID)
+  {
+    var sources = this.BMDS.GetSources(this.RDF.GetResource("http://home.netscape.com/NC-rdf#FolderType"),
+                                       this.RDF.GetResource(aID), true);
+    var folder = null;
+    if (sources.hasMoreElements())
+      folder = sources.getNext();
+    else 
+      folder = this.RDF.GetResource("NC:BookmarksRoot");
+    return folder;
+  },
+
+  getNewBookmarkFolder: function()
+  {
+    return this.getSpecialFolder("NC:NewBookmarkFolder");
+  },
+
+  getNewSearchFolder: function()
+  {
+    return this.getSpecialFolder("NC:NewSearchFolder");
+  }
+
+}
+
+var ContentUtils = {
+  childByLocalName: function (aSelectedItem, aLocalName)
+  {
+    var temp = aSelectedItem.firstChild;
+    while (temp) {
+      if (temp.localName == aLocalName)
+        return temp;
+      temp = temp.nextSibling;
+    }
+    return null;
+  }
+};
+
+
+
+
+
+
diff --git a/browser/components/bookmarks/content/bookmarksOverlay.xul b/browser/components/bookmarks/content/bookmarksOverlay.xul
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/bookmarksPanel.js b/browser/components/bookmarks/content/bookmarksPanel.js
new file mode 100644
index 00000000000..9b52e6bdcd9
--- /dev/null
+++ b/browser/components/bookmarks/content/bookmarksPanel.js
@@ -0,0 +1,64 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Get the two bookmarks utility libraries running, attach controllers, focus
+// tree widget, etc. 
+function Startup() 
+{
+  var bookmarksView = document.getElementById("bookmarks-view");  
+  bookmarksView.treeBoxObject.selection.select(0);
+}
+
+function manageBookmarks() {
+  openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", "", "chrome,dialog=no,resizable=yes");
+}
+
+function addBookmark() {
+  var contentArea = top.document.getElementById('content');                   
+  if (contentArea) {
+    const browsers = contentArea.browsers;
+    if (browsers.length > 1)
+      BookmarksUtils.addBookmarkForTabBrowser(contentArea);
+    else
+      BookmarksUtils.addBookmarkForBrowser(contentArea.webNavigation, true);    
+  }
+  else
+    BookmarksUtils.addBookmark(null, null, undefined, true);
+}
diff --git a/browser/components/bookmarks/content/bookmarksTree.js b/browser/components/bookmarks/content/bookmarksTree.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/findBookmark.js b/browser/components/bookmarks/content/findBookmark.js
new file mode 100644
index 00000000000..3b6ec664f8e
--- /dev/null
+++ b/browser/components/bookmarks/content/findBookmark.js
@@ -0,0 +1,97 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is 
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Ben Goodger <ben@netscape.com> (Original Author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the NPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+const BMARKS_CONTRACTID        = "@mozilla.org/browser/bookmarks-service;1";
+const nsIBookmarksService      = Components.interfaces.nsIBookmarksService;
+
+var gOKButton;
+var gSearchField;
+function Startup()
+{
+  var bundle = document.getElementById("bookmarksBundle");
+  gOKButton = document.documentElement.getButton("accept");
+  gOKButton.label = bundle.getString("search_button_label");
+  gOKButton.disabled = true;
+  gSearchField = document.getElementById("searchField");
+  gSearchField.focus();
+}
+var gCreatingNewWindow = false;
+function find()
+{
+  // Build up a find URI from the search fields and open a new window
+  // rooted on the URI. 
+  var match = document.getElementById("matchList");
+  var method = document.getElementById("methodList");
+  var searchURI = "find:datasource=rdf:bookmarks"
+  searchURI += "&match=" + match.selectedItem.value;
+  searchURI += "&method=" + method.selectedItem.value;
+  searchURI += "&text=" + escape(gSearchField.value);
+  var bmWindow = findMostRecentWindow("bookmarks:searchresults", "chrome://communicator/content/bookmarks/bookmarks.xul", searchURI);
+  
+  // Update the root of the tree if we're using an existing search window. 
+  if (!gCreatingNewWindow) 
+    bmWindow.document.getElementById("bookmarks-view").tree.setAttribute("ref", searchURI);
+ 
+  bmWindow.focus();
+
+  if (document.getElementById("saveQuery").checked == true)
+  {
+    var bundle = document.getElementById("bookmarksBundle");
+    var findTitle = bundle.stringBundle.formatStringFromName(
+                      "ShortFindTitle", [gSearchField.value], 1);
+    var bmks = Components.classes[BMARKS_CONTRACTID].getService(nsIBookmarksService);
+    bmks.addBookmarkImmediately(searchURI, findTitle, bmks.BOOKMARK_FIND_TYPE, null);
+  }
+
+  return true;
+}
+
+function findMostRecentWindow(aType, aURI, aParam)
+{
+  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+  WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
+  var topWindow = WM.getMostRecentWindow(aType);
+  if (!topWindow) gCreatingNewWindow = true;
+  return topWindow || openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
+                                 "", "chrome,all,dialog=no", aParam);
+}
+
+function doEnabling()
+{
+  gOKButton.disabled = !gSearchField.value;
+}
\ No newline at end of file
diff --git a/browser/components/bookmarks/content/findBookmark.xul b/browser/components/bookmarks/content/findBookmark.xul
new file mode 100644
index 00000000000..b4d3b302cc7
--- /dev/null
+++ b/browser/components/bookmarks/content/findBookmark.xul
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+
+<!-- -*- Mode: HTML; indent-tabs-mode: nil; -*- -->
+<!--
+
+  The contents of this file are subject to the Netscape Public
+  License Version 1.1 (the "License"); you may not use this file
+  except in compliance with the License. You may obtain a copy of
+  the License at http://www.mozilla.org/NPL/
+ 
+  Software distributed under the License is distributed on an "AS
+  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  implied. See the License for the specific language governing
+  rights and limitations under the License.
+ 
+  The Original Code is mozilla.org code.
+ 
+  The Initial Developer of the Original Code is Netscape
+  Communications Corporation.  Portions created by Netscape are
+  Copyright (C) 1998 Netscape Communications Corporation. All
+  Rights Reserved.
+ 
+  Contributor(s): 
+    Ben Goodger <ben@netscape.com> (Original Author)
+-->
+
+<!--
+    "Find Bookmarks" window
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
+
+<dialog id="findBookmarkWindow" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&findBookmark.title;" 
+        onload="Startup();"
+        ondialogaccept="return find();">
+
+  <stringbundle id="bookmarksBundle" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
+
+  <label value="&search.for.label;"/>
+  <hbox align="center">
+    <menulist id="matchList" class="menulist-toolbar">
+      <menupopup>
+        <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&search.name.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#URL" label="&search.url.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#Description" label="&search.description.label;"/>
+        <menuitem value="http://home.netscape.com/NC-rdf#ShortcutURL" label="&search.shortcut.label;"/>
+      </menupopup>
+    </menulist>
+    <menulist id="methodList" class="menulist-toolbar">
+      <menupopup>
+        <menuitem value="contains" label="&search.contains.label;"/>
+        <menuitem value="startswith" label="&search.startswith.label;"/>
+        <menuitem value="endswith" label="&search.endswith.label;"/>
+        <menuitem value="is" label="&search.is.label;"/>
+        <menuitem value="isnot" label="&search.isnot.label;"/>
+        <menuitem value="doesntcontain" label="&search.doesntcontain.label;"/>
+      </menupopup>
+    </menulist>
+    <textbox id="searchField" flex="1" oninput="doEnabling();"/>
+  </hbox>
+  <checkbox id="saveQuery" label="&save.query.label;" />
+</dialog>
+
diff --git a/browser/components/bookmarks/content/manifest.jm b/browser/components/bookmarks/content/manifest.jm
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/oTest.css b/browser/components/bookmarks/content/oTest.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/oTest.xul b/browser/components/bookmarks/content/oTest.xul
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/content/pref-bookmarks.xul b/browser/components/bookmarks/content/pref-bookmarks.xul
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/jar.mn b/browser/components/bookmarks/jar.mn
new file mode 100644
index 00000000000..f0cc43c67c3
--- /dev/null
+++ b/browser/components/bookmarks/jar.mn
@@ -0,0 +1,47 @@
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+browser.jar:
+	content/browser/bookmarks/addBookmark.xul                  (content/addBookmark.xul)        
+  content/browser/bookmarks/addBookmark.js                   (content/addBookmark.js)
+  content/browser/bookmarks/bm-props.js                      (content/bm-props.js)
+  content/browser/bookmarks/bm-props.xul                     (content/bm-props.xul)
+  content/browser/bookmarks/bookmarksDD.js                   (content/bookmarksDD.js)
+  content/browser/bookmarks/bookmarks.xul                    (content/bookmarks.xul)
+  content/browser/bookmarks/bookmarks.js                     (content/bookmarks.js)
+  content/browser/bookmarks/bookmarks.css                    (content/bookmarks.css)
+  content/browser/bookmarks/bookmarks.xml                    (content/bookmarks.xml)
+  content/browser/bookmarks/bookmarksTree.js                 (content/bookmarksTree.js)
+  content/browser/bookmarks/bookmarksOverlay.xul             (content/bookmarksOverlay.xul)
+  content/browser/bookmarks/bookmarksOverlay.js              (content/bookmarksOverlay.js)
+  content/browser/bookmarks/bm-panel.xul                     (content/bm-panel.xul)
+  content/browser/bookmarks/bookmarksPanel.js                (content/bookmarksPanel.js)
+  content/browser/bookmarks/findBookmark.js                  (content/findBookmark.js)
+  content/browser/bookmarks/findBookmark.xul                 (content/findBookmark.xul)
+  content/browser/bookmarks/pref-bookmarks.xul               (content/pref-bookmarks.xul)
+  content/browser/bookmarks/oTest.xul                        (content/oTest.xul)
+
+en-US.jar:
+  locale/en-US/browser/bookmarks/addBookmark.dtd         (locale/addBookmark.dtd)
+  locale/en-US/browser/bookmarks/bm-props.dtd            (locale/bm-props.dtd)
+  locale/en-US/browser/bookmarks/bookmarks.dtd           (locale/bookmarks.dtd)
+  locale/en-US/browser/bookmarks/bookmark.properties     (locale/bookmark.properties)
+  locale/en-US/browser/bookmarks/bookmarksOverlay.dtd    (locale/bookmarksOverlay.dtd)
+  locale/en-US/browser/bookmarks/findBookmark.dtd        (locale/findBookmark.dtd)
+  locale/en-US/browser/bookmarks/pref-bookmarks.dtd      (locale/pref-bookmarks.dtd)
diff --git a/browser/components/bookmarks/locale/MANIFEST b/browser/components/bookmarks/locale/MANIFEST
new file mode 100644
index 00000000000..19c0cda84c4
--- /dev/null
+++ b/browser/components/bookmarks/locale/MANIFEST
@@ -0,0 +1,4 @@
+bm-find.dtd
+bm-props.dtd
+bookmark.properties
+bookmarks.dtd
diff --git a/browser/components/bookmarks/locale/addBookmark.dtd b/browser/components/bookmarks/locale/addBookmark.dtd
new file mode 100644
index 00000000000..e4f8a7c9927
--- /dev/null
+++ b/browser/components/bookmarks/locale/addBookmark.dtd
@@ -0,0 +1,46 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Ben Goodger <ben@netscape.com> (Original Author)
+  --> 
+  
+<!ENTITY newBookmark.title          "Add Bookmark">
+<!ENTITY newbookmark.label          "&brandShortName; will add a bookmark to this page.">
+<!ENTITY name.label                 "Name:">
+<!ENTITY name.accesskey             "n">
+<!ENTITY url.label                  "Location:">
+<!ENTITY url.accesskey              "l">
+<!ENTITY button.createin.label      "Create In &gt;&gt;">
+<!ENTITY button.createin.accesskey  "c">
+<!ENTITY button.createin2.label     "Create In &lt;&lt;">
+<!ENTITY createin.label             "Create in:">
+<!ENTITY createin.accesskey         "i">
+<!ENTITY button.newfolder.label     "New Folder...">
+<!ENTITY button.newfolder.accesskey "w">
+<!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
+<!ENTITY alwayscreateinfolder.accesskey "a">
+<!ENTITY dontshowmessage.tooltip    "When this option is selected, new Bookmarks will be added using the title provided by the page.">
+<!ENTITY button.defaultfolder.label "Use Default">
+<!ENTITY button.defaultfolder.accesskey "d">
+<!ENTITY selectFolder.label         "Choose Folder">
+<!ENTITY addGroup.label             "Bookmark this group of tabs">
+<!ENTITY addGroup.accesskey         "B">
+
+
+
diff --git a/browser/components/bookmarks/locale/bm-props.dtd b/browser/components/bookmarks/locale/bm-props.dtd
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/locale/bookmark.properties b/browser/components/bookmarks/locale/bookmark.properties
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/locale/bookmarks.dtd b/browser/components/bookmarks/locale/bookmarks.dtd
new file mode 100644
index 00000000000..7880f863048
--- /dev/null
+++ b/browser/components/bookmarks/locale/bookmarks.dtd
@@ -0,0 +1,89 @@
+<!-- 
+   - The contents of this file are subject to the Mozilla Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/MPL/
+   - 
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   - 
+   - The Original Code is Mozilla Communicator.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corp. Portions created by Netscape Communications
+   - Corp. are Copyright (C) 1999 Netscape Communications Corp. All
+   - Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Stephen Lamm <slamm@netscape.com>
+   -   Blake Ross <blakeross@telocity.com>
+  --> 
+
+<!-- extracted from ./bookmarks.xul -->
+<!ENTITY menuBar.tooltip               "Menu Bar">
+<!ENTITY bookmarkToolbar.tooltip       "Bookmark Toolbar">
+<!ENTITY menuitem.newBookmark.label    "New Bookmark...">
+<!ENTITY command.newBookmark.accesskey "B">
+<!ENTITY button.newFolder.label        "New Folder...">
+<!ENTITY command.newFolder.accesskey   "F">
+<!ENTITY button.newSeparator.label     "New Separator">
+<!ENTITY command.newSeparator.accesskey "S">
+<!ENTITY menuitem.import.label         "Import...">
+<!ENTITY menuitem.import.accesskey     "i">
+<!ENTITY menuitem.export.label         "Export...">
+<!ENTITY menuitem.export.accesskey     "e">
+<!ENTITY menuitem.find.label           "Search Bookmarks...">
+<!ENTITY command.findBookmarks.label   "Search...">
+<!ENTITY menuitem.find.accesskey       "S">
+<!ENTITY edit.find.keybinding          "f">
+<!ENTITY command.properties.label      "Properties...">
+<!ENTITY command.properties.accesskey  "r">
+<!ENTITY edit.properties.keybinding    "i">
+<!ENTITY command.rename.label          "Rename...">
+<!ENTITY command.delete.label          "Delete">
+<!ENTITY command.fileBookmark.label    "File Bookmark(s)...">
+<!ENTITY command.fileBookmark.accesskey "l">
+<!ENTITY command.addBookmark.label     "Add...">
+<!ENTITY command.manageBookmarks.label "Manage">
+
+
+<!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
+<!ENTITY menuitem.view.command.toolbar.accesskey    "t">
+<!ENTITY menuitem.view.unsorted.label               "Unsorted">
+<!ENTITY menuitem.view.unsorted.accesskey           "u">
+<!ENTITY menuitem.view.ascending.label              "A > Z Sort Order">
+<!ENTITY menuitem.view.ascending.accesskey          "a">
+<!ENTITY menuitem.view.descending.label             "Z > A Sort Order">
+<!ENTITY menuitem.view.descending.accesskey         "z">
+<!ENTITY menuitem.view.show_columns.label           "Show columns">
+<!ENTITY menuitem.view.show_columns.accesskey       "S">
+<!ENTITY menuitem.newbookmarkfolder.label           "Set as New Bookmark Folder">
+<!ENTITY menuitem.newbookmarkfolder.accesskey       "b">
+<!ENTITY menuitem.newinternetsearchfolder.label     "Set as New Internet Search Folder">
+<!ENTITY menuitem.newinternetsearchfolder.accesskey "i">
+<!ENTITY menuitem.personaltoolbarfolder.label       "Set as Personal Toolbar Folder">
+<!ENTITY menuitem.personaltoolbarfolder.accesskey   "p">
+
+<!ENTITY treecol.name.label             "Name">
+<!ENTITY treecol.name.accesskey         "n">
+<!ENTITY treecol.url.label              "Location">
+<!ENTITY treecol.url.accesskey          "l">
+<!ENTITY treecol.shortcut.label         "Keyword">
+<!ENTITY treecol.shortcut.accesskey     "k">
+<!ENTITY treecol.addedon.label          "Added">
+<!ENTITY treecol.addedon.accesskey      "a">
+<!ENTITY treecol.lastmod.label          "Last Modified">
+<!ENTITY treecol.lastmod.accesskey      "m">
+<!ENTITY treecol.lastvisit.label        "Last Visited">
+<!ENTITY treecol.lastvisit.accesskey    "b">
+<!ENTITY treecol.description.label      "Description">
+<!ENTITY treecol.description.accesskey  "d">
+
+<!ENTITY bookmarksWindowTitle.label     "Bookmark Manager">
+
+<!ENTITY find.label                     "Find">
+<!ENTITY find.accesskey                 "F">
+<!ENTITY fileMenu.label                 "File">
+<!ENTITY fileMenu.accesskey             "F">
\ No newline at end of file
diff --git a/browser/components/bookmarks/locale/bookmarksOverlay.dtd b/browser/components/bookmarks/locale/bookmarksOverlay.dtd
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/locale/findBookmark.dtd b/browser/components/bookmarks/locale/findBookmark.dtd
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/browser/components/bookmarks/locale/pref-bookmarks.dtd b/browser/components/bookmarks/locale/pref-bookmarks.dtd
new file mode 100644
index 00000000000..e69de29bb2d