This commit was manufactured by cvs2svn to create branch

'BOOKMARKS_OUTLINER_BRANCH'.

git-svn-id: svn://10.0.0.236/branches/BOOKMARKS_OUTLINER_BRANCH@94684 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl

@@ -1,248 +0,0 @@
-#
-### hostname: bl-bldlnx03.office.mozilla.org
-### uname: Linux bl-bldlnx03.office.mozilla.org 2.6.18-1.2798.fc6 #1 SMP Mon Oct 16 14:54:20 EDT 2006 i686 i686 i386 GNU/Linux
-##
-#
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables.
-
-# $ENV{XPCOM_CC_DO_NOTHING}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Turn graydon's cycle collector on/off
-#$ENV{XPCOM_CC_DO_NOTHING} = 0;
-
-# $ENV{MOZ_PACKAGE_MSI}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Controls whether a MSI package is made.
-# Requires: Windows and a local MakeMSI installation.
-#$ENV{MOZ_PACKAGE_MSI} = 0;
-
-# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
-#-----------------------------------------------------------------------------
-#  Default: scp
-#   Values: scp | rsync
-#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
-# Requires: The selected type requires the command be available both locally
-#           and on the Talkback server.
-#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-
-#- You'll need to change these to suit your machine's needs
-#$DisplayServer = ':0.0';
-
-#- Default values of command-line opts
-#-
-#$BuildDepend       = 1;      # Depend or Clobber
-#$BuildDebug        = 0;      # Debug or Opt (Darwin)
-#$ReportStatus      = 1;      # Send results to server, or not
-#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-#$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
-#$BuildOnce         = 0;      # Build once, don't send results to server
-$TestOnly          = 1;      # Only run tests, don't pull/build
-#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-#$SkipCheckout      = 0;      # Use to debug build process without checking out new source.
-#$BuildLocales      = 0;      # Do l10n packaging?
-
-# Tests
-$CleanProfile             = 1;
-#$ResetHomeDirForTests     = 1;
-#$ProductName              = "Mozilla";
-$VendorName               = 'mozilla';
-
-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 1;
-$AliveTest                = 1;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-#$BloatTest                = 0;  # warren memory bloat test
-#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
-#$DomToTextConversionTest  = 0;  
-#$XpcomGlueTest            = 0;
-$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
-$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
-#$MailBloatTest            = 0;
-#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 1;  # Tp
-$LayoutPerformanceLocalTest   = 1;  # Tp
-$DHTMLPerformanceTest     = 1;  # Tdhtml
-#$QATest                   = 0;  
-$XULWindowOpenTest        = 1;  # Txul
-$StartupPerformanceTest   = 1;  # Ts
-
-$TestsPhoneHome           = 1;  # Should test report back to server?
-$TestOnlyTinderbox = 1;
-$DownloadBuildFile = 'firefox-3.0a7pre.en-US.linux-i686.tar.bz2';
-$DownloadBuildURL = 'http://stage.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/fx-linux-tbox-trunk';
-$DownloadBuildDir = 'firefox';
-
-# If TestOnlyTinderbox is enabled, fetch the latest build info from tinderbox in a 
-# parseable format
-$TinderboxServerURL = 'http://tinderbox.mozilla.org/showbuilds.cgi?tree=Firefox&quickparse=1';
-$MatchBuildname = 'Linux fx-linux-tbox Depend Nightly';
-$GraphNameOverride        = "bl-bldlnx03_fx-linux-tbox-HEAD"; # Override name built from ::hostname() and $BuildTag
-
-# $results_server
-#----------------------------------------------------------------------------
-# Server on which test results will be accessible.  This was originally tegu,
-# then became axolotl.  Once we moved services from axolotl, it was time
-# to give this service its own hostname to make future transitions easier.
-# - cmp@mozilla.org
-#$results_server           = "build-graphs.mozilla.org";
-
-$pageload_server          = "spider.office.mozilla.org";
-
-#
-# Timeouts, values are in seconds.
-#
-#$CVSCheckoutTimeout               = 3600;
-#$CreateProfileTimeout             = 45;
-#$RegxpcomTestTimeout              = 120;
-
-$AliveTestTimeout                 = 5;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-#$BloatTestTimeout                 = 120;   # seconds
-#$MailBloatTestTimeout             = 120;   # seconds
-#$JavaTestTimeout                  = 45;
-#$DomTestTimeout	                  = 45;    # seconds
-#$XpcomGlueTestTimeout             = 15;
-#$CodesizeTestTimeout              = 900;     # seconds
-#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
-#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-#$LayoutPerformanceLocalTestTimeout     = 1200;  # entire test, seconds
-#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
-#$QATestTimeout                    = 1200;   # entire test, seconds
-#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
-#$StartupPerformanceTestTimeout    = 15;    # seconds
-#$XULWindowOpenTestTimeout	      = 150;   # seconds
-
-
-#$MozConfigFileName = 'mozconfig';
-
-#$UseMozillaProfile = 1;
-#$MozProfileName = 'default';
-
-#- Set these to what makes sense for your system
-#$Make          = 'gmake';       # Must be GNU make
-#$MakeOverrides = '';
-#$mail          = '/bin/mail';
-#$CVS           = 'cvs -q';
-#$CVSCO         = 'checkout -P';
-
-# win32 usually doesn't have /bin/mail
-#$blat           = 'c:/nstools/bin/blat';
-#$use_blat       = 0;
-
-# Set moz_cvsroot to something like:
-# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
-# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
-#
-# Note that win32 may not need \@, depends on ' or ".
-# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
-
-#$moz_cvsroot   = $ENV{CVSROOT};
-
-#- Set these proper values for your tinderbox server
-#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-# Allow for non-client builds, e.g. camino.
-#$moz_client_mk = 'client.mk';
-
-#- Set if you want to build in a separate object tree
-#$ObjDir = '';
-
-# Extra build name, if needed.
-$BuildNameExtra = "fx-linux-tbox perf test";
-
-# User comment, eg. ip address for dhcp builds.
-# ex: $UserComment = "ip = 208.12.36.108";
-#$UserComment = 0;
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-$BuildSleep = 1;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'MozillaExperimental';
-
-$BuildTag = 'HEAD';
-#$BuildConfigDir = 'mozilla/config';
-#$Topsrcdir = 'mozilla';
-
-$BinaryName = 'firefox-bin';
-
-#
-# For embedding app, use:
-#$EmbedBinaryName = 'TestGtkEmbed';
-#$EmbedDistDir    = 'dist/bin'
-
-
-#$ShellOverride = ''; # Only used if the default shell is too stupid
-#$ConfigureArgs = '';
-#$ConfigureEnvArgs = '';
-#$Compiler = 'gcc';
-#$NSPRArgs = '';
-#$ShellOverride = '';
-
-# Release build options
-#$ReleaseBuild  = 1;
-#$clean_objdir = 1; # remove objdir when starting release cycle?
-#$clean_srcdir = 1; # remove srcdir when starting release cycle?
-#$shiptalkback  = 1;
-#$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$ReleaseGroup = ''; # group to set uploaded files to
-#$build_hour    = "8";
-#$package_creation_path = "/xpinstall/packager";
-# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-#$ssh_version   = "2";
-#$ssh_user      = "cltbld";
-#$ssh_server    = "stage.mozilla.org";
-#$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
-#$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
-#$tbox_ftp_path = $ftp_path;
-#$tbox_url_path = $url_path;
-#$milestone     = "trunk";
-#$notify_list   = "cmp\@mozilla.org";
-#$stub_installer = 1;
-#$sea_installer = 1;
-#$archive       = 0;
-#$push_raw_xpis = 1;
-
-# Reboot the OS at the end of build-and-test cycle. This is primarily
-# intended for Win9x, which can't last more than a few cycles before
-# locking up (and testing would be suspect even after a couple of cycles).
-# Right now, there is only code to force the reboot for Win9x, so even
-# setting this to 1, will not have an effect on other platforms. Setting
-# up win9x to automatically logon and begin running tinderbox is left 
-# as an exercise to the reader. 
-#$RebootSystem = 0;
-
-# LogCompression specifies the type of compression used on the log file.
-# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
-# for 'gzip' or 'bzip2' are in the user's path before setting this
-# option.
-#$LogCompression = '';
-
-# LogEncoding specifies the encoding format used for the logs. Valid
-# options are 'base64', and 'uuencode'. If $LogCompression is set above,
-# this needs to be set to 'base64' or 'uuencode' to ensure that the
-# binary data is transferred properly.
-#$LogEncoding = '';
-
-# Prevent Extension Manager from spawning child processes during tests
-# - processes that tbox scripts cannot kill. 
-#$ENV{NO_EM_RESTART} = '1';

mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl

@@ -1,250 +0,0 @@
-#
-#### hostname: bl-bldxp01.office.mozilla.org
-#### uname: CYGWIN_NT-5.1 bl-bldxp01 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
-###
-#
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables.
-
-# $ENV{XPCOM_CC_DO_NOTHING}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Turn graydon's cycle collector on/off
-#$ENV{XPCOM_CC_DO_NOTHING} = 0;
-
-# $ENV{MOZ_PACKAGE_MSI}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Controls whether a MSI package is made.
-# Requires: Windows and a local MakeMSI installation.
-#$ENV{MOZ_PACKAGE_MSI} = 0;
-
-# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
-#-----------------------------------------------------------------------------
-#  Default: scp
-#   Values: scp | rsync
-#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
-# Requires: The selected type requires the command be available both locally
-#           and on the Talkback server.
-#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-
-#- You'll need to change these to suit your machine's needs
-#$DisplayServer = ':0.0';
-
-#- Default values of command-line opts
-#-
-#$BuildDepend       = 1;      # Depend or Clobber
-#$BuildDebug        = 0;      # Debug or Opt (Darwin)
-#$ReportStatus      = 1;      # Send results to server, or not
-#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-#$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
-#$BuildOnce         = 0;      # Build once, don't send results to server
-$TestOnly          = 1;      # Only run tests, don't pull/build
-#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-#$SkipCheckout      = 0;      # Use to debug build process without checking out new source.
-#$BuildLocales      = 0;      # Do l10n packaging?
-
-# Tests
-$CleanProfile             = 1;
-#$ResetHomeDirForTests     = 1;
-#$ProductName              = "Mozilla";
-$VendorName               = 'mozilla';
-
-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 0;
-$AliveTest                = 1;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-#$BloatTest                = 0;  # warren memory bloat test
-#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
-#$DomToTextConversionTest  = 0;  
-#$XpcomGlueTest            = 0;
-$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
-$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
-#$MailBloatTest            = 0;
-#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 1;  # Tp
-$LayoutPerformanceLocalTest = 1;  # Tp2
-$DHTMLPerformanceTest     = 1;  # Tdhtml
-#$QATest                   = 0;  
-$XULWindowOpenTest        = 1;  # Txul
-$StartupPerformanceTest   = 1;  # Ts
-
-$TestsPhoneHome           = 1;  # Should test report back to server?
-# If TestOnlyTinderbox is enabled, fetch the latest build info from tinderbox in a 
-# parseable format
-$TinderboxServerURL = 'http://tinderbox.mozilla.org/showbuilds.cgi?tree=MozillaExperimental&quickparse=1';
-$MatchBuildname = 'WINNT 5.2 fxnewref-win32- Depend Fx-Newref';
-#$GraphNameOverride        = 'Fx-Trunk-win32-test1'; # Override name built from ::hostname() and $BuildTag
-
-# $results_server
-#----------------------------------------------------------------------------
-# Server on which test results will be accessible.  This was originally tegu,
-# then became axolotl.  Once we moved services from axolotl, it was time
-# to give this service its own hostname to make future transitions easier.
-# - cmp@mozilla.org
-#$results_server           = "build-graphs.mozilla.org";
-
-$pageload_server          = "spider.office.mozilla.org";
-
-#
-# Timeouts, values are in seconds.
-#
-#$CVSCheckoutTimeout               = 3600;
-#$CreateProfileTimeout             = 45;
-#$RegxpcomTestTimeout              = 120;
-
-$AliveTestTimeout                 = 45;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-#$BloatTestTimeout                 = 120;   # seconds
-#$MailBloatTestTimeout             = 120;   # seconds
-#$JavaTestTimeout                  = 45;
-#$DomTestTimeout	                  = 45;    # seconds
-#$XpcomGlueTestTimeout             = 15;
-#$CodesizeTestTimeout              = 900;     # seconds
-#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
-#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-#$LayoutPerformanceLocalTestTimeout     = 1200;  # entire test, seconds
-#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
-#$QATestTimeout                    = 1200;   # entire test, seconds
-#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
-#$StartupPerformanceTestTimeout    = 15;    # seconds
-#$XULWindowOpenTestTimeout	      = 150;   # seconds
-
-
-#$MozConfigFileName = 'mozconfig';
-
-#$UseMozillaProfile = 1;
-#$MozProfileName = 'default';
-
-#- Set these to what makes sense for your system
-#$Make          = 'gmake';       # Must be GNU make
-#$MakeOverrides = '';
-#$mail          = '/bin/mail';
-#$CVS           = 'cvs -q';
-#$CVSCO         = 'checkout -P';
-
-# win32 usually doesn't have /bin/mail
-#$blat           = 'c:/nstools/bin/blat';
-#$use_blat       = 0;
-
-# Set moz_cvsroot to something like:
-# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
-# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
-#
-# Note that win32 may not need \@, depends on ' or ".
-# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
-
-#$moz_cvsroot   = $ENV{CVSROOT};
-
-#- Set these proper values for your tinderbox server
-#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-# Allow for non-client builds, e.g. camino.
-#$moz_client_mk = 'client.mk';
-
-#- Set if you want to build in a separate object tree
-#$ObjDir = '';
-
-# Extra build name, if needed.
-$BuildNameExtra = 'fxnewref-win32-tbox perf test';
-
-# User comment, eg. ip address for dhcp builds.
-# ex: $UserComment = "ip = 208.12.36.108";
-#$UserComment = 0;
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-#$BuildSleep = 10;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'Firefox';
-
-$BuildTag = 'HEAD';
-#$BuildConfigDir = 'mozilla/config';
-#$Topsrcdir = 'mozilla';
-
-$BinaryName = 'firefox.exe';
-
-#
-# For embedding app, use:
-#$EmbedBinaryName = 'TestGtkEmbed';
-#$EmbedDistDir    = 'dist/bin'
-
-
-#$ShellOverride = ''; # Only used if the default shell is too stupid
-#$ConfigureArgs = '';
-#$ConfigureEnvArgs = '';
-#$Compiler = 'gcc';
-#$NSPRArgs = '';
-#$ShellOverride = '';
-
-# Release build options
-#$ReleaseBuild  = 1;
-#$clean_objdir = 1; # remove objdir when starting release cycle?
-#$clean_srcdir = 1; # remove srcdir when starting release cycle?
-#$shiptalkback  = 1;
-#$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$ReleaseGroup = ''; # group to set uploaded files to
-#$build_hour    = "8";
-#$package_creation_path = "/xpinstall/packager";
-# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-#$ssh_version   = "2";
-#$ssh_user      = "cltbld";
-#$ssh_server    = "stage.mozilla.org";
-#$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
-#$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
-#$tbox_ftp_path = $ftp_path;
-#$tbox_url_path = $url_path;
-#$milestone     = "trunk";
-#$notify_list   = "cmp\@mozilla.org";
-#$stub_installer = 1;
-#$sea_installer = 1;
-#$archive       = 0;
-#$push_raw_xpis = 1;
-
-# Reboot the OS at the end of build-and-test cycle. This is primarily
-# intended for Win9x, which can't last more than a few cycles before
-# locking up (and testing would be suspect even after a couple of cycles).
-# Right now, there is only code to force the reboot for Win9x, so even
-# setting this to 1, will not have an effect on other platforms. Setting
-# up win9x to automatically logon and begin running tinderbox is left 
-# as an exercise to the reader. 
-#$RebootSystem = 0;
-
-# LogCompression specifies the type of compression used on the log file.
-# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
-# for 'gzip' or 'bzip2' are in the user's path before setting this
-# option.
-#$LogCompression = '';
-
-# LogEncoding specifies the encoding format used for the logs. Valid
-# options are 'base64', and 'uuencode'. If $LogCompression is set above,
-# this needs to be set to 'base64' or 'uuencode' to ensure that the
-# binary data is transferred properly.
-#$LogEncoding = '';
-
-# Prevent Extension Manager from spawning child processes during tests
-# - processes that tbox scripts cannot kill. 
-#$ENV{NO_EM_RESTART} = '1';
-# If tinderbox is running in a test-only mode, it needs to be able to download
-# the latest build and unpack it rather than building it.
-$TestOnlyTinderbox = 1;
-$DownloadBuildFile = 'firefox-3.0a8pre.en-US.win32.zip';
-$DownloadBuildURL = 'http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/win32-newref/hourly-builds/latest-trunk';
-$DownloadBuildDir = 'firefox';
-

mozilla/xpfe/components/bookmarks/Makefile.in

@@ -0,0 +1,32 @@
+#
+# 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
+
+DIRS		= public src resources
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/macbuild/BookmarksPrefix.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
+#define _IMPL_NS_APPSHELL
+
+#include "MacSharedPrefix.h"

mozilla/xpfe/components/bookmarks/macbuild/BookmarksPrefix_debug.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+/* Defining the following causes NS_APPSHELL to be defined as NS_EXPORT. */
+#define _IMPL_NS_APPSHELL
+
+#include "MacSharedPrefix_debug.h"

mozilla/xpfe/components/bookmarks/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+#
+# 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=..\..\..
+
+DIRS=public src resources
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/bookmarks/public/MANIFEST_IDL

@@ -0,0 +1 @@
+nsIBookmarksService.idl

mozilla/xpfe/components/bookmarks/public/Makefile.in

@@ -0,0 +1,35 @@
+#
+# 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
+
+MODULE		= appcomps
+XPIDL_MODULE	= bookmarks
+
+XPIDLSRCS	= nsIBookmarksService.idl
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/public/makefile.win

@@ -0,0 +1,31 @@
+#!nmake
+#
+# 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=..\..\..\..
+
+MODULE=bookmarks
+
+XPIDLSRCS =                   \
+    .\nsIBookmarksService.idl \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/xpfe/components/bookmarks/public/nsIBookmarksService.idl

@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+/*
+
+  The Browser Bookmarks service
+
+*/
+
+#include "nsISupports.idl"
+
+interface nsIRDFResource;
+
+[scriptable, uuid(a82e9300-e4af-11d2-8fdf-0008c70adc7b)]
+interface nsIBookmarksService : nsISupports
+{
+    const unsigned long BOOKMARK_DEFAULT_TYPE   = 0;
+    const unsigned long BOOKMARK_SEARCH_TYPE    = 1;
+    const unsigned long BOOKMARK_FIND_TYPE      = 2;
+
+    void ReadBookmarks();
+    boolean IsBookmarked(in string aURI);
+
+    void AddBookmark(in string aURI, in wstring aTitle, in long bmType, in wstring docCharset);
+        
+    void AddBookmarkToFolder(in string aURI, in nsIRDFResource aFolder, 
+                             in wstring aTitle, in wstring docCharSet);
+
+    void UpdateBookmarkLastVisitedDate(in string aURL, in wstring docCharset);
+    
+    string FindShortcut(in wstring aName);
+    
+    wstring GetLastCharset(in string aURI);
+
+};
+
+%{C++
+
+// {E638D760-8687-11d2-B530-000000000000}
+#define NS_BOOKMARKS_SERVICE_CID \
+{ 0xe638d760, 0x8687, 0x11d2, { 0xb5, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+#define NS_BOOKMARKS_SERVICE_CONTRACTID \
+    "@mozilla.org/browser/bookmarks-service;1"
+
+#define NS_BOOKMARKS_DATASOURCE_CONTRACTID \
+    "@mozilla.org/rdf/datasource;1?name=bookmarks"
+
+%}

mozilla/xpfe/components/bookmarks/resources/MANIFEST-content

@@ -0,0 +1,9 @@
+bm-find.js
+bm-find.xul
+bm-panel.js
+bm-panel.xul
+bm-props.js
+bm-props.xul
+bookmarks.js
+bookmarksDD.js
+bookmarks.xul

mozilla/xpfe/components/bookmarks/resources/Makefile.in

@@ -0,0 +1,32 @@
+#
+# 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
+
+DIRS		= 
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/resources/addBookmark.js

@@ -0,0 +1,238 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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)
+ */
+
+/**
+ * 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.
+ *
+ * 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. 
+ */
+
+var gFld_Name   = null;
+var gFld_URL    = null; 
+var gFolderTree = 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()
+{
+  doSetOKCancel(onOK);
+  gFld_Name = document.getElementById("name");
+  gFld_URL = document.getElementById("url");
+  gFolderTree = document.getElementById("folders");
+  
+  var shouldSetOKButton = true;
+  if ("arguments" in window) {
+    switch (window.arguments[4]) {
+    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();
+      var windowNode = document.getElementById("newBookmarkWindow");
+      windowNode.setAttribute("title", windowNode.getAttribute("title-selectFolder"));
+      shouldSetOKButton = false;
+      var folderItem = document.getElementById(window.arguments[2]);
+      if (folderItem)
+        gFolderTree.selectItem(folderItem);
+      break;
+    case "newBookmark":
+      setupFields();
+      if (window.arguments[2])
+        gCreateInFolder = window.arguments[2];
+      document.getElementById("folderbox").setAttribute("hidden", "true");
+      windowNode = document.getElementById("newBookmarkWindow");
+      windowNode.removeAttribute("persist");
+      windowNode.setAttribute("height", "0");
+      windowNode.setAttribute("width", "0");
+      windowNode.setAttribute("style", windowNode.getAttribute("style"));
+      sizeToContent();
+      break;
+    default:
+      // Regular Add Bookmark
+      setupFields();
+      if (window.arguments[2]) {
+        gCreateInFolder = window.arguments[2];
+        var folderItem = document.getElementById(gCreateInFolder);
+        if (folderItem)
+          gFolderTree.selectItem(folderItem);
+      }
+    }
+  }
+  
+  if (shouldSetOKButton)
+    onLocationInput();
+  gFld_Name.select();
+  gFld_Name.focus();
+} 
+
+function setupFields()
+{
+  // New bookmark in predetermined folder. 
+  gFld_Name.value = window.arguments[0] || "";
+  gFld_URL.value = window.arguments[1] || "";
+  onLocationInput();
+  gFld_Name.select();
+  gFld_Name.focus();
+  gBookmarkCharset = window.arguments [3] || null;
+}
+
+function onLocationInput ()
+{
+  var ok = document.getElementById("ok");
+  ok.disabled = gFld_URL.value == "";
+}
+
+function onOK()
+{
+  // In Select Folder Mode, do nothing but tell our caller what
+  // folder was selected. 
+  if (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 (!gFld_URL.value) return;
+    
+    // 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
+    var url = gFld_URL.value;
+    try {
+      const kLFContractID = "@mozilla.org/file/local;1";
+      const kLFIID = Components.interfaces.nsILocalFile;
+      const kLF = Components.classes[kLFContractID].createInstance(kLFIID);
+      kLF.initWithUnicodePath(url);
+      url = kLF.URL;
+    }
+    catch (e) {
+    }
+    
+    kBMS.AddBookmarkToFolder(url, rFolder, gFld_Name.value, gBookmarkCharset);
+  }
+  close();
+}
+
+function onTreeSelect ()
+{
+  if (gFolderTree.selectedItems.length < 1) 
+    gCreateInFolder = "NC:NewBookmarkFolder";
+  else {
+    var selectedItem = gFolderTree.selectedItems[0];
+    gCreateInFolder = selectedItem.id;
+  }
+}
+
+var gBookmarksShell = null;
+function createNewFolder ()
+{
+  // ick. 
+  gBookmarksShell = new BookmarksTree("folders");
+  var item = null;
+  var folderKids = document.getElementById("folderKids");
+  if (gFolderTree.selectedItems.length < 1)
+    item = folderKids.firstChild;
+  item = gFolderTree.selectedItems.length < 1 ? folderKids.firstChild : gFolderTree.selectedItems[0];
+  gBookmarksShell.commands.createBookmarkItem("folder", item);
+}
+
+function useDefaultFolder ()
+{
+  const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+  var newBookmarkFolder = document.getElementById("NC:NewBookmarkFolder");
+  if (newBookmarkFolder) {
+    gFolderTree.selectItem(newBookmarkFolder);
+    gCreateInFolder = "NC:NewBookmarkFolder";
+  }
+  else {
+    gFolderTree.clearItemSelection();
+    gCreateInFolder = "NC:BookmarksRoot";
+  }
+}
+
+

mozilla/xpfe/components/bookmarks/resources/addBookmark.xul

@@ -0,0 +1,134 @@
+<?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"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
+%addBookmarkDTD;
+]>
+
+<window id="newBookmarkWindow" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&newBookmark.title;" title-selectFolder="&selectFolder.label;"
+        orient="vertical" class="dialog"
+        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"/>
+
+  
+  <keyset id="dialogKeys"/>
+  
+  <separator id="nameseparator" class="thin"/>
+  
+  <grid id="bookmarknamegrid">
+    <columns>
+      <column/>
+      <column flex="5"/>
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row autostretch="never">
+        <text class="label" value="&name.label;" accesskey="&name.accesskey;" for="name"/>
+        <textbox id="name"/>
+        <spring/>
+      </row>
+      <row>
+        <separator class="thin"/>
+        <separator class="thin"/>
+        <spring/>
+      </row>
+      <row autostretch="never">
+        <text class="label" value="&url.label;" accesskey="&url.accesskey;" for="url"/>
+        <textbox id="url" oninput="onLocationInput();"/>
+        <spring/>
+      </row>
+    </rows>
+  </grid>
+
+  <separator id="createinseparator"/>
+
+  <vbox id="folderbox" flex="1">
+    <separator/>
+    <hbox flex="1">
+      <text id="createinlabel" class="label" value="&createin.label;"/>
+      <hbox flex="1">
+        <tree id="folders" flex="1" style="height: 12em; width: 0px"
+              class="inset" ref="NC:BookmarksRoot" datasources="rdf:bookmarks"
+              template="file-bookmarks-template"
+              onselect="onTreeSelect();" onkeypress="event.preventBubble();">
+          <treecolgroup>
+            <treecol flex="1"/>
+          </treecolgroup>
+    
+          <template id="file-bookmarks-template">
+            <rule iscontainer="true">
+              <treechildren>
+                <treeitem uri="rdf:*" persist="open" class="bookmark-item"
+                          rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
+                  <treerow>
+                    <treecell label="rdf:http://home.netscape.com/NC-rdf#Name"
+                              class="treecell-indent treecell-editable" editable="true"
+                              src="rdf:http://home.netscape.com/NC-rdf#Icon"
+                              rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                              loading="rdf:http://home.netscape.com/NC-rdf#loading"/>
+                  </treerow>
+                </treeitem>
+              </treechildren>
+            </rule>
+          </template>
+          <treechildren id="folderKids" flex="1"/>
+        </tree>
+        <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>
+    <separator/>
+  </vbox>
+
+  <!-- XXX - need to use an "Add Bookmark" string here -->
+  <box id="okCancelButtonsRight"/>
+
+</window>        

mozilla/xpfe/components/bookmarks/resources/bm-find.js

@@ -0,0 +1,230 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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.
+ *
+ *  Original Author(s):
+ *    Robert John Churchill    <rjc@netscape.com>
+ *
+ * Contributor(s):
+ *    Blake Ross   <blakeross@telocity.com>
+ *    Peter Annema <disttsc@bart.nl>
+ */
+
+var gFindText;
+var gBundle = null;
+
+function doLoad()
+{
+  gFindText = document.getElementById("findtext");
+
+  // disable "Save Search" button (initially)
+  var searchButton = document.getElementById("SaveSearch");
+  searchButton.disabled = true;
+
+  if ('arguments' in window && window.arguments[0]) {
+    var datasourcePopup = document.getElementById("datasource");
+    var winArg = window.arguments[0].toLowerCase();
+    if (winArg == "bookmarks") {
+      var searchBookmarksItem = document.getElementById("searchBookmarksItem");
+      datasourcePopup.selectedItem = searchBookmarksItem;
+    }
+    else if (winArg == "history") {
+      var searchHistoryItem = document.getElementById("searchHistoryItem");
+      datasourcePopup.selectedItem = searchHistoryItem;
+    }
+    toggleItems(winArg);
+  }
+  else {
+    toggleItems("bookmarks");  // default is bookmarks
+  }
+
+  doEnabling();
+
+  //set initial focus
+  gFindText.focus();
+}
+
+var gDatasourceName;
+var gMatchName;
+var gMethodName;
+var gTextName;
+
+function doFind()
+{
+  // get RDF datasource to query
+  var datasourceNode = document.getElementById("datasource");
+  if (!datasourceNode)
+    return false;
+
+  var datasource = datasourceNode.selectedItem.getAttribute("value");
+  gDatasourceName = datasourceNode.selectedItem.getAttribute("label");
+
+  // get match
+  var matchNode = document.getElementById("match");
+  if (!matchNode)
+    return false;
+
+  var match = matchNode.selectedItem.getAttribute("value");
+  gMatchName = matchNode.selectedItem.getAttribute("label");
+
+  // get method
+  var methodNode = document.getElementById("method");
+  if (!methodNode)
+    return false;
+  var method = methodNode.selectedItem.getAttribute("value");
+  gMethodName = methodNode.selectedItem.getAttribute("label");
+
+  // get user text to find
+  if (!gFindText || !gFindText.value)
+    return false;
+
+  gTextName = gFindText.value;
+
+  // construct find URL
+  var url = "find:datasource=" + datasource;
+  url += "&match=" + match;
+  url += "&method=" + method;
+  url += "&text=" + escape(gTextName);
+
+  // load find URL into results pane
+  var resultsTree = document.getElementById("findresultstree");
+  resultsTree.setAttribute("ref", "");
+  resultsTree.setAttribute("ref", url);
+
+  // enable "Save Search" button
+  var searchButton = document.getElementById("SaveSearch");
+  searchButton.removeAttribute("disabled");
+
+  resultsTree.focus();
+  return true;
+}
+
+function saveFind()
+{
+  var resultsTree = document.getElementById("findresultstree");
+  var searchURL = resultsTree.getAttribute("ref");
+  if (!searchURL)
+    return false;
+  if (!gBundle)
+    gBundle = srGetStrBundle("chrome://communicator/locale/bookmarks/bookmark.properties");
+  var searchTitle = gBundle.formatStringFromName("FindTitle", [gMatchName, gMethodName, gTextName, gDatasourceName], 4);
+
+  var bmks = Components.classes["@mozilla.org/browser/bookmarks-service;1"]
+                       .getService(Components.interfaces.nsIBookmarksService);
+      bmks = bmks.AddBookmark(searchURL, searchTitle, bmks.BOOKMARK_FIND_TYPE, null);
+  return true;
+}
+
+function getAbsoluteID(root, node)
+{
+  var url = node.getAttribute("ref");
+  if (!url)
+    url = node.getAttribute("id");
+
+  try {
+    var rootNode = document.getElementById(root);
+    var ds = null;
+    if (rootNode)
+      ds = rootNode.database;
+
+    // add support for anonymous resources such as Internet Search results,
+    // IE favorites under Win32, and NetPositive URLs under BeOS
+    var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                        .getService()
+                        .QueryInterface(Components.interfaces.nsIRDFService);
+    if (rdf && ds) {
+      var src = rdf.GetResource(url, true);
+      var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
+      var target = ds.GetTarget(src, prop, true);
+      target = target.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+      if (target)
+        url = target;
+    }
+  }
+  catch(ex) {
+  }
+  return url;
+}
+
+function doEnabling()
+{
+  var findButton = document.getElementById("search");
+  findButton.disabled = !gFindText.value;
+}
+
+function OpenURL(event, node, root)
+{
+  if (event.button != 0 ||
+      event.detail != 2 ||
+      node.nodeName != "treeitem" ||
+      node.getAttribute("container") == "true") {
+    return false;
+  }
+
+  var url = getAbsoluteID(root, node);
+
+  // Ignore "NC:" urls.
+  if (url.substring(0, 3) == "NC:")
+    return false;
+
+  // get right sized window
+  window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
+  return true;
+}
+
+function itemSelect()
+{
+  var tree = document.getElementById("findresultstree");
+  if (tree.selectedItems.length == 1) {
+    var status = document.getElementById("statusbar-display");
+    var val = getAbsoluteID("findresultstree", tree.selectedItems[0]);
+
+    // Ignore "NC:" urls.
+    if (val.substring(0, 3) == "NC:")
+      status.label = "";
+    else
+      status.label = val;
+  }
+}
+
+function toggleItems(searchType)
+{
+  var bookmarksArray = ["matchShortcutItem", "shortcutCell", "shortcutCell2", "ShortcutURLColumn"];
+  if (searchType == "bookmarks")
+    showItems(bookmarksArray);
+  else if (searchType == "history")
+    hideItems(bookmarksArray);
+}
+
+function showItems(elementArray)
+{
+  for (var i = 0; i < elementArray.length; i++) {
+    var element = document.getElementById(elementArray[i]);
+    if (element)
+      element.removeAttribute("collapsed");
+  }
+}
+
+function hideItems(elementArray)
+{
+  for (var i = 0; i < elementArray.length; i++) {
+    var element = document.getElementById(elementArray[i]);
+    if (element)
+      element.setAttribute("collapsed", "true");
+  }
+}

mozilla/xpfe/components/bookmarks/resources/bm-find.xul

@@ -0,0 +1,299 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; 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.
+
+  Original Author(s):
+    Robert John Churchill    <rjc@netscape.com>
+
+  Contributor(s): 
+    Blake Ross               <blakeross@telocity.com>
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bm-find.dtd">
+
+<window title="&window.title.label;" id="bookmark-find-window"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        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"
+        orient="vertical"
+        width="630" height="400"
+        persist="width height screenX screenY sizemode"
+        windowtype="bookmarks:find"
+        onload="doLoad();">
+
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-find.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/treePopups.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTreeUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+
+  <commandset id="tasksCommands">
+    <commandset id="selectEditMenuItems"/>
+    <commandset id="globalEditMenuItems"/>
+
+    <!-- File Menu -->
+    <command id="cmd_newNavigator"/>
+    <command id="cmd_newEditor"/>
+    <command id="cmd_close" oncommand="window.close()"/>
+    <command id="cmd_quit"/>
+    <!-- Edit Menu -->
+    <command id="cmd_undo"/>
+    <command id="cmd_redo"/>
+    <command id="cmd_cut"/>
+    <command id="cmd_copy"/>
+    <command id="cmd_paste"/>
+    <command id="cmd_delete"/>
+    <command id="cmd_selectAll"/>
+  </commandset>
+
+  <keyset id="tasksKeys">
+    <!-- File Menu -->
+    <key id="key_newNavigator"/>
+    <key id="key_newEditor"/>
+    <key id="key_close"/>
+    <key id="key_quit"/>
+    <!-- Edit Menu -->
+    <key id="key_undo"/>
+    <key id="key_redo"/>
+    <key id="key_cut"/>
+    <key id="key_copy"/>
+    <key id="key_paste"/>
+    <key id="key_delete"/>
+    <key id="key_selectAll"/>
+  </keyset>
+
+  <toolbox>  
+    <menubar id="main-menubar">
+      <menu id="menu_File">
+        <menupopup id="menu_FilePopup">     
+          <menu id="menu_New">
+            <menupopup id="menu_NewPopup">
+              <menuitem id="menu_newNavigator" command="cmd_newNavigator"/>
+              <menuitem id="menu_newEditor"    command="cmd_newEditor"/>
+            </menupopup>
+          </menu>
+          <menuseparator/>
+          <menuitem id="menu_close"/>
+        </menupopup>
+      </menu>
+  
+      <menu id="menu_Edit">
+        <menupopup>
+          <menuitem id="menu_undo"/>
+          <menuitem id="menu_redo"/>
+          <menuseparator/>
+          <menuitem id="menu_cut"/>
+          <menuitem id="menu_copy"/>
+          <menuitem id="menu_paste"/>
+          <menuitem id="menu_delete"/>
+          <menuseparator/>
+          <menuitem id="menu_selectAll"/>
+          <menuseparator/>
+          <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul',
+                                                    'chrome://communicator/content/pref/pref-navigator.xul',
+                                                    'navigator')"/>
+        </menupopup>
+      </menu>
+      <menu id="menu_View">
+        <menupopup oncreate="fillViewMenu(this)">
+          <menuitem type="radio" name="sort_column" id="unsorted_menuitem"
+                    label="&menuitem.view.unsorted.label;"
+                    accesskey="&menuitem.view.unsorted.accesskey;"
+                    oncommand="return SetSortDirection('natural');"/>
+          <menuseparator id="fill_after_this_node" collapsed="true"/>
+          <menuseparator id="fill_before_this_node"/>
+          <menuitem type="radio" name="sort_direction" id="sort_ascending"
+                    label="&menuitem.view.ascending.label;"
+                    accesskey="&menuitem.view.ascending.accesskey;"
+                    oncommand="return SetSortDirection('ascending');"/>
+          <menuitem type="radio" name="sort_direction" id="sort_descending"
+                    label="&menuitem.view.descending.label;"
+                    accesskey="&menuitem.view.descending.accesskey;"
+                    oncommand="return SetSortDirection('descending');"/>
+          <menuseparator/>
+          <menu label="&menuitem.view.show_columns.label;"
+                accesskey="&menuitem.view.show_columns.accesskey;">
+            <menupopup oncreate="BuildTreePopup(document.getElementById('theColumns'), 
+                                                document.getElementById('headRow'),
+                                                this,
+                                                document.getElementById('popupCell'))"/>
+          </menu>
+        </menupopup>
+      </menu>
+      <menu id="tasksMenu"/>
+      <menu id="menu_Help"/>
+    </menubar>
+  </toolbox>
+
+  <titledbox orient="horizontal">
+    <spring align="horizontal" flex="100%"/>
+    <box align="vertical">
+      <box align="horizontal">
+        <spring align="horizontal" flex="100%"/>
+  <text value="&search1.label;"/>
+        <menulist id="datasource">
+          <menupopup id="datasourcePopup">
+            <menuitem id="searchBookmarksItem" value="rdf:bookmarks" label="&bookmarks.label;"
+                      oncommand="toggleItems('bookmarks');"/>
+            <menuitem id="searchHistoryItem" value="rdf:history" label="&history.label;"
+                      oncommand="toggleItems('history');"/>
+          </menupopup>
+        </menulist>
+        <text value="&search2.label;"/>
+        <spring align="horizontal" flex="100%"/>
+      </box>
+
+      <box autostretch="never">
+        <spring align="horizontal" flex="100%"/>
+        <menulist id="match">
+          <menupopup id="matchPopup">
+            <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&name.label;"/>
+            <menuitem value="http://home.netscape.com/NC-rdf#URL" label="&url.label;"/>
+            <menuitem id="matchShortcutItem" value="http://home.netscape.com/NC-rdf#ShortcutURL" label="&shortcut.label;"/>
+            <menuitem value="http://home.netscape.com/NC-Description" label="&description.label;"/>
+          </menupopup>
+  </menulist>
+        <menulist id="method">
+          <menupopup id="methodPopup">
+            <menuitem value="contains" label="&contains.label;"/>
+            <menuitem value="startswith" label="&startswith.label;"/>
+            <menuitem value="endswith" label="&endswith.label;"/>
+            <menuitem value="is" label="&is.label;"/>
+            <menuitem value="isnot" label="&isnot.label;"/>
+            <menuitem value="doesntcontain" label="&doesntcontain.label;"/>
+          </menupopup>
+        </menulist>
+
+        <textbox id="findtext" flex="1" oninput="doEnabling();"
+                   onkeypress="if (event.keyCode == 13) doFind();"/>
+        <box autostretch="never">
+          <button id="search" class="dialog toolbar-non-iconic" label="&search.button.label;"
+                  accesskey="&search.button.accesskey;" default="true" oncommand="doFind();"/>
+          <button id="SaveSearch" class="dialog toolbar-non-iconic" label="&save.button.label;"                                    accesskey="&save.button.accesskey;" disabled="true" oncommand="saveFind();"/>
+        </box>
+        <spring align="horizontal" flex="100%" />
+      </box>
+    </box>
+    <spring align="horizontal" flex="100%" />
+  </titledbox>
+
+  <box height="10"/>
+
+  <tree id="findresultstree" ref="" flex="100%" style="height:0px"
+        datasources="rdf:bookmarks rdf:history rdf:localsearch" context="contextual"
+        onclick="return OpenURL(event, event.target.parentNode.parentNode);"
+        onselect="itemSelect();">
+
+    <treecolgroup id="theColumns">
+      <treecol id="NameColumn" persist="hidden width" width="2*" flex="2"
+               resource="http://home.netscape.com/NC-rdf#Name"
+               sortActive="true" sortDirection="ascending"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="URLColumn" persist="hidden width" width="2*" flex="2"
+               resource="http://home.netscape.com/NC-rdf#URL"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="ShortcutURLColumn" persist="hidden width" width="1*" flex="1"
+               resource="http://home.netscape.com/NC-rdf#ShortcutURL"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="DescriptionColumn" persist="hidden width" width="1*" flex="1"
+               resource="http://home.netscape.com/NC-rdf#Description"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="PopupColumn" persist="width" fixed="true" width="14"/>
+    </treecolgroup>
+
+    <template>
+      <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+        <treechildren flex="1">
+          <treeitem uri="...">
+            <treerow>
+              <treecell>
+                <separator class="groove" flex="1" align="center"/>
+              </treecell>
+            </treerow>
+          </treeitem>   
+        </treechildren> 
+      </rule>
+
+      <rule>
+        <treechildren flex="1">
+          <treeitem uri="rdf:*">
+            <treerow>
+              <treecell align="left" crop="right" indent="true" label="rdf:http://home.netscape.com/NC-rdf#Name"                                     src="rdf:http://home.netscape.com/NC-rdf#Icon"/>
+              <treecell align="left" crop="right" label="rdf:http://home.netscape.com/NC-rdf#URL"/>
+              <treecell id="shortcutCell" align="left" crop="right" label="rdf:http://home.netscape.com/NC-rdf#ShortcutURL"/>
+              <treecell align="left" crop="right" label="rdf:http://home.netscape.com/NC-rdf#Description"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </rule>
+    </template>
+
+    <treehead>
+      <treerow id="headRow">
+        <treecell class="treecell-header sortDirectionIndicator" observes="NameColumn"
+                  label="&name.label;" resource="http://home.netscape.com/NC-rdf#Name"
+                  onclick="return doSort('NameColumn', null);" sortActive="true" sortDirection="ascending"/>
+        <treecell class="treecell-header sortDirectionIndicator" observes="URLColumn"
+                  label="&url.label;" resource="http://home.netscape.com/NC-rdf#URL"
+                  onclick="return doSort('URLColumn', null);"/>
+        <treecell id="shortcutCell2" class="treecell-header sortDirectionIndicator" observes="ShortcutURLColumn"
+                  label="&shortcut.label;" resource="http://home.netscape.com/NC-rdf#ShortcutURL"
+                  onclick="return doSort('ShortcutURLColumn', null);"/>
+        <treecell class="treecell-header sortDirectionIndicator"                                                               observes="DescriptionColumn" label="&description.label;"                                                      resource="http://home.netscape.com/NC-rdf#Description"
+                 onclick="return doSort('DescriptionColumn', null);"/>
+        <treecell class="treecell-header" allowevents="true" id="popupCell">
+          <menu>
+            <image class="treecell-popup-icon"/>
+      <menupopup popupanchor="bottomright" popupalign="topright"
+                       oncreate="BuildTreePopup(document.getElementById('theColumns'),
+                                 document.getElementById('headRow'),
+                                 this,
+                                 document.getElementById('popupCell'))"/>
+          </menu>
+        </treecell>
+      </treerow>
+    </treehead>
+  </tree>
+
+  <!--
+  This extra "status" bar is necessary because the bottom right corner of
+  the window on MacOS is taken up by the growBox. If this window had a
+  horizontal scrollbar, we'd be alright, but since it doesn't the bottom
+  arrow on the vertical scrollbar was being hidden by this growBox. To
+  combat this, we can just stick in an 18px high bar to bump up the bottom
+  of the tree so that the scrollbar is visible. Yes, I know this is not
+  necessary for win32 or gtk, but we can use this area for information.
+  -->
+
+
+  <statusbar id="status-bar" style="min-height:18px; max-height:18px;">
+    <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
+    <statusbarpanel id="statusbar-display" crop="right" flex="1"/>
+  </statusbar>
+
+</window>

mozilla/xpfe/components/bookmarks/resources/bm-props.js

@@ -0,0 +1,373 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ */
+
+var NC_NAMESPACE_URI = "http://home.netscape.com/NC-rdf#";
+
+// XXX MAKE SURE that the "url" field is LAST!
+// This is important for what happens if/when the URL itself is changed.
+// Ask rjc@netscape.com if you want to know why exactly this is.
+
+// This is the set of fields that are visible in the window.
+var gFields     = ["name", "shortcut", "description", "url"];
+
+// ...and this is a parallel array that contains the RDF properties
+// that they are associated with.
+var gProperties = [NC_NAMESPACE_URI + "Name",
+                   NC_NAMESPACE_URI + "ShortcutURL",
+                   NC_NAMESPACE_URI + "Description",
+                   NC_NAMESPACE_URI + "URL"];
+
+var RDF = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                    .getService(Components.interfaces.nsIRDFService);
+
+var RDFC = Components.classes["@mozilla.org/rdf/container-utils;1"]
+                     .getService(Components.interfaces.nsIRDFContainerUtils);
+
+var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+
+var gBookmarkURL = "";
+
+function Init()
+{
+  var x;
+  gBookmarkURL = window.arguments[0];
+
+  // set up action buttons
+  doSetOKCancel(Commit);
+
+  // Initialize the properties panel by copying the values from the
+  // RDF graph into the fields on screen.
+
+  for (var i = 0; i < gFields.length; ++i) {
+    var field = document.getElementById(gFields[i]);
+
+    var value = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                    RDF.GetResource(gProperties[i]),
+                                    true);
+
+    if (value)
+      value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+    if (value) //make sure were aren't stuffing null into any fields
+      field.value = value;
+  }
+
+  var propsWindow = document.getElementById("bmPropsWindow");
+  var nameNode = document.getElementById("name");
+  var title = propsWindow.getAttribute("title");
+  title = title.replace(/\*\*bm_title\*\*/gi, nameNode.value);
+  propsWindow.setAttribute("title", title);
+
+  // check bookmark schedule
+  value = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                              RDF.GetResource("http://home.netscape.com/WEB-rdf#Schedule"),
+                              true);
+
+  if (value) {
+    value = value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+    if (value) {
+      var values = value.split("|");
+      if (values.length == 4) {
+        // get day range
+        var days = values[0];
+        var dayNode = document.getElementById("dayRange");
+        var dayItems = dayNode.childNodes[0].childNodes;
+        for (x=0; x < dayItems.length; ++x) {
+          if (dayItems[x].getAttribute("value") == days) {
+            dayNode.selectedItem = dayItems[x];
+            break;
+          }
+        }
+
+        // get hour range
+        var hours = values[1].split("-");
+        var startHour = "";
+        var endHour = "";
+
+        if (hours.length == 2) {
+          startHour = hours[0];
+          endHour = hours[1];
+        }
+
+        // set start hour
+        var startHourNode = document.getElementById("startHourRange");
+        var startHourItems = startHourNode.childNodes[0].childNodes;
+        for (x=0; x < startHourItems.length; ++x) {
+          if (startHourItems[x].getAttribute("value") == startHour) {
+            startHourNode.selectedItem = startHourItems[x];
+            break;
+          }
+        }
+
+        // set end hour
+        var endHourNode = document.getElementById("endHourRange");
+        var endHourItems = endHourNode.childNodes[0].childNodes;
+        for (x=0; x < endHourItems.length; ++x) {
+          if (endHourItems[x].getAttribute("value") == endHour) {
+            endHourNode.selectedItem = endHourItems[x];
+            break;
+          }
+        }
+
+        // get duration
+        var duration = values[2];
+        var durationNode = document.getElementById("duration");
+        durationNode.value = duration;
+
+        // get notification method
+        var method = values[3];
+        if (method.indexOf("icon") >= 0)
+          document.getElementById("bookmarkIcon").checked = true;
+
+        if (method.indexOf("sound") >= 0)
+          document.getElementById("playSound").checked = true;
+
+        if (method.indexOf("alert") >= 0)
+          document.getElementById("showAlert").checked = true;
+
+        if (method.indexOf("open") >= 0)
+          document.getElementById("openWindow").checked = true;
+      }
+    }
+  }
+
+  // if its a container, disable some things
+  var isContainerFlag = RDFC.IsContainer(Bookmarks, RDF.GetResource(gBookmarkURL));
+  if (!isContainerFlag) {
+    // XXX To do: the "RDFC.IsContainer" call above only works for RDF sequences;
+    //            if its not a RDF sequence, we should to more checking to see if
+    //            the item in question is really a container of not.  A good example
+    //            of this is the "File System" container.
+  }
+
+  if (isContainerFlag) {
+    // If it is a folder, it has no URL or Keyword
+    document.getElementById("locationrow").setAttribute("hidden", "true");
+    document.getElementById("shortcutrow").setAttribute("hidden", "true");
+  }
+
+  if (gBookmarkURL.substr(0, 7).toLowerCase() != "http://" &&
+      gBookmarkURL.substr(0, 8).toLowerCase() != "https://") {
+    // only allow scheduling of http/https URLs
+    document.getElementById("ScheduleTab").setAttribute("hidden", "true");
+    document.getElementById("NotifyTab").setAttribute("hidden", "true");
+  }
+
+  sizeToContent();
+  
+  // Set up the enabled of controls on the scheduling panels
+  dayRangeChange(document.getElementById("dayRange"));
+
+  // set initial focus
+  document.getElementById("name").focus();
+}
+
+
+
+function Commit()
+{
+  var changed = false;
+
+  // Grovel through the fields to see if any of the values have
+  // changed. If so, update the RDF graph and force them to be saved
+  // to disk.
+  for (var i = 0; i < gFields.length; ++i) {
+    var field = document.getElementById(gFields[i]);
+
+    if (field) {
+      // Get the new value as a literal, using 'null' if the value is empty.
+      var newvalue = field.value;
+
+      var oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                         RDF.GetResource(gProperties[i]),
+                                         true);
+
+      if (oldvalue)
+        oldvalue = oldvalue.QueryInterface(Components.interfaces.nsIRDFLiteral);
+
+      if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "ShortcutURL")) {
+        // shortcuts are always lowercased internally
+        newvalue = newvalue.toLowerCase();
+      }
+      else if (newvalue && gProperties[i] == (NC_NAMESPACE_URI + "URL")) {
+        // we're dealing with the URL attribute;
+        // if a scheme isn't specified, use "http://"
+        if (newvalue.indexOf(":") < 0)
+          newvalue = "http://" + newvalue;
+      }
+
+      if (newvalue)
+        newvalue = RDF.GetLiteral(newvalue);
+
+      if (updateAttribute(gProperties[i], oldvalue, newvalue)) {
+        // Update gBookmarkURL if the url changed
+        if (newvalue && gProperties[i] == NC_NAMESPACE_URI + "URL")
+          gBookmarkURL = newvalue.Value;
+
+        changed = true;
+      }
+    }
+  }
+
+  // Update bookmark schedule if necessary;
+  // if the tab was removed, just skip it
+  var scheduleTab = document.getElementById("ScheduleTab");
+  if (scheduleTab) {
+    var scheduleRes = "http://home.netscape.com/WEB-rdf#Schedule";
+    oldvalue = Bookmarks.GetTarget(RDF.GetResource(gBookmarkURL),
+                                   RDF.GetResource(scheduleRes), true);
+    newvalue = "";
+    var dayRangeNode = document.getElementById("dayRange");
+    var dayRange = dayRangeNode.selectedItem.getAttribute("value");
+
+    if (dayRange) {
+      var startHourRangeNode = document.getElementById("startHourRange");
+      var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
+
+      var endHourRangeNode = document.getElementById("endHourRange");
+      var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
+
+      if (parseInt(startHourRange) > parseInt(endHourRange)) {
+        var temp = startHourRange;
+        startHourRange = endHourRange;
+        endHourRange = temp;
+      }
+
+      var bookmarkBundle;
+      var duration = document.getElementById("duration").value;
+      if (!duration) {
+        bookmarkBundle = document.getElementById("bundle_bookmark");
+        alert (bookmarkBundle.getString("pleaseEnterADuration"));
+        return false;
+      }
+
+      var methods = [];
+      if (document.getElementById("bookmarkIcon").checked)
+        methods.push("icon");
+      if (document.getElementById("playSound").checked)
+        methods.push("sound");
+      if (document.getElementById("showAlert").checked)
+        methods.push("alert");
+      if (document.getElementById("openWindow").checked)
+        methods.push("open");
+
+      if (methods.length == 0) {
+        bookmarkBundle = document.getElementById("bundle_bookmark");
+        alert (bookmarkBundle.getString("pleaseSelectANotification"));
+        return false;
+      }
+
+      var method = methods.join(); // join string in array with ","
+
+      newvalue = dayRange + "|" + startHourRange + "-" + endHourRange + "|" + duration + "|" + method;
+    }
+
+    if (newvalue)
+      newvalue = RDF.GetLiteral(newvalue);
+
+    if (updateAttribute(scheduleRes, oldvalue, newvalue))
+      changed = true;
+  }
+
+  if (changed) {
+    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    if (remote)
+      remote.Flush();
+  }
+
+  window.close();
+  return true;
+}
+
+function updateAttribute(prop, oldvalue, newvalue)
+{
+  var changed = false;
+
+  if (prop && (oldvalue || newvalue) && oldvalue != newvalue) {
+
+    if (oldvalue && !newvalue) {
+      Bookmarks.Unassert(RDF.GetResource(gBookmarkURL),
+                         RDF.GetResource(prop),
+                         oldvalue);
+    }
+    else if (!oldvalue && newvalue) {
+      Bookmarks.Assert(RDF.GetResource(gBookmarkURL),
+                       RDF.GetResource(prop),
+                       newvalue,
+                       true);
+    }
+    else /* if (oldvalue && newvalue) */ {
+      Bookmarks.Change(RDF.GetResource(gBookmarkURL),
+                       RDF.GetResource(prop),
+                       oldvalue,
+                       newvalue);
+    }
+
+    changed = true;
+  }
+
+  return changed;
+}
+
+function setEndHourRange()
+{
+  // Get the values of the start-time and end-time as ints
+  var startHourRangeNode = document.getElementById("startHourRange");
+  var startHourRange = startHourRangeNode.selectedItem.getAttribute("value");
+  var startHourRangeInt = parseInt(startHourRange);
+
+  var endHourRangeNode = document.getElementById("endHourRange");
+  var endHourRange = endHourRangeNode.selectedItem.getAttribute("value");
+  var endHourRangeInt = parseInt(endHourRange);
+
+  var endHourItemNode = endHourRangeNode.firstChild.firstChild;
+
+  var index = 0;
+
+  // disable all those end-times before the start-time
+  for (; index < startHourRangeInt; ++index) {
+    endHourItemNode.setAttribute("disabled", "true");
+    endHourItemNode = endHourItemNode.nextSibling;
+  }
+
+  // update the selected value if it's out of the allowed range
+  if (startHourRangeInt >= endHourRangeInt)
+    endHourRangeNode.selectedItem = endHourItemNode;
+
+  // make sure all the end-times after the start-time are enabled
+  for (; index < 24; ++index) {
+    endHourItemNode.removeAttribute("disabled");
+    endHourItemNode = endHourItemNode.nextSibling;
+  }
+}
+
+function dayRangeChange (aMenuList)
+{
+  var controls = ["startHourRange", "endHourRange", "duration", "bookmarkIcon", 
+                  "showAlert", "openWindow", "playSound", "durationSubLabel", 
+                  "durationLabel", "startHourRangeLabel", "endHourRangeLabel"];
+  for (var i = 0; i < controls.length; ++i)
+    document.getElementById(controls[i]).disabled = !aMenuList.value;
+}
+
+

mozilla/xpfe/components/bookmarks/resources/bm-props.xul

@@ -0,0 +1,243 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; 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): 
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % bmpropsDTD SYSTEM "chrome://communicator/locale/bookmarks/bm-props.dtd">
+%bmpropsDTD;
+]>
+
+<window id="bmPropsWindow" xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&bookmarks.windowtitle.label;"
+        onload="Init()" style="width: 30em;"
+        class="dialog" orient="vertical">
+ 
+  <stringbundle id="bundle_bookmark" src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-props.js"/>
+
+  <keyset id="dialogKeys"/>  
+  
+  <keyset id="keyset"/>  
+    
+  <tabbox orient="vertical">
+    <tabs>
+      <tab label="&generalInfo.label;" accesskey="&generalInfo.accesskey;"/>
+      <tab id="ScheduleTab" label="&schedule.label;" accesskey="&schedule.accesskey;"/>
+      <tab id="NotifyTab" label="&notification.label;" accesskey="&notification.accesskey;"/>
+    </tabs>
+    <tabpanels>
+      <vbox>
+        <separator class="thin"/>
+        <hbox autostretch="never" valign="top">
+          <image class="message-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <html flex="1">&generaldesc.label;</html>
+        </hbox>
+   
+        <separator class="thin"/>
+        
+        <vbox class="box-padded">    
+          <grid>
+            <columns>
+              <column flex="1"/>
+              <column flex="3"/>
+            </columns>
+            <rows>
+              <row>
+                <text class="label" value="&bookmarks.name.label;" for="name"/>
+                <textbox id="name"/>
+              </row>
+              <row id="locationrow">
+                <text class="label" value="&bookmarks.location.label;" for="url"/>
+          			<textbox id="url" />
+              </row>
+              <row id="shortcutrow">
+                <text class="label" value="&bookmarks.shortcut.label;" for="shortcut"/>
+    		      	<textbox id="shortcut" />
+              </row>
+              <row>
+                <text class="label" value="&bookmarks.description.label;" for="description"/>
+          			<textbox multiline="true" wrap="virtual" id="description" flex="1"/>
+              </row>
+            </rows>
+          </grid>
+          <separator/>
+        </vbox>
+      </vbox>
+      
+      <vbox>
+        <separator class="thin"/>
+        <hbox autostretch="never">
+          <image id="schedule-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <html flex="1">&schedule.description;</html>
+        </hbox>
+        <separator class="thin"/>
+        <hbox class="box-padded">
+          <spring flex="1"/>
+          <titledbox orient="vertical">
+            <label class="label" value="&checkforupdates.legend.label;"/>
+            <grid flex="1">
+              <columns>
+                <column/>
+                <column flex="1"/>
+              </columns>
+              <rows>
+                <row autostretch="never">
+                  <text class="label" value="&when.label;" for="dayRange"/>
+                  <hbox>
+                    <menulist id="dayRange" oncommand="dayRangeChange(this);">
+                      <menupopup>
+                        <menuitem value="" label="&checknever.label;"/>
+                        <menuseparator />
+                        <menuitem value="0123456" label="&checkeveryday.label;"/>
+                        <menuitem value="12345" label="&checkweekdays.label;"/>
+                        <menuitem value="06" label="&checkweekends.label;"/>
+                        <menuitem value="1" label="&checkmondays.label;"/>
+                        <menuitem value="2" label="&checktuesdays.label;"/>
+                        <menuitem value="3" label="&checkwednesdays.label;"/>
+                        <menuitem value="4" label="&checkthursdays.label;"/>
+                        <menuitem value="5" label="&checkfridays.label;"/>
+                        <menuitem value="6" label="&checksaturdays.label;"/>
+                        <menuitem value="0" label="&checksundays.label;"/>
+                      </menupopup>
+                    </menulist>
+                  </hbox>
+                </row>
+                <row autostretch="never">
+                  <text id="startHourRangeLabel" class="label" 
+                        value="&from.label;" for="startHourRange"/>
+                  <hbox autostretch="never">
+                    <menulist id="startHourRange" oncommand="setEndHourRange()">
+                      <menupopup>
+                        <menuitem value="0" label="&midnight.label;"/>
+                        <menuitem value="1" label="&AMone.label;"/>
+                        <menuitem value="2" label="&AMtwo.label;"/>
+                        <menuitem value="3" label="&AMthree.label;"/>
+                        <menuitem value="4" label="&AMfour.label;"/>
+                        <menuitem value="5" label="&AMfive.label;"/>
+                        <menuitem value="6" label="&AMsix.label;"/>
+                        <menuitem value="7" label="&AMseven.label;"/>
+                        <menuitem value="8" label="&AMeight.label;"/>
+                        <menuitem value="9" label="&AMnine.label;"/>
+                        <menuitem value="10" label="&AMten.label;"/>
+                        <menuitem value="11" label="&AMeleven.label;"/>
+                        <menuitem value="12" label="&noon.label;"/>
+                        <menuitem value="13" label="&PMone.label;"/>
+                        <menuitem value="14" label="&PMtwo.label;"/>
+                        <menuitem value="15" label="&PMthree.label;"/>
+                        <menuitem value="16" label="&PMfour.label;"/>
+                        <menuitem value="17" label="&PMfive.label;"/>
+                        <menuitem value="18" label="&PMsix.label;"/>
+                        <menuitem value="19" label="&PMseven.label;"/>
+                        <menuitem value="20" label="&PMeight.label;"/>
+                        <menuitem value="21" label="&PMnine.label;"/>
+                        <menuitem value="22" label="&PMten.label;"/>
+                        <menuitem value="23" label="&PMeleven.label;"/>
+                      </menupopup>
+                    </menulist>
+                    <text id="endHourRangeLabel" class="label" 
+                          value="&to.label;" for="endHourRange"/>
+                    <menulist id="endHourRange">
+                      <menupopup oncreate="setEndHourRange()">
+                        <menuitem value="1" label="&AMone.label;"/>
+                        <menuitem value="2" label="&AMtwo.label;"/>
+                        <menuitem value="3" label="&AMthree.label;"/>
+                        <menuitem value="4" label="&AMfour.label;"/>
+                        <menuitem value="5" label="&AMfive.label;"/>
+                        <menuitem value="6" label="&AMsix.label;"/>
+                        <menuitem value="7" label="&AMseven.label;"/>
+                        <menuitem value="8" label="&AMeight.label;"/>
+                        <menuitem value="9" label="&AMnine.label;"/>
+                        <menuitem value="10" label="&AMten.label;"/>
+                        <menuitem value="11" label="&AMeleven.label;"/>
+                        <menuitem value="12" label="&noon.label;"/>
+                        <menuitem value="13" label="&PMone.label;"/>
+                        <menuitem value="14" label="&PMtwo.label;"/>
+                        <menuitem value="15" label="&PMthree.label;"/>
+                        <menuitem value="16" label="&PMfour.label;"/>
+                        <menuitem value="17" label="&PMfive.label;"/>
+                        <menuitem value="18" label="&PMsix.label;"/>
+                        <menuitem value="19" label="&PMseven.label;"/>
+                        <menuitem value="20" label="&PMeight.label;"/>
+                        <menuitem value="21" label="&PMnine.label;"/>
+                        <menuitem value="22" label="&PMten.label;"/>
+                        <menuitem value="23" label="&PMeleven.label;"/>
+                        <menuitem value="24" label="&midnight.label;"/>
+                      </menupopup>
+                    </menulist>
+                  </hbox>
+                </row>
+                <row autostretch="never">
+                  <text id="durationLabel" class="label" 
+                        value="&every.label;" for="duration"/>
+                  <hbox autostretch="never">
+              	    <textbox id="duration" size="4" value="60" />
+      	            <text id="durationSubLabel" class="label" value="&minutes.label;" />
+                  </hbox>
+                </row>
+              </rows>
+            </grid>
+            <separator class="thin"/>
+          </titledbox>
+          <spring flex="1"/>
+        </hbox>
+      </vbox>
+          
+      <vbox>
+        <separator class="thin"/>
+        <hbox autostretch="never" valign="top">
+          <image id="notification-icon"/>
+          <separator class="thin" orient="vertical"/>
+          <html flex="1">&notification.description;</html>
+        </hbox>
+        <separator class="thin"/>
+        <hbox class="box-padded">
+          <spring flex="1"/>
+          <titledbox orient="vertical" autostretch="never">
+            <label value="&notifications.legend.label;" />
+            <checkbox id="bookmarkIcon" label="&notification.icon.label;" />
+            <checkbox id="showAlert" label="&notification.alert.label;" />
+            <checkbox id="openWindow" label="&notification.window.label;" />
+            <checkbox id="playSound" label="&notification.sound.label;" />
+          </titledbox>
+          <spring flex="1"/>
+        </hbox>
+      </vbox>
+    </tabpanels>
+  </tabbox>
+  
+  <separator/>
+    
+  <box id="okCancelButtonsRight"/>
+
+</window>

mozilla/xpfe/components/bookmarks/resources/bookmarks-temp.js

@@ -0,0 +1,839 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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):
+ */
+
+/*
+  This is the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
+  which will be fixed to use my new code in .9. In the mean time, this file provides a
+  life line to various functionality.
+ */
+
+
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+function Init() {
+    var tree = document.getElementById("bookmarksTree");
+    tree.controllers.appendController(BookmarksController);
+    var children = document.getElementById('treechildren-bookmarks');
+    tree.selectItem(children.firstChild);
+    tree.focus();
+
+    RefreshSort();
+}
+
+var BookmarksController = {
+    supportsCommand: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                return false;
+            case "cmd_cut":
+            case "cmd_copy":
+            case "cmd_paste":
+            case "cmd_delete":
+            case "cmd_selectAll":
+                return true;
+            default:
+                return false;
+        }
+    },
+    isCommandEnabled: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                return false;
+            case "cmd_cut":
+            case "cmd_copy":
+            case "cmd_paste":
+            case "cmd_delete":
+            case "cmd_selectAll":
+                return true;
+            default:
+                return false;
+        }
+    },
+    doCommand: function(command)
+    {
+        switch(command)
+        {
+            case "cmd_undo":
+            case "cmd_redo":
+                break;
+            case "cmd_cut":
+                doCut();
+                break;
+            case "cmd_copy":
+                doCopy();
+                break;
+            case "cmd_paste":
+                doPaste();
+                break;
+            case "cmd_delete":
+                doDelete();
+                break;
+            case "cmd_selectAll":
+                doSelectAll();
+                break;
+        }
+    },
+    onEvent: function(event)
+    {
+        // On blur events set the menu item texts back to the normal values
+        /*if (event == 'blur' )
+          {
+          goSetMenuValue('cmd_undo', 'valueDefault');
+          goSetMenuValue('cmd_redo', 'valueDefault');
+          }*/
+    }
+};
+
+function CommandUpdate_Bookmarks()
+{
+    //goUpdateCommand('button_delete');
+    // get selection info from dir pane
+    /*
+    var oneAddressBookSelected = false;
+    if ( dirTree && dirTree.selectedItems && (dirTree.selectedItems.length == 1) )
+        oneAddressBookSelected = true;
+
+    // get selection info from results pane
+    var selectedCards = GetSelectedAddresses();
+    var oneOrMoreCardsSelected = false;
+    if ( selectedCards )
+        oneOrMoreCardsSelected = true;
+    */
+    // set commands to enabled / disabled
+    //goSetCommandEnabled('cmd_PrintCard', oneAddressBookSelected);
+    goSetCommandEnabled('bm_cmd_find', true/*oneAddressBookSelected*/);
+}
+
+function copySelectionToClipboard()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length < 1) return false;
+
+    var rdf_uri = "@mozilla.org/rdf/rdf-service;1"
+    var RDF = Components.classes[rdf_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var nameRes = RDF.GetResource(NC_NS + "Name");
+    if (!nameRes) return false;
+
+    // Build a url that encodes all the select nodes
+    // as well as their parent nodes
+    var url = "";
+    var text = "";
+    var html = "";
+
+    for (var nodeIndex = 0; nodeIndex < select_list.length; nodeIndex++)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) continue;
+
+        var ID = getAbsoluteID("bookmarksTree", node);
+        if (!ID) continue;
+
+        var IDRes = RDF.GetResource(ID);
+        if (!IDRes) continue;
+        var nameNode = Bookmarks.GetTarget(IDRes, nameRes, true);
+        var theName = "";
+        if (nameNode)
+            nameNode =
+                nameNode.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        if (nameNode) theName = nameNode.Value;
+
+        url += "ID:{" + ID + "};";
+        url += "NAME:{" + theName + "};";
+
+        if (node.getAttribute("container") == "true")
+        {
+            var type = node.getAttribute("type");
+            if (type == NC_NS + "BookmarkSeparator")
+            {
+                // Note: can't encode separators in text, just html
+                html += "<hr><p>";
+            }
+            else
+            {
+                text += ID + "\r";
+
+                html += "<a href='" + ID + "'>";
+                if (theName != "")
+                {
+                    html += theName;
+                }
+                html += "</a><p>";
+            }
+        }
+    }
+
+    if (url == "") return false;
+
+    // get some useful components
+    var trans_uri = "@mozilla.org/widget/transferable;1";
+    var trans = Components.classes[trans_uri].createInstance();
+    if (trans) trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+    if (!trans) return false;
+
+    var clip_uri = "@mozilla.org/widget/clipboard;1";
+    var clip = Components.classes[clip_uri].getService();
+    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
+    if (!clip) return false;
+    clip.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard);
+
+    // save bookmark's ID
+    trans.addDataFlavor("moz/bookmarkclipboarditem");
+    var data_uri = "@mozilla.org/supports-wstring;1";
+    var data = Components.classes[data_uri].createInstance();
+    if (data) {
+        data = data.QueryInterface(Components.interfaces.nsISupportsWString);
+    }
+    if (!data) return false;
+    data.data = url;
+    // double byte data
+    trans.setTransferData("moz/bookmarkclipboarditem", data, url.length*2);
+
+    if (text != "")
+    {
+        trans.addDataFlavor("text/unicode");
+
+        var textData_uri = "@mozilla.org/supports-wstring;1";
+        var textData = Components.classes[textData_uri].createInstance();
+        if (textData) textData = textData.QueryInterface(Components.interfaces.nsISupportsWString);
+        if (!textData) return false;
+        textData.data = text;
+        // double byte data
+        trans.setTransferData("text/unicode", textData, text.length*2);
+    }
+    if (html != "")
+    {
+        trans.addDataFlavor("text/html");
+
+        var wstring_uri = "@mozilla.org/supports-wstring;1";
+        var htmlData = Components.classes[wstring_uri].createInstance();
+        if (htmlData) {
+            var wstring_interface = Components.interfaces.nsISupportsWString;
+            htmlData = htmlData.QueryInterface(wstring_interface);
+        }
+        if (!htmlData) return false;
+        htmlData.data = html;
+        // double byte data
+        trans.setTransferData("text/html", htmlData, html.length*2);
+    }
+    clip.setData(trans, null,
+                 Components.interfaces.nsIClipboard.kGlobalClipboard);
+    return true;
+}
+
+function doCut()
+{
+    if (copySelectionToClipboard() == true) {
+        doDelete(false);
+    }
+    return true;
+}
+
+function doCopy()
+{
+    copySelectionToClipboard();
+    return true;
+}
+
+function doPaste()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length != 1) return false;
+
+    var pasteNodeID = select_list[0].getAttribute("id");
+    var isContainerFlag = (select_list[0].getAttribute("container") == "true");
+
+    var clip_uri = "@mozilla.org/widget/clipboard;1";
+    var clip = Components.classes[clip_uri].getService();
+    if (clip) clip = clip.QueryInterface(Components.interfaces.nsIClipboard);
+    if (!clip) return false;
+
+    var trans_uri = "@mozilla.org/widget/transferable;1";
+    var trans = Components.classes[trans_uri].createInstance();
+    if (trans) {
+        trans = trans.QueryInterface(Components.interfaces.nsITransferable);
+    }
+    if (!trans) return false;
+    trans.addDataFlavor("moz/bookmarkclipboarditem");
+
+    clip.getData(trans, Components.interfaces.nsIClipboard.kGlobalClipboard);
+    var data = new Object();
+    var dataLen = new Object();
+    trans.getTransferData("moz/bookmarkclipboarditem", data, dataLen);
+    if (data) {
+        var data_interface = Components.interfaces.nsISupportsWString
+        data = data.value.QueryInterface(data_interface);
+    }
+    var url = null;
+   // double byte data
+    if (data) url = data.data.substring(0, dataLen.value / 2);
+    if (!url) return false;
+
+    var strings = url.split(";");
+    if (!strings) return false;
+
+    var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
+    var RDF = Components.classes[rdf_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+    var rdfc_uri = "@mozilla.org/rdf/container;1";
+    var RDFC = Components.classes[rdfc_uri].getService();
+    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
+    if (!RDFC) return false;
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var nameRes = RDF.GetResource(NC_NS + "Name");
+    if (!nameRes) return false;
+
+    pasteNodeRes = RDF.GetResource(pasteNodeID);
+    if (!pasteNodeRes) return false;
+    var pasteContainerRes = null;
+    var pasteNodeIndex = -1;
+    if (isContainerFlag == true)
+    {
+        pasteContainerRes = pasteNodeRes;
+    }
+    else
+    {
+        var parID = select_list[0].parentNode.parentNode.getAttribute("ref");
+        if (!parID) {
+            parID = select_list[0].parentNode.parentNode.getAttribute("id");
+        }
+        if (!parID) return false;
+        pasteContainerRes = RDF.GetResource(parID);
+        if (!pasteContainerRes) return false;
+    }
+    RDFC.Init(Bookmarks, pasteContainerRes);
+
+    if (isContainerFlag == false)
+    {
+        pasteNodeIndex = RDFC.IndexOf(pasteNodeRes);
+        if (pasteNodeIndex < 0) return false; // how did that happen?
+    }
+
+    var typeRes = RDF.GetResource(RDF_NS + "type");
+    if (!typeRes) return false;
+    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
+    if (!bmTypeRes) return false;
+
+    var dirty = false;
+    for (var x=0; x<strings.length; x=x+2)
+    {
+        var theID = strings[x];
+        var theName = strings[x+1];
+        if ((theID.indexOf("ID:{") == 0) && (theName.indexOf("NAME:{") == 0))
+        {
+            theID = theID.substr(4, theID.length-5);
+            theName = theName.substr(6, theName.length-7);
+
+            var IDRes = RDF.GetResource(theID);
+            if (!IDRes) continue;
+
+            if (RDFC.IndexOf(IDRes) > 0)
+                continue;
+
+            if (theName != "")
+            {
+                var NameLiteral = RDF.GetLiteral(theName);
+                if (NameLiteral)
+                {
+                    Bookmarks.Assert(IDRes, nameRes, NameLiteral, true);
+                    dirty = true;
+                }
+            }
+            if (isContainerFlag == true)
+              RDFC.AppendElement(IDRes);
+            else
+              RDFC.InsertElementAt(IDRes, pasteNodeIndex++, true);
+            dirty = true;
+
+            // make sure appropriate bookmark type is set
+            var bmTypeNode = Bookmarks.GetTarget( IDRes, typeRes, true );
+            if (!bmTypeNode)
+            {
+                // set default bookmark type
+                Bookmarks.Assert(IDRes, typeRes, bmTypeRes, true);
+            }
+        }
+    }
+    if (dirty == true)
+    {
+        var rdf_ds_interface = Components.interfaces.nsIRDFRemoteDataSource;
+        var remote = Bookmarks.QueryInterface(rdf_ds_interface);
+        if (remote)
+          remote.Flush();
+    }
+    return true;
+}
+
+function doDelete(promptFlag)
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var select_list = treeNode.selectedItems;
+    if (!select_list) return false;
+    if (select_list.length < 1) return false;
+
+    if (promptFlag == true)
+    {
+        var deleteStr = '';
+        if (select_list.length == 1) {
+            deleteStr = get_localized_string("DeleteItem");
+        } else {
+            deleteStr = get_localized_string("DeleteItems");
+        }
+        var ok = confirm(deleteStr);
+        if (!ok) return false;
+    }
+
+    var RDF_uri = "@mozilla.org/rdf/rdf-service;1";
+    var RDF = Components.classes[RDF_uri].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!RDF) return false;
+
+    var RDFC_uri = "@mozilla.org/rdf/container;1";
+    var RDFC = Components.classes[RDFC_uri].getService();
+    RDFC = RDFC.QueryInterface(Components.interfaces.nsIRDFContainer);
+    if (!RDFC) return false;
+
+    var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+    if (!Bookmarks) return false;
+
+    var dirty = false;
+
+    // note: backwards delete so that we handle odd deletion cases such as
+    //       deleting a child of a folder as well as the folder itself
+    for (var nodeIndex=select_list.length-1; nodeIndex>=0; nodeIndex--)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) continue;
+        var ID = node.getAttribute("id");
+        if (!ID) continue;
+
+        // don't allow deletion of various "special" folders
+        if ((ID == "NC:BookmarksRoot") || (ID == "NC:IEFavoritesRoot"))
+        {
+            continue;
+        }
+
+        var parentID = node.parentNode.parentNode.getAttribute("ref");
+        if (!parentID) parentID = node.parentNode.parentNode.getAttribute("id");
+        if (!parentID) continue;
+
+        var IDRes = RDF.GetResource(ID);
+        if (!IDRes) continue;
+        var parentIDRes = RDF.GetResource(parentID);
+        if (!parentIDRes) continue;
+
+        RDFC.Init(Bookmarks, parentIDRes);
+        RDFC.RemoveElement(IDRes, true);
+        dirty = true;
+    }
+
+    if (dirty == true)
+    {
+        var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+        if (remote)
+          remote.Flush();
+    }
+
+    return true;
+}
+
+function doSelectAll()
+{
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    treeNode.selectAll();
+    return true;
+}
+
+function doUnload()
+{
+    // Get the current window position/size.
+    var x = window.screenX;
+    var y = window.screenY;
+    var h = window.outerHeight;
+    var w = window.outerWidth;
+
+    // Store these into the window attributes (for persistence).
+    var win = document.getElementById("bookmark-window");
+    win.setAttribute("x", x);
+    win.setAttribute("y", y);
+    win.setAttribute("height", h);
+    win.setAttribute("width", w);
+}
+
+function BookmarkProperties()
+{
+    var treeNode = document.getElementById('bookmarksTree');
+    var select_list = treeNode.selectedItems;
+
+    if (select_list.length >= 1) {
+        // don't bother showing properties on bookmark separators
+        var type = select_list[0].getAttribute('type');
+        if (type != NC_NS + "BookmarkSeparator") {
+            window.openDialog("chrome://communicator/content/bookmarks/bm-props.xul",
+                              "_blank", "centerscreen,chrome,menubar",
+                              select_list[0].getAttribute("id"));
+        }
+    }
+    return true;
+}
+
+
+
+function OpenBookmarksFind()
+{
+    window.openDialog("chrome://communicator/content/bookmarks/bm-find.xul",
+                      "FindBookmarksWindow",
+                      "dialog=no,close,chrome,resizable", "bookmarks");
+    return true;
+}
+
+
+
+function getAbsoluteID(root, node)
+{
+    var url = node.getAttribute("ref");
+    if ((url == null) || (url == ""))
+    {
+        url = node.getAttribute("id");
+    }
+    try
+    {
+        var rootNode = document.getElementById(root);
+        var ds = null;
+        if (rootNode)
+        {
+            ds = rootNode.database;
+        }
+
+        // add support for anonymous resources such as Internet Search results,
+        // IE favorites under Win32, and NetPositive URLs under BeOS
+        var rdf_uri = "@mozilla.org/rdf/rdf-service;1";
+        var rdf = Components.classes[rdf_uri].getService();
+        if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
+        if (rdf && ds)
+        {
+            var src = rdf.GetResource(url, true);
+            var prop = rdf.GetResource(NC_NS + "URL",
+                                       true);
+            var target = ds.GetTarget(src, prop, true);
+            if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
+            if (target) target = target.Value;
+            if (target) url = target;
+        }
+    }
+    catch(ex)
+    {
+    }
+    return url;
+}
+
+function OpenURL(event, node, root)
+{
+    if ((event.button != 0) || (event.detail != 2)
+        || (node.nodeName != "treeitem"))
+        return false;
+
+    if (node.getAttribute("container") == "true")
+        return false;
+
+    var url = getAbsoluteID(root, node);
+
+    // Ignore "NC:" urls.
+    if (url.substring(0, 3) == "NC:")
+        return false;
+
+    if (event.altKey)
+    {
+        BookmarkProperties();
+    }
+    else
+    {
+        // get right sized window
+        window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
+    }
+    return true;
+}
+
+const nsIFilePicker = Components.interfaces.nsIFilePicker;
+
+function doContextCmd(cmdName)
+{
+    // Do some prompting/confirmation for various bookmark
+    // commands that we know about.
+    // If we have values to pass it, they are added to the arguments array
+
+    var nameVal = "";
+    var urlVal = "";
+    var promptStr;
+
+    var picker_uri;
+    var filePicker;
+
+    if (cmdName == NC_NS + "command?cmd=newbookmark")
+    {
+        while (true)
+        {
+            promptStr = get_localized_string("NewBookmarkURLPrompt");
+            urlVal = prompt(promptStr, "");
+            if (!urlVal || urlVal=="") return false;
+
+            // ensure we get a fully qualified URL (protocol colon address)
+            var colonOffset = urlVal.indexOf(":");
+            if (colonOffset > 0) break;
+            alert(get_localized_string("NeedValidURL"));
+        }
+
+        promptStr = get_localized_string("NewBookmarkNamePrompt");
+        nameVal = prompt(promptStr, "");
+        if (!nameVal || nameVal=="") return false;
+    }
+    else if (cmdName == NC_NS + "command?cmd=newfolder")
+    {
+        promptStr = get_localized_string("NewFolderNamePrompt");
+        nameVal = prompt(promptStr, "");
+        if (!nameVal || nameVal=="") return false;
+    }
+    else if ((cmdName == NC_NS + "command?cmd=deletebookmark") ||
+         (cmdName == NC_NS + "command?cmd=deletebookmarkfolder") ||
+         (cmdName == NC_NS + "command?cmd=deletebookmarkseparator"))
+    {
+        return doDelete(true);
+        //var promptStr = get_localized_string("DeleteItems");
+        //if (!confirm(promptStr)) return false;
+    }
+    else if (cmdName == NC_NS + "command?cmd=import")
+    {
+        try
+        {
+            picker_uri = "@mozilla.org/filepicker;1";
+            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
+            if (!filePicker) return false;
+
+            promptStr = get_localized_string("SelectImport");
+            filePicker.init(window, promptStr, nsIFilePicker.modeOpen);
+            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
+            if (filePicker.show() != nsIFilePicker.returnCancel)
+              var filename = filePicker.fileURL.spec;
+            if ((!filename) || (filename == "")) return false;
+
+            urlVal = filename;
+        }
+        catch(ex)
+        {
+            return false;
+        }
+    }
+    else if (cmdName == NC_NS + "command?cmd=export")
+    {
+        try
+        {
+            picker_uri = "@mozilla.org/filepicker;1";
+            filePicker = Components.classes[picker_uri].createInstance(nsIFilePicker);
+            if (!filePicker) return false;
+
+            promptStr = get_localized_string("EnterExport");
+            filePicker.init(window, promptStr, nsIFilePicker.modeSave);
+            filePicker.defaultString = "bookmarks.html";
+            filePicker.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterAll);
+            if (filePicker.show() != nsIFilePicker.returnCancel &&
+                filePicker.fileURL.spec &&
+                filePicker.fileURL.spec.length > 0) {
+              urlVal = filePicker.fileURL.spec;
+            } else {
+              return false;
+            }
+        }
+        catch(ex)
+        {
+            return false;
+        }
+    }
+
+    var treeNode = document.getElementById("bookmarksTree");
+    if (!treeNode) return false;
+    var db = treeNode.database;
+    if (!db) return false;
+
+    var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
+    if (!compositeDB) return false;
+
+    var isupports_uri = "@mozilla.org/rdf/rdf-service;1";
+    var isupports = Components.classes[isupports_uri].getService();
+    if (!isupports) return false;
+    var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
+    if (!rdf) return false;
+
+    // need a resource for the command
+    var cmdResource = rdf.GetResource(cmdName);
+    if (!cmdResource) return false;
+    cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
+    if (!cmdResource) return false;
+
+    // set up selection nsISupportsArray
+    var selection_uri = "@mozilla.org/supports-array;1";
+    var selectionInstance = Components.classes[selection_uri].createInstance();
+    var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
+
+    // set up arguments nsISupportsArray
+    var arguments_uri = "@mozilla.org/supports-array;1";
+    var argumentsInstance = Components.classes[arguments_uri].createInstance();
+    var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
+
+    // get various arguments (parent, name)
+    var parentArc = rdf.GetResource(NC_NS + "parent");
+    if (!parentArc) return false;
+    var nameArc = rdf.GetResource(NC_NS + "Name");
+    if (!nameArc) return false;
+    var urlArc = rdf.GetResource(NC_NS + "URL");
+    if (!urlArc) return false;
+
+    var select_list = treeNode.selectedItems;
+
+    var uri;
+    var rdfNode;
+
+    if (select_list.length < 1)
+    {
+        // if nothing is selected, default to using the "ref"
+        // on the root of the tree
+        uri = treeNode.getAttribute("ref");
+        if (!uri || uri=="") return false;
+        rdfNode = rdf.GetResource(uri);
+        // add node into selection array
+        if (rdfNode)
+        {
+            selectionArray.AppendElement(rdfNode);
+        }
+
+        // add singular arguments into arguments array
+        if ((nameVal) && (nameVal != ""))
+        {
+            var nameLiteral = rdf.GetLiteral(nameVal);
+            if (!nameLiteral) return false;
+            argumentsArray.AppendElement(nameArc);
+            argumentsArray.AppendElement(nameLiteral);
+        }
+        if ((urlVal) && (urlVal != ""))
+        {
+            var urlLiteral = rdf.GetLiteral(urlVal);
+            if (!urlLiteral) return false;
+            argumentsArray.AppendElement(urlArc);
+            argumentsArray.AppendElement(urlLiteral);
+        }
+    }
+    else for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
+    {
+        var node = select_list[nodeIndex];
+        if (!node) break;
+        uri = node.getAttribute("ref");
+        if ((uri) || (uri == ""))
+        {
+            uri = node.getAttribute("id");
+        }
+        if (!uri) return false;
+
+        rdfNode = rdf.GetResource(uri);
+        if (!rdfNode) break;
+
+        // add node into selection array
+        selectionArray.AppendElement(rdfNode);
+
+        // get the parent's URI
+        var parentURI = "";
+        var theParent = node.parentNode.parentNode;
+        parentURI = theParent.getAttribute("ref");
+        if ((!parentURI) || (parentURI == ""))
+        {
+                parentURI = theParent.getAttribute("id");
+        }
+        if (parentURI == "") return false;
+
+        var parentNode = rdf.GetResource(parentURI, true);
+        if (!parentNode) return false;
+
+        // add multiple arguments into arguments array
+        argumentsArray.AppendElement(parentArc);
+        argumentsArray.AppendElement(parentNode);
+
+        if ((nameVal) && (nameVal != ""))
+        {
+            var nameLiteral2 = rdf.GetLiteral(nameVal);
+            if (!nameLiteral2) return false;
+            argumentsArray.AppendElement(nameArc);
+            argumentsArray.AppendElement(nameLiteral2);
+        }
+        if ((urlVal) && (urlVal != ""))
+        {
+            var urlLiteral2 = rdf.GetLiteral(urlVal);
+            if (!urlLiteral2) return false;
+            argumentsArray.AppendElement(urlArc);
+            argumentsArray.AppendElement(urlLiteral2);
+        }
+    }
+
+    // do the command
+    compositeDB.DoCommand(selectionArray, cmdResource, argumentsArray);
+    return true;
+}
+
+function bookmarkSelect()
+{
+    var tree = document.getElementById("bookmarksTree");
+    var status = document.getElementById("statusbar-text");
+    var val = "";
+    if (tree.selectedItems.length == 1)
+    {
+        val = getAbsoluteID("bookmarksTree", tree.selectedItems[0]);
+
+        // Ignore "NC:" urls.
+        if (val.substring(0, 3) == "NC:")
+        {
+            val = "";
+        }
+    }
+    status.label = val;
+    return true;
+}

mozilla/xpfe/components/bookmarks/resources/bookmarks.js

@@ -0,0 +1,295 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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, v2.0)
+ *   Peter Annema <disttsc@bart.nl>
+ *   Blake Ross   <blakeross@telocity.com>
+ */
+
+////////////////////////////////////////////////////////////////////////////////
+// Get the two bookmarks utility libraries running, attach controllers, focus
+// tree widget, etc.
+function Startup()
+{
+  // Create the Bookmarks Shell
+  var bookmarksTree = document.getElementById("bookmarksTree");
+  gBookmarksShell = new BookmarksWindowTree (bookmarksTree.database);
+
+  // Set up the tree controller
+  bookmarksTree.controllers.appendController(gBookmarksShell.controller);
+
+  const windowNode = document.getElementById("bookmark-window");
+  // If we've been opened with a parameter, root the tree on it.
+  if ("arguments" in window && window.arguments[0]) {
+    var uri = window.arguments[0];
+    bookmarksTree.setAttribute("ref", uri);
+    var title = "";
+    if (uri.substring(0,5) == "find:") {
+      title = gBookmarksShell.getLocaleString("search_results_title");
+      // Update the windowtype so that future searches are directed 
+      // there and the window is not re-used for bookmarks. 
+      windowNode.setAttribute("windowtype", "bookmarks:searchresults");
+    }
+    else {
+      const krNameArc = gBookmarksShell.RDF.GetResource(NC_NS + "Name");
+      const krRoot = gBookmarksShell.RDF.GetResource(window.arguments[0]);
+      var rName = gBookmarksShell.db.GetTarget(krRoot, krNameArc, true);
+      title = rName.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+    }
+    const titleString = gBookmarksShell.getLocaleString("window_title");
+    windowNode.setAttribute("title", titleString.replace(/%folder_name%/gi, title));
+  }
+  else {
+    var rootfoldername = gBookmarksShell.getLocaleString("bookmarks_root");
+    const kProfileContractID = "@mozilla.org/profile/manager;1";
+    const kProfileIID = Components.interfaces.nsIProfile;
+    const kProfile = Components.classes[kProfileContractID].getService(kProfileIID);
+    rootfoldername = rootfoldername.replace(/%user_name%/, kProfile.currentProfile);
+    windowNode.setAttribute("title", rootfoldername);
+  }
+
+  // Update to the last sort.
+  RefreshSort();
+
+  var kids = document.getElementById("treechildren-bookmarks");
+  if (kids.firstChild)
+    bookmarksTree.selectItem(kids.firstChild);
+
+  bookmarksTree.focus();
+}
+
+function Shutdown ()
+{
+  // Store current window position and size in window attributes (for persistence).
+  var win = document.getElementById("bookmark-window");
+  win.setAttribute("x", screenX);
+  win.setAttribute("y", screenY);
+  win.setAttribute("height", outerHeight);
+  win.setAttribute("width", outerWidth);
+
+  gBookmarksShell.flushDataSource();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Class representing the bookmarks window's tree. This subclasses BookmarksTree,
+// which contains methods generic to any tree-like bookmarks UI representation.
+// This class contains data specific to the tree in this window, e.g. number of
+// clicks required to load a bookmark, which differs from other bookmarks tree
+// implementations (such as sidebar).
+function BookmarksWindowTree (aCompositeDataSource)
+{
+  // 'db' is used by the base class.
+  this.db = aCompositeDataSource;
+  this.id = "bookmarksTree";
+}
+
+BookmarksWindowTree.prototype = {
+  __proto__: BookmarksTree.prototype,
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Number of clicks to activate a bookmark.
+  openClickCount: 2,
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Open Bookmark in new window
+  openNewWindow: true,
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Selection change (clicks, key navigation) in the tree update the statusbar
+  // with the current item's URL.
+  treeSelect: function (aEvent)
+  {
+    document.commandDispatcher.updateCommands("tree-select");
+    const kBookmarksTree = document.getElementById("bookmarksTree");
+    const kStatusBar = document.getElementById("statusbar-text");
+    var displayValue = "";
+    if (kBookmarksTree.selectedItems.length == 1) {
+      var currItem = kBookmarksTree.selectedItems[0]
+      if (currItem.getAttribute("container") == "true") {
+        const kRDFCContractID = "@mozilla.org/rdf/container;1";
+        const kRDFCIID = Components.interfaces.nsIRDFContainer;
+        const kRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+        const krSrc = this.RDF.GetResource(NODE_ID(currItem));
+        try {
+          kRDFC.Init(this.db, krSrc);
+          var count = kRDFC.GetCount();
+          displayValue = gBookmarksShell.getLocaleString("status_foldercount");
+          displayValue = displayValue.replace(/%num_items%/, count);
+        }
+        catch (e) {
+        }
+      }
+      else {
+        try {
+          displayValue = LITERAL(this.db, currItem, NC_NS + "URL");
+        }
+        catch (e) {
+          displayValue = "";
+        }
+      }
+      if (displayValue.substring(0, 3) == "NC:")
+        displayValue = "";
+    }
+    kStatusBar.label = displayValue;
+  }
+
+};
+
+/*
+Not used anymore but keeping code around in case it comes in handy for bookmarks button D&D
+or personal toolbar D&D.
+
+///////////////////////////////////////////////////////////////////////////////
+// This will not work properly until drag & drop is asynchronous and allows
+// events to be processed during a drag.
+var fileButton = {
+  menuIsOpen: { },
+
+  onDragOver: function (aEvent, aFlavour, aDragSession)
+  {
+    const kMBO = Components.interfaces.nsIMenuBoxObject;
+    var target = aEvent.target;
+    if (!(target.id in fileButton.menuIsOpen))
+      fileButton.menuIsOpen[target.id] = false;
+
+    if (!fileButton.menuIsOpen[target.id] &&
+        (target.localName == "menu" || target.localName == "menubutton")) {
+      var mBO = target.boxObject.QueryInterface(kMBO);
+      mBO.openMenu(true);
+      fileButton.menuIsOpen[target.id] = true;
+    }
+    if (target.localName == "menu" || target.localName == "menuitem") {
+      var parentMenu = target.parentNode.parentNode;
+      var parentBO = parentMenu.boxObject.QueryInterface(kMBO);
+      parentBO.activeChild = target;
+    }
+  },
+
+  onPopupDestroy: function (aEvent)
+  {
+    fileButton.menuIsOpen[aEvent.target.parentNode.id] = false;
+  },
+
+  createPopupHeader: function (aEvent)
+  {
+    const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    const target = aEvent.target;
+    var parentNode = target.localName == "menupopup" ? target : target.firstChild;
+    // Don't create a separator for an empty folder,
+    if (target.localName == "menu") {
+      parentNode = document.createElementNS(kXULNS, "menupopup");
+      target.appendChild(parentNode);
+      var bo = target.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
+      bo.openMenu(true);
+    }
+    if (parentNode.firstChild &&
+        parentNode.firstChild.getAttribute("x-generated") == "true") {
+      // clear out cruft.
+      parentNode.removeChild(target.firstChild);
+      parentNode.removeChild(target.firstChild);
+    }
+    var menuseparator = document.createElementNS(kXULNS, "menuseparator");
+    menuseparator.setAttribute("x-generated", "true");
+    parentNode.insertBefore(menuseparator, target.firstChild);
+    var menuitem = document.createElementNS(kXULNS, "menuitem");
+    const kRDF = gBookmarksShell.RDF;
+    const kNameArc = kRDF.GetResource(NC_NS + "Name");
+    var uri = NODE_ID(target.localName == "menupopup" ? target.parentNode : target);
+    var nameVal;
+    var str;
+    if (uri == "NC:BookmarksRoot") {
+      str = gBookmarksShell.getLocaleString("bookmarks_root")
+      const kProfileContractID = "@mozilla.org/profile/manager;1";
+      const kProfileIID = Components.interfaces.nsIProfile;
+      const kProfile = Components.classes[kProfileContractID].getService(kProfileIID);
+      nameVal = str.replace(/%user_name%/, kProfile.currentProfile);
+    }
+    else {
+      const kSrc = kRDF.GetResource(uri);
+      const kBMDS = kRDF.GetDataSource("rdf:bookmarks");
+      nameVal = kBMDS.GetTarget(kSrc, kNameArc, true);
+      nameVal = nameVal.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+    }
+    str = gBookmarksShell.getLocaleString("file_in");
+    str = str.replace(/%folder_name%/, nameVal);
+    menuitem.setAttribute("folder-uri", uri);
+    menuitem.setAttribute("label", str);
+    menuitem.setAttribute("x-generated", "true");
+    parentNode.insertBefore(menuitem, target.firstChild);
+    menuitem.addEventListener("command", fileButton.fileBookmarks, false);
+  },
+
+  fileBookmarks: function (aEvent)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    if (!bookmarksTree.selectedItems.length) return;
+    var toFolderURI = aEvent.target.getAttribute("folder-uri");
+    var additiveFlag = false;
+
+    if ("beginBatch" in this)
+      this.beginBatch();
+    for (var i = 0; i < bookmarksTree.selectedItems.length; ++i) {
+      var currItem = bookmarksTree.selectedItems[i];
+      var currURI = NODE_ID(currItem);
+      var parent = gBookmarksShell.findRDFNode(currItem, false);
+      gBookmarksShell.moveBookmark(currURI, NODE_ID(parent), toFolderURI);
+      gBookmarksShell.selectFolderItem(toFolderURI, currURI, additiveFlag);
+      if (!additiveFlag) additiveFlag = true;
+    }
+    if ("endBatch" in this)
+      this.endBatch();
+    gBookmarksShell.flushDataSource();
+  },
+
+  _flavourSet: null,
+  getSupportedFlavours: function ()
+  {
+    if (!this._flavourSet) {
+      this._flavourSet = new FlavourSet();
+      this._flavourSet.appendFlavour("moz/rdfitem");
+    }
+    return this._flavourSet;
+  },
+
+  canHandleMultipleItems: true,
+  onDrop: function (aEvent, aXferData, aDragSession)
+  {
+    var dataList = aXferData.dataList;
+    const kToFolderURI = aEvent.target.getAttribute("folder-uri");
+    var additiveFlag = false;
+    for (var i = 0; i < dataList.length; ++i) {
+      var flavourData = dataList[i].first;
+      var data = flavourData.data;
+      var ix = data.indexOf("\n");
+      var sourceID, parentID;
+      sourceID = ix >= 0 ? (parentID = data.substr(ix+1), data.substr(0, ix)) : data;
+      gBookmarksShell.moveBookmark(sourceID, parentID, kToFolderURI);
+      gBookmarksShell.selectFolderItem(kToFolderURI, sourceID, additiveFlag);
+      if (!additiveFlag) additiveFlag = true;
+    }
+    gBookmarksShell.flushDataSource();
+    var menu = document.getElementById("file-bookmarks");
+    var bo = menu.boxObject.QueryInterface(Components.interfaces.nsIMenuBoxObject);
+    bo.openMenu(false);
+    this.menuIsOpen = { };
+  }
+};
+
+*/

mozilla/xpfe/components/bookmarks/resources/bookmarks.xul

@@ -0,0 +1,398 @@
+<?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>
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
+%utilDTD;
+<!ENTITY % bmDTD SYSTEM "chrome://communicator/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" orient="vertical"
+        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/treePopups.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTreeUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+
+  <!-- XXX - This should SO become an XBL widget -->
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  
+  <!-- Shared Bookmarks Utility Library -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <!-- Tree-based Bookmarks UI Utility Library -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
+  <!-- Bookmarks Window -->
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+
+  <!-- Bookmarks Window Drag & Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <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://communicator/content/bookmarks/bookmarksDD.js"/>
+
+  <popupset id="bookmarksPopupset"/>
+
+  <commands id="commands">
+    <commandset id="CommandUpdate_Bookmarks"
+                commandupdater="true"
+                events="focus,tree-select"
+                oncommandupdate="BookmarksTree.prototype.controller.onCommandUpdate()">
+    </commandset>                
+
+    <commandset id="tasksCommands"/>
+    <commandset id="bookmarksItems"/>
+  
+
+    <!-- File Menu -->
+    <command id="cmd_newNavigator"/>
+    <command id="cmd_newEditor"/>
+    <command id="cmd_close" oncommand="close()"/>
+    <command id="cmd_quit"/>
+    <!-- Edit Menu -->
+    <command id="cmd_undo"/>
+  </commands>
+
+  <stringbundleset id="stringbundleset"/>
+
+  <keyset id="tasksKeys">
+    <!-- File Menu -->
+    <key id="key_newNavigator"/>
+    <key id="key_newEditor"/>
+    <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_find" modifiers="accel"/>
+    <key id="bm_key_properties" 
+         key="&edit.properties.keybinding;"  
+         command="cmd_properties" modifiers="accel"/>
+  </keyset>
+  
+  <toolbox id="bookmarks-toolbox">
+    <menubar id="main-menubar" grippy="false">
+      <menu id="menu_File">
+        <menupopup id="menu_FilePopup">
+          <menuitem label="&command.newBookmark.label;" 
+                    accesskey="&command.newBookmark.accesskey;"
+                    observes="cmd_newbookmark"/>
+          <menuitem label="&command.newFolder.label;" observes="cmd_newfolder"/>
+          <menuitem label="&command.newSeparator.label;" observes="cmd_newseparator"/>
+          <menuseparator/>
+          <menuitem id="menu_close"/>
+          <menuseparator/>
+          <menuitem label="&menuitem.import.label;" observes="cmd_import"/>
+          <menuitem label="&menuitem.export.label;" observes="cmd_export"/>
+          <menuseparator/>
+          <menuitem observes="cmd_properties" key="bm_key_properties" 
+                    label="&command.properties.label;" 
+                    accesskey="&command.properties.accesskey;" />
+          <menuseparator/>
+        </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 command="cmd_find" key="bm_key_find"
+                    label="&menuitem.find.label;" 
+                    accesskey="&menuitem.find.accesskey;"/>
+        </menupopup>
+      </menu>
+  
+      <menu id="menu_View">
+        <menupopup oncreate="fillViewMenu(this)">
+          <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');"/>
+          <menuseparator/>
+          <menuitem type="radio" name="sort_column" id="unsorted_menuitem"
+                    label="&menuitem.view.unsorted.label;" 
+                    accesskey="&menuitem.view.unsorted.accesskey;"
+                    oncommand="return SetSortDirection('natural');"/>
+          <menuseparator id="fill_after_this_node" collapsed="true" />
+          <menuseparator id="fill_before_this_node"/>
+          <menuitem type="radio" name="sort_direction" id="sort_ascending"
+                    label="&menuitem.view.ascending.label;" 
+                    accesskey="&menuitem.view.ascending.accesskey;"
+                    oncommand="return SetSortDirection('ascending');"/>
+          <menuitem type="radio" name="sort_direction" id="sort_descending"
+                    label="&menuitem.view.descending.label;" 
+                    accesskey="&menuitem.view.descending.accesskey;"
+                    oncommand="return SetSortDirection('descending');"/>
+          <menuseparator/>
+          <menu label="&menuitem.view.show_columns.label;" 
+                accesskey="&menuitem.view.show_columns.accesskey;">
+            <menupopup oncreate="BuildTreePopup(document.getElementById('theColumns'), 
+                                                document.getElementById('headRow'), this,
+                                                document.getElementById('popupCell'))"/>
+          </menu>
+          <menuseparator/>
+          <menuitem label="&menuitem.newbookmarkfolder.label;" 
+                    observes="cmd_setnewbookmarkfolder"
+                    accesskey="&menuitem.newbookmarkfolder.accesskey;"/>
+          <menuitem label="&menuitem.newinternetsearchfolder.label;"
+                    observes="cmd_setnewsearchfolder"
+                    accesskey="&menuitem.newinternetsearchfolder.accesskey;"/>
+          <menuitem label="&menuitem.personaltoolbarfolder.label;"    
+                    observes="cmd_setpersonaltoolbarfolder"
+                    accesskey="&menuitem.personaltoolbarfolder.accesskey;"/>
+        </menupopup>
+      </menu>
+      <menu id="tasksMenu"/>
+      <menu id="menu_Help"/>
+    </menubar>
+
+    <toolbar id="command-toolbar" tbautostretch="always" grippy="false">
+      <button class="button-toolbar" id="newfolder" label="&command.newFolder.label;" 
+              command="cmd_newfolder"/>
+      <button class="button-toolbar" id="newseparator" label="&command.newSeparator.label;" 
+              command="cmd_newseparator"/>
+      <toolbarseparator/>
+      <button class="button-toolbar" id="fileBookmark" label="&command.fileBookmark.label;"
+              command="cmd_bm_fileBookmark"/>
+      <toolbarseparator/>
+      <button class="button-toolbar" id="properties" label="&command.properties.label;"
+              command="cmd_properties"/>
+      <button class="button-toolbar" id="rename" label="&command.rename.label;"
+              command="cmd_rename"/>
+      <button class="button-toolbar" id="delete" label="&command.delete.label;"
+              command="cmd_bm_delete"/>
+    </toolbar>
+  </toolbox>
+  
+  <tree id="bookmarksTree" class="bookmarks-window-tree" ref="NC:BookmarksRoot"
+        datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch rdf:localsearch"
+        type="http://home.netscape.com/NC-rdf#Folder"
+        multiple="true" flags="dont-test-empty"
+        ondragover="nsDragAndDrop.dragOver(event, bookmarksDNDObserver);"
+        ondraggesture="nsDragAndDrop.startDrag(event, bookmarksDNDObserver);"
+        ondragdrop="nsDragAndDrop.drop(event, bookmarksDNDObserver);"
+        onclick="gBookmarksShell.treeClicked(event);"
+        onselect="gBookmarksShell.treeSelect(event);"
+        onkeydown="gBookmarksShell.treeKeyPress(event);"
+        style="height:0px" flex="2">
+
+    <template>
+      <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+        <treechildren>
+          <treeitem uri="rdf:*"
+                    rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
+            <treerow>
+              <treecell autostretch="never"><treeindentation/>
+                        <separator class="groove" flex="1"/></treecell>
+              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+              <treecell autostretch="never"><separator class="groove" flex="1"/></treecell>
+            </treerow>
+          </treeitem>     
+        </treechildren>
+      </rule>
+  
+      <rule>
+        <treechildren>
+          <treeitem uri="rdf:*" persist="open" class="bookmark-item"
+                    web:status="rdf:http://home.netscape.com/WEB-rdf#status"
+                    rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                    loading="rdf:http://home.netscape.com/NC-rdf#loading">
+            <treerow>
+              <treecell class="treecell-indent" editable="true" 
+                        label="rdf:http://home.netscape.com/NC-rdf#Name"
+                        src="rdf:http://home.netscape.com/NC-rdf#Icon"
+                        web:status="rdf:http://home.netscape.com/WEB-rdf#status"
+                        type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                        loading="rdf:http://home.netscape.com/NC-rdf#loading" />
+              <treecell crop="right" class="treecell-editable" editable="true"
+                        label="rdf:http://home.netscape.com/NC-rdf#URL"/>
+              <treecell label="rdf:http://home.netscape.com/NC-rdf#ShortcutURL"
+                        class="treecell-editable" editable="true"/>
+              <treecell label="rdf:http://home.netscape.com/NC-rdf#Description"
+                        class="treecell-editable" editable="true"/>
+              <treecell label="rdf:http://home.netscape.com/WEB-rdf#LastVisitDate"/>
+              <treecell label="rdf:http://home.netscape.com/NC-rdf#BookmarkAddDate"/>
+              <treecell label="rdf:http://home.netscape.com/WEB-rdf#LastModifiedDate"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </rule>
+    </template>
+
+    <treecolgroup id="theColumns">
+      <treecol id="Name"
+               sortSeparators="true" width="4*" flex="4"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/NC-rdf#Name"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="URL"
+               sortSeparators="true" width="4*" flex="4"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/NC-rdf#URL"
+               resource2="http://home.netscape.com/NC-rdf#Name"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="ShortcutURL" hidden="true"
+               sortSeparators="true" width="1*" flex="1"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/NC-rdf#ShortcutURL"
+               resource2="http://home.netscape.com/NC-rdf#Name"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="Description" hidden="true"
+               sortSeparators="true" width="1*" flex="1"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/NC-rdf#Description"
+               resource2="http://home.netscape.com/NC-rdf#Name"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="LastVisitDate" hidden="true"
+               sortSeparators="true" width="1*" flex="1"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/WEB-rdf#LastVisitDate"
+               resource2="http://home.netscape.com/NC-rdf#Name"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="BookmarkAddDate" hidden="true"
+               sortSeparators="true" width="1*" flex="1"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/NC-rdf#BookmarkAddDate"
+               resource2="http://home.netscape.com/NC-rdf#Name"/>
+      <splitter class="tree-splitter"/>
+      <treecol id="LastModifiedDate" hidden="true"
+               sortSeparators="true" width="1*" flex="1"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"
+               resource2="http://home.netscape.com/NC-rdf#Name"/>
+      <treecol persist="width" fixed="true" width="14" id="PopupColumn"/>
+    </treecolgroup>
+    
+    <treehead>
+      <treerow id="headRow">
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&tree.header.name.label;"
+                  onclick="return TriStateColumnSort('Name');"
+                  observes="Name" />
+        <treecell class="treecell-header sortDirectionIndicator" 
+                  label="&tree.header.url.label;"
+                  onclick="return TriStateColumnSort('URL');"
+                  observes="URL" />
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&tree.header.shortcut.label;"
+                  onclick="return TriStateColumnSort('ShortcutURL');"
+                  observes="ShortcutURL" />
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&tree.header.description.label;" 
+                  onclick="return TriStateColumnSort('Description');"
+                  observes="Description" />
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&tree.header.lastvisit.label;"
+                  onclick="return TriStateColumnSort('LastVisitDate');"
+                  observes="LastVisitDate" />
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&tree.header.addedon.label;"
+                  onclick="return TriStateColumnSort('BookmarkAddDate');"
+                  observes="BookmarkAddDate" />
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&tree.header.lastmod.label;" 
+                  onclick="return TriStateColumnSort('LastModifiedDate');" 
+                  observes="LastModifiedDate" />
+        <treecell class="treecell-header" allowevents="true" id="popupCell">
+          <menu class="treecell-popupcell-menu" autostretch="never">
+            <image class="treecell-popup-icon"/>
+            <menupopup popupanchor="bottomright" popupalign="topright"
+                      oncreate="BuildTreePopup(document.getElementById('theColumns'), 
+                                               document.getElementById('headRow'), this,
+                                               document.getElementById('popupCell'))"/>
+          </menu>
+        </treecell>
+      </treerow>
+    </treehead>
+
+    <treechildren flex="1" id="treechildren-bookmarks" context="bmContext"
+                  onclick="gBookmarksShell.treeOpen(event);"/>
+  </tree>
+    
+  <statusbar id="status-bar">
+    <statusbarpanel id="statusbar-text" flex="1"/>
+  </statusbar>
+
+</window>
+

mozilla/xpfe/components/bookmarks/resources/bookmarksDD-temp.js

@@ -0,0 +1,493 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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): 
+ */
+
+/*
+  This is the old bookmarks code, included here for the sake of the bookmarks sidebar panel,
+  which will be fixed to use my new code in .9. In the mean time, this file provides a 
+  life line to various functionality. 
+ */ 
+ 
+ 
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+
+
+function TopLevelDrag ( event )
+{
+  return(true);
+}
+
+
+function BeginDragTree ( event )
+{
+  //XXX we rely on a capturer to already have determined which item the mouse was over
+  //XXX and have set an attribute.
+    
+  // if the click is on the tree proper, ignore it. We only care about clicks on items.
+
+  var tree = document.getElementById("bookmarksTree");
+  if ( event.target == tree || event.target.localName == "treechildren" )
+    return(true);         // continue propagating the event
+    
+  var childWithDatabase = tree;
+  if ( ! childWithDatabase )
+    return(false);
+    
+  var dragStarted = false;
+
+  var trans = 
+    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+  if ( !trans ) return(false);
+
+  var genData = 
+    Components.classes["@mozilla.org/supports-wstring;1"].createInstance(Components.interfaces.nsISupportsWString);
+  if (!genData) return(false);
+
+  var genDataURL = 
+    Components.classes["@mozilla.org/supports-wstring;1"].createInstance(Components.interfaces.nsISupportsWString);
+  if (!genDataURL) return(false);
+
+  trans.addDataFlavor("text/unicode");
+  trans.addDataFlavor("moz/rdfitem");
+        
+  // ref/id (url) is on the <treeitem> which is two levels above the <treecell> which is
+  // the target of the event.
+  var id = event.target.parentNode.parentNode.getAttribute("ref");
+  if (!id || id=="")
+  {
+	id = event.target.parentNode.parentNode.getAttribute("id");
+  }
+
+  var parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("ref");
+  if (!parentID || parentID == "")
+  {
+	parentID = event.target.parentNode.parentNode.parentNode.parentNode.getAttribute("id");
+  }
+
+  var trueID = id;
+  if (parentID != null)
+  {
+  	trueID += "\n" + parentID;
+  }
+  genData.data = trueID;
+  genDataURL.data = id;
+
+  var database = childWithDatabase.database;
+  var rdf = 
+    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  if ((!rdf) || (!database))  { dump("CAN'T GET DATABASE\n"); return(false); }
+
+  // make sure its a bookmark, bookmark separator, or bookmark folder
+  var src = rdf.GetResource(id, true);
+  var prop = rdf.GetResource(RDF_NS + "type", true);
+  var target = database.GetTarget(src, prop, true);
+
+  if (target) target = target.QueryInterface(Components.interfaces.nsIRDFResource);
+  if (target) target = target.Value;
+  if ((!target) || (target == "")) {dump("BAD\n"); return(false);}
+
+  if ((target != NC_NS + "BookmarkSeparator") &&
+    (target != NC_NS + "Bookmark") &&
+    (target != NC_NS + "Folder")) return(false);
+
+  trans.setTransferData ( "moz/rdfitem", genData, genData.data.length * 2);  // double byte data
+  trans.setTransferData ( "text/unicode", genDataURL, genDataURL.data.length * 2);  // double byte data
+
+  var transArray = 
+    Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);
+  if ( !transArray )  return(false);
+
+  // put it into the transferable as an |nsISupports|
+  var genTrans = trans.QueryInterface(Components.interfaces.nsISupports);
+  transArray.AppendElement(genTrans);
+  
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+
+  var nsIDragService = Components.interfaces.nsIDragService;
+  dragService.invokeDragSession ( event.target, transArray, null, nsIDragService.DRAGDROP_ACTION_COPY + 
+                                     nsIDragService.DRAGDROP_ACTION_MOVE );
+  dragStarted = true;
+
+  return(!dragStarted);
+}
+
+
+
+function DragOverTree ( event )
+{
+  var validFlavor = false;
+  var dragSession = null;
+  var retVal = true;
+
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+
+  dragSession = dragService.getCurrentSession();
+  if ( !dragSession ) return(false);
+
+  if ( dragSession.isDataFlavorSupported("moz/rdfitem") ) validFlavor = true;
+  else if ( dragSession.isDataFlavorSupported("text/unicode") ) validFlavor = true;
+  //XXX other flavors here...
+
+  // touch the attribute on the rowgroup to trigger the repaint with the drop feedback.
+  if ( validFlavor )
+  {
+    var treeRoot = document.getElementById("bookmarksTree");
+    if (!treeRoot)  return(false);
+    var treeDatabase = treeRoot.database;
+    if (!treeDatabase)  return(false);
+
+    //XXX this is really slow and likes to refresh N times per second.
+    var rowGroup = event.target.parentNode.parentNode;
+    var sortActive = treeRoot.getAttribute("sortActive");
+    if (sortActive == "true")
+      rowGroup.setAttribute ( "dd-triggerrepaintsorted", 0 );
+    else
+      rowGroup.setAttribute ( "dd-triggerrepaint", 0 );
+
+    dragSession.canDrop = true;
+    // necessary??
+    retVal = false;
+  }
+  return(retVal);
+}
+
+
+
+function DropOnTree ( event )
+{
+  var treeRoot = document.getElementById("bookmarksTree");
+  if (!treeRoot)  return(false);
+  var treeDatabase = treeRoot.database;
+  if (!treeDatabase)  return(false);
+
+  // for beta1, don't allow D&D if sorting is active
+  var sortActive = treeRoot.getAttribute("sortActive");
+  if (sortActive == "true")
+  {
+  	dump("Sorry, drag&drop is currently disabled when sorting is active.\n");
+  	return(false);
+  }
+
+  var RDF = 
+    Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+  if (!RDF) return(false);
+  var RDFC =
+    Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
+  if (!RDFC)  return(false);
+
+  var Bookmarks = RDF.GetDataSource("rdf:bookmarks");
+  if (!Bookmarks) return(false);
+
+  // target is the <treecell>, and "ref/id" is on the <treeitem> two levels above
+  var treeItem = event.target.parentNode.parentNode;
+  if (!treeItem)  return(false);
+
+  // get drop hint attributes
+  var dropBefore = treeItem.getAttribute("dd-droplocation");
+  var dropOn = treeItem.getAttribute("dd-dropon");
+
+  // calculate drop action
+  var dropAction;
+  if (dropBefore == "true") dropAction = "before";
+  else if (dropOn == "true")  dropAction = "on";
+  else        dropAction = "after";
+
+  // calculate parent container node
+  var containerItem = treeItem;
+  if (dropAction != "on")
+  {
+    containerItem = treeItem.parentNode.parentNode;
+  }
+
+	// magical fix for bug # 33546: handle dropping after open container
+	if (treeItem.getAttribute("container") == "true")
+	{
+		if (treeItem.getAttribute("open") == "true")
+		{
+			if (dropAction == "after")
+			{
+				dropAction = "before";
+				containerItem = treeItem;
+
+				// find <treechildren>, drop before first child
+				var treeChildren = treeItem;
+				treeItem = null;
+				for (var x = 0; x < treeChildren.childNodes.length; x++)
+				{
+					if (treeChildren.childNodes[x].tagName == "treechildren")
+					{
+						treeItem = treeChildren.childNodes[x].childNodes[0];
+						break;
+					}
+				}
+
+				if (!treeItem)
+				{
+					dropAction = "on";
+					containerItem = treeItem.parentNode.parentNode;
+				}
+			}
+		}
+	}
+
+  var targetID = getAbsoluteID("bookmarksTree", treeItem);
+  if (!targetID)  return(false);
+  var targetNode = RDF.GetResource(targetID, true);
+  if (!targetNode)  return(false);
+
+  var containerID = getAbsoluteID("bookmarksTree", containerItem);
+  if (!containerID) return(false);
+  var containerNode = RDF.GetResource(containerID);
+  if (!containerNode) return(false);
+
+  var dragService = 
+    Components.classes["@mozilla.org/widget/dragservice;1"].getService(Components.interfaces.nsIDragService);
+  if ( !dragService ) return(false);
+  
+  var dragSession = dragService.getCurrentSession();
+  if ( !dragSession ) return(false);
+
+  var trans = 
+    Components.classes["@mozilla.org/widget/transferable;1"].createInstance(Components.interfaces.nsITransferable);
+  if ( !trans )   return(false);
+  trans.addDataFlavor("moz/rdfitem");
+  trans.addDataFlavor("text/x-moz-url");
+  trans.addDataFlavor("text/unicode");
+
+    var typeRes = RDF.GetResource(RDF_NS + "type");
+    if (!typeRes) return false;
+    var bmTypeRes = RDF.GetResource(NC_NS + "Bookmark");
+    if (!bmTypeRes) return false;
+
+  var dirty = false;
+
+  for ( var i = 0; i < dragSession.numDropItems; ++i )
+  {
+    dragSession.getData ( trans, i );
+    var dataObj = new Object();
+    var bestFlavor = new Object();
+    var len = new Object();
+    trans.getAnyTransferData ( bestFlavor, dataObj, len );
+    if ( dataObj )  dataObj = dataObj.value.QueryInterface(Components.interfaces.nsISupportsWString);
+    if ( !dataObj ) continue;
+
+    var sourceID = null;
+    var parentID = null;
+    var checkNameHack = false;
+    var name=null;
+
+    if (bestFlavor.value == "moz/rdfitem")
+    {
+	    // pull the URL out of the data object
+	    var data = dataObj.data.substring(0, len.value / 2);
+
+        // moz/rdfitem allows parent ID specified on next line; check for it
+	    var cr = data.indexOf("\n");
+	    if (cr >= 0)
+	    {
+	    	sourceID = data.substr(0, cr);
+	    	parentID = data.substr(cr+1);
+	    }
+	    else
+	    {
+	        sourceID = data;
+	    }
+    }
+    else if (bestFlavor.value == "text/x-moz-url")
+    {
+	    // pull the URL out of the data object
+	    data = dataObj.data.substring(0, len.value / 2);
+	    sourceID = data;
+
+    	// we may need to synthesize a name (just use the URL)
+    	checkNameHack = true;
+    }
+    else if (bestFlavor.value == "text/unicode")
+    {
+    	sourceID = dataObj.data;
+
+    	// we may need to synthesize a name (just use the URL)
+    	checkNameHack = true;
+    }
+    else
+    {
+        // unknown flavor, skip
+        continue;
+    }
+
+    // pull the (optional) name out of the URL
+    var separator = sourceID.indexOf("\n");
+    if (separator >= 0)
+    {
+        name = sourceID.substr(separator+1);
+        sourceID = sourceID.substr(0, separator);
+    }
+
+    var sourceNode = RDF.GetResource(sourceID, true);
+    if (!sourceNode)  continue;
+
+    var parentNode = null;
+    if (parentID != null)
+    {
+    	parentNode = RDF.GetResource(parentID, true);
+    }
+    
+    // Prevent dropping of a node before, after, or on itself
+    if (sourceNode == targetNode) continue;
+    // Prevent dropping of a node onto its parent container
+    if ((dropAction == "on") && (containerID) && (containerID == parentID))	continue;
+
+    RDFC.Init(Bookmarks, containerNode);
+
+    // make sure appropriate bookmark type is set
+    var bmTypeNode = Bookmarks.GetTarget( sourceNode, typeRes, true );
+    if (!bmTypeNode)
+    {
+        // set default bookmark type
+        Bookmarks.Assert(sourceNode, typeRes, bmTypeRes, true);
+    }
+
+    if ((dropAction == "before") || (dropAction == "after"))
+    {
+      // drop before or after
+      var nodeIndex;
+
+      nodeIndex = RDFC.IndexOf(sourceNode);
+
+      if (nodeIndex >= 1)
+      {
+        // moving a node around inside of the container
+        // so remove, then re-add the node
+        RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
+      }
+      
+      nodeIndex = RDFC.IndexOf(targetNode);
+
+      if (nodeIndex < 1)  return(false);
+      if (dropAction == "after")  ++nodeIndex;
+
+      RDFC.InsertElementAt(sourceNode, nodeIndex, true);
+
+	// select the newly added node
+	if (parentID)
+	{
+	      selectDroppedItems(treeRoot, containerID, sourceID);
+	}	     
+
+      dirty = true;
+    }
+    else
+    {
+      // drop on
+      RDFC.AppendElement(sourceNode);
+
+	// select the newly added node
+	if (parentID)
+	{
+	      selectDroppedItems(treeRoot, containerID, sourceID);
+	}	     
+
+      dirty = true;
+    }
+
+    if ((checkNameHack == true) || (name != null))
+    {
+    	var srcArc = RDF.GetResource(sourceID, true);
+    	var propArc = RDF.GetResource(NC_NS + "Name", true);
+    	if (srcArc && propArc && Bookmarks)
+    	{
+    		var targetArc = Bookmarks.GetTarget(srcArc, propArc, true);
+    		if (!targetArc)
+    		{
+    		    // if no name, fallback to using the URL as the name
+    			var defaultNameArc = RDF.GetLiteral((name != null && name != "") ? name : sourceID);
+    			if (defaultNameArc)
+    			{
+    				Bookmarks.Assert(srcArc, propArc, defaultNameArc, true); 
+    			}
+    		}
+    	}
+    }
+  }
+
+	// should we move the node? (i.e. take it out of the source container?)
+	if ((parentNode != null) && (containerNode != parentNode))
+	{
+	    try
+	    {
+    		RDFC.Init(Bookmarks, parentNode);
+    		nodeIndex = RDFC.IndexOf(sourceNode);
+
+    		if (nodeIndex >= 1)
+    		{
+    			RDFC.RemoveElementAt(nodeIndex, true, sourceNode);
+    		}
+        }
+        catch(ex)
+        {
+        }
+	}
+
+  if (dirty == true)
+  {
+    var remote = Bookmarks.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    if (remote)
+    {
+      remote.Flush();
+    }
+  }
+
+  return(false);
+}
+
+
+
+function selectDroppedItems(treeRoot, containerID, targetID)
+{
+	var select_list = treeRoot.getElementsByAttribute("id", targetID);
+	for (var x=0; x<select_list.length; x++)
+	{
+		var node = select_list[x];
+		if (!node)	continue;
+
+		var parent = node.parentNode.parentNode;
+		if (!parent)	continue;
+
+		var id = parent.getAttribute("ref");
+		if (!id || id=="")
+		{
+			id = parent.getAttribute("id");
+		}
+		if (!id || id=="")	continue;
+
+		if (id == containerID)
+		{
+			treeRoot.selectItem(node);
+			break;
+		}
+	}
+}

mozilla/xpfe/components/bookmarks/resources/bookmarksDD.js

@@ -0,0 +1,360 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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, v2.0)
+ */
+
+var NC_NS  = "http://home.netscape.com/NC-rdf#";
+var RDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+
+var gSpringLoadTracker = {
+  timeout: 0,
+  element: null,
+  
+  open: function (aRDFNode) 
+  {
+    if (this.element)
+      this.element.setAttribute("open", "true");
+    clearTimeout(this.timeout);
+  }
+};
+
+var bookmarksDNDObserver = {
+  _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;
+  },
+
+  // XXX I belong somewhere shared. 
+  getResource: function(aString)
+  {
+    return this.RDF.GetResource(aString, true);
+  },
+  
+  getTarget: function(aDS, aSourceID, aPropertyID)
+  {
+    var source = this.getResource(aSourceID);
+    var property = this.getResource(aPropertyID);
+    return aDS.GetTarget(source, property, true);
+  },
+  
+  onDragStart: function (aEvent, aXferData, aDragAction)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    if (aEvent.target == bookmarksTree || aEvent.target.localName == "treechildren" || 
+        aEvent.target.localName == "splitter" || aEvent.target.localName == "menu")
+      throw Components.results.NS_OK; // not a draggable item.
+    if (aEvent.target.parentNode && aEvent.target.parentNode.parentNode &&
+        aEvent.target.parentNode.parentNode.localName == "treehead")
+      throw Components.results.NS_OK; // don't drag treehead cells.
+    if (bookmarksTree.getAttribute("sortActive") == "true")
+      throw Components.results.NS_OK; 
+      
+    dump("*** pass\n");  
+      
+    var selItems = null;
+    if (bookmarksTree.selectedItems.length <= 0)
+      selItems = [aEvent.target.parentNode.parentNode];
+    else 
+      selItems = bookmarksTree.selectedItems;
+    
+    aXferData.data = new TransferDataSet();
+    for (var i = 0; i < selItems.length; ++i) {
+      var currItem = selItems[i];
+      var currURI = NODE_ID(currItem);
+    
+      var parentItem = currItem.parentNode.parentNode;
+      var parentURI = NODE_ID(parentItem);
+    
+      var type = this.getTarget(bookmarksTree.database, currURI, RDF_NS + "type");
+      type = type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
+      if (!type || (type != (NC_NS + "BookmarkSeparator") && 
+                    type != (NC_NS + "Bookmark") && 
+                    type != (NC_NS + "Folder"))) 
+        throw Components.results.NS_OK;
+      var name = this.getTarget(bookmarksTree.database, currURI, NC_NS + "Name");  
+      name = name.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+
+      var data = new TransferData();
+      data.addDataForFlavour("moz/rdfitem", currURI + "\n" + parentURI);
+      data.addDataForFlavour("text/x-moz-url", currURI + "\n" + name);
+      data.addDataForFlavour("text/unicode", currURI);
+      aXferData.data.push(data);
+    }
+
+    if (aEvent.ctrlKey) {
+      const kDSIID = Components.interfaces.nsIDragService;
+      aDragAction.action = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
+    }
+  },
+  
+  onDragOver: function (aEvent, aFlavour, aDragSession)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    var rowGroup = aEvent.target.parentNode.parentNode;
+    if (rowGroup)
+      rowGroup.setAttribute("dd-triggerrepaint" + 
+                            (bookmarksTree.getAttribute("sortActive") == "true" ? "sorted" : ""), 0);
+    
+    var rdfNode = gBookmarksShell.findRDFNode(aEvent.target, true);
+    var rdfParent = rdfNode.parentNode.parentNode;
+    if (rdfParent && rdfParent.getAttribute("container") == "true") {
+      var rDragOverContainer = this.RDF.GetResource(NODE_ID(rdfParent));
+
+      const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+      const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
+      const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
+      const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
+      var isContainer = kRDFCUtils.IsContainer(kBMDS, rDragOverContainer);
+      if (!isContainer) {
+        // This ain't a container. Don't allow drops, and bail before doing anything
+        // else.
+        aDragSession.canDrop = false;
+        return;
+      }
+    }      
+    
+    // Springloaded folders.
+    /* XXX - not yet. 
+    if (rdfNode && rdfNode.getAttribute("container") == "true" &&
+        rdfNode.getAttribute("open") != "true") {
+      if (!gSpringLoadTracker.element || gSpringLoadTracker.element.id != rdfNode.id) {
+        // XXX - this is not good enough. We need to keep track of nesting and close up
+        // folders after the user has dragged out of them otherwise we end up with 
+        // everything open and a big mess!
+        if (gSpringLoadTracker.timeout)
+          clearTimeout(gSpringLoadTracker.timeout);
+        gSpringLoadTracker.element = rdfNode;
+        gSpringLoadTracker.timeout = setTimeout("gSpringLoadTracker.open()", 100);
+      }
+    }
+    */
+  },  
+  
+  _flavourSet: null,
+  getSupportedFlavours: function ()
+  {
+    if (!this._flavourSet) {
+      this._flavourSet = new FlavourSet();
+      this._flavourSet.appendFlavour("moz/rdfitem");
+      this._flavourSet.appendFlavour("text/x-moz-url");
+      this._flavourSet.appendFlavour("text/unicode");
+    }
+    return this._flavourSet;
+  },
+  
+  canHandleMultipleItems: true,
+  
+  onDrop: function (aEvent, aXferData, aDragSession)
+  {
+    var bookmarksTree = document.getElementById("bookmarksTree");
+    // XXX lame
+    if (bookmarksTree.getAttribute("sortActive") == "true") return;
+
+    const kRDFCContractID = "@mozilla.org/rdf/container;1";
+    const kRDFIID = Components.interfaces.nsIRDFContainer;
+    var RDFC = Components.classes[kRDFCContractID].getService(kRDFIID);
+    
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    
+    var dropItem = aEvent.target.parentNode.parentNode;
+    if (aEvent.target.localName == "treechildren") 
+      dropItem = aEvent.target.parentNode; // handle drop on blank space. 
+
+    // In the default view, the root node is the NC root, and we don't want to append
+    // to that. Adjust accordingly...
+    if (NODE_ID(dropItem) == "NC:NavCenter")
+      dropItem = document.getElementById("treechildren-bookmarks").firstChild;
+    
+    if (!dropItem) return;
+      
+    // XXX we could probably compute this ourselves, but let the tree do this 
+    //     automagically for now.
+    var dropBefore = dropItem.getAttribute("dd-droplocation");
+    var dropOn = dropItem.getAttribute("dd-dropon");
+
+    var dropAction = dropBefore == "true" ? "before" : dropOn == "true" ? "on" : "after";
+    if (aEvent.target.localName == "treechildren")  
+      dropAction = "on"; // handle drop on blank space. 
+    var containerItem = dropAction == "on" ? dropItem : dropItem.parentNode.parentNode;
+
+  	// XXX magical fix for bug # 33546: handle dropping after open container
+    if (dropItem.getAttribute("container") && dropItem.getAttribute("open") &&
+        dropAction == "after") {    
+      dropAction = "before";
+      containerItem = dropItem;
+
+      dropItem = null;
+      for (var i = 0; i < containerItem.childNodes.length; ++i) {
+        if (containerItem.childNodes[i].localName == "treechildren") {
+          dropItem = containerItem.childNodes[i].firstChild;
+          break;
+        }
+      }
+      if (!dropItem) {
+        dropAction = "on";
+        dropItem = containerItem.parentNode.parentNode;
+      }
+    }
+    
+    var rTarget = this.getResource(NODE_ID(dropItem));
+    var rContainer = this.getResource(NODE_ID(containerItem));    
+
+    // XXX
+    var rType = this.getResource(RDF_NS + "type");
+    var rBookmark = this.getResource(NC_NS + "Bookmark");
+    
+    var dirty = false;
+    var additiveFlag = false;
+    var numObjects = aXferData.dataList.length;
+    /*
+    if (numObjects > 1) {
+      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      bo.beginBatch();
+    }
+    */
+    
+    for (i = 0; i < numObjects; ++i) {
+      var flavourData = aXferData.dataList[i].first;
+      
+      var sourceID, parentID, name;
+      var nameRequired = false;
+      var data = flavourData.data;
+      switch (flavourData.flavour.contentType) {
+      case "moz/rdfitem":
+        var ix = data.indexOf("\n");
+        sourceID = ix >= 0 ? (parentID = data.substr(ix+1), data.substr(0, ix)) : data;
+        break;
+      case "text/x-moz-url":
+        ix = data.indexOf("\n");
+        sourceID = ix >= 0 ? (name = data.substr(ix+1), data.substr(0, ix)) : data;
+        break;
+      case "text/unicode":
+        sourceID = data;
+        nameRequired = true;
+        break;
+      default: 
+        continue;
+      }
+      
+      var rSource = this.getResource(sourceID);
+      var rParent = parentID ? this.getResource(parentID) : null;
+
+      const kRDFCUtilsContractID = "@mozilla.org/rdf/container-utils;1";
+      const kRDFCUtilsIID = Components.interfaces.nsIRDFContainerUtils;
+      const kRDFCUtils = Components.classes[kRDFCUtilsContractID].getService(kRDFCUtilsIID);
+      var isContainer = kRDFCUtils.IsContainer(kBMDS, rContainer);
+            
+      // Prevent dropping node on itself, before or after itself, on its parent 
+      // container, or a weird situation when an open container is dropped into
+      // itself (which results in data loss!).
+      // Also prevent dropping into a folder that isn't actually a container 
+      // (and is thus probably a pseudo-container from an aggregated datasource,
+      //  see bug 68656 fir details).
+      if (rSource == rTarget || (dropAction == "on" && rContainer == rParent) ||
+          rContainer == rSource || !isContainer)
+        continue;
+
+      // Prevent dropping node into one of its own subfolders
+      do {
+        var targetAncestor = NODE_ID(dropItem);
+        dropItem = dropItem.parentNode;
+      } while (targetAncestor != "NC:BookmarksRoot" && targetAncestor != sourceID);
+      if (targetAncestor == sourceID) {
+        continue;
+      }
+
+      // XXX if any of the following fails, the nodes are gone for good!
+      const kDSIID = Components.interfaces.nsIDragService;
+      const kCopyAction = kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_LINK;
+      if (rParent) {
+        if (!(aDragSession.dragAction & kCopyAction)) {
+          try {
+            RDFC.Init(kBMDS, rParent);
+            ix = RDFC.IndexOf(rSource);
+            if (ix >= 1) 
+              RDFC.RemoveElementAt(ix, true);
+          }
+          catch (ex) { }
+        }
+      }
+
+      RDFC.Init(kBMDS, rContainer);
+      
+      var bmType = this.getTarget(bookmarksTree.database, sourceID, RDF_NS + "type");
+      if (!bmType) 
+        kBMDS.Assert(rSource, rType, rBookmark, true);
+      if (bmType == NC_NS + "Folder") {
+        // If we're going to copy a folder type, we need to clone the folder 
+        // rather than just asserting the new node as a child of the drop folder.
+        if (aDragSession.dragAction & kCopyAction)
+          rSource = BookmarksUtils.cloneFolder(rSource, rContainer, rTarget);
+      }
+      
+      if (dropAction == "before" || dropAction == "after") {
+        var dropIx = RDFC.IndexOf(rTarget);
+        RDFC.InsertElementAt(rSource, dropAction == "after" ? ++dropIx : dropIx, true);
+      }
+      else
+        RDFC.AppendElement(rSource); // drop on
+
+      dirty = true;
+
+      if (rParent) {
+        gBookmarksShell.selectFolderItem(rContainer.Value, sourceID, additiveFlag);
+        if (!additiveFlag) additiveFlag = true;
+      }
+
+      // If a name is supplied, we want to assert this information into the 
+      // graph. E.g. user drags an internet shortcut to the app, we want to 
+      // preserve not only the URL but the name of the shortcut. The other case
+      // where we need to assert a name is when the node does not already exist
+      // in the graph, in this case we'll just use the URL as the name.
+      if (name || nameRequired) {
+        var currentName = this.getTarget(bookmarksTree.database, sourceID, NC_NS + "Name");
+        if (!currentName) {
+          var rDefaultName = this.RDF.GetLiteral(name || sourceID);
+          if (rDefaultName) {
+            var rName = this.RDF.GetResource(NC_NS + "Name");
+            kBMDS.Assert(rSource, rName, rDefaultName, true);
+          }
+        }
+      }
+    }
+    /*
+    if (numObjects > 1) {
+      var bo = bookmarksTree.boxObject.QueryInterface(Components.interfaces.nsITreeBoxObject);
+      bo.endBatch();
+    }
+    */
+    
+    if (dirty) {
+      var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+      remoteDS.Flush();
+    }    
+  }
+}
+

mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js

@@ -0,0 +1,873 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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)
+ */
+
+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 NODE_ID (aElement)
+{
+  return aElement.getAttribute("ref") || aElement.id;
+}
+
+function LITERAL (aDB, aElement, aPropertyID)
+{
+  var RDF = BookmarksUIElement.prototype.RDF;
+  var rSource = RDF.GetResource(NODE_ID(aElement));
+  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.getAttribute("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 nodeURI = NODE_ID(selection[i]);
+      var commands = this.getAllCmds(nodeURI);
+      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 + "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 = this.resolveType(aNodeID);
+    if (!type) {
+      if (aNodeID == "NC:PersonalToolbarFolder" || aNodeID == "NC:BookmarksRoot")
+        type = "http://home.netscape.com/NC-rdf#Folder";
+      else
+        return null;
+    }
+    var commands = [];
+    switch (type) {
+    case "http://home.netscape.com/NC-rdf#BookmarkSeparator":
+      commands = ["find", "separator", "bm_cut", "bm_copy", "bm_paste", 
+                  "bm_delete", "separator", "bm_fileBookmark", "separator", 
+                  "newfolder"];
+      break;
+    case "http://home.netscape.com/NC-rdf#Bookmark":
+      commands = ["open", "find", "separator", "bm_cut", "bm_copy", "bm_paste", 
+                  "bm_delete", "separator", "rename", "separator", 
+                  "bm_fileBookmark", "separator", "newfolder", 
+                  "separator", "properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#Folder":
+      commands = ["openfolder", "openfolderinnewwindow", "find", "separator", 
+                  "bm_cut", "bm_copy", "bm_paste", "bm_delete", "separator", "rename", 
+                  "separator", "bm_fileBookmark", "separator", 
+                  "newfolder", "separator", "properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#IEFavoriteFolder":
+      commands = ["open", "find", "separator", "bm_copy", "separator", "rename", "separator",
+                  "bm_fileBookmark", "separator", "separator", "properties"];
+      break;
+    case "http://home.netscape.com/NC-rdf#IEFavorite":
+      commands = ["open", "find", "separator", "bm_copy"];
+      break;
+    case "http://home.netscape.com/NC-rdf#FileSystemObject":
+      commands = ["open", "find", "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 this.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 "open":
+      this.open(null, selectedItem);
+      break;
+    case "openfolder":
+      this.commands.openFolder(selectedItem);
+      break;
+    case "openfolderinnewwindow":
+      this.openFolderInNewWindow(selectedItem);
+      break;
+    case "rename":
+      // XXX - this is SO going to break if we ever do column re-ordering.
+      this.commands.editCell(selectedItem, 0);
+      break;
+    case "editurl":
+      this.commands.editCell(selectedItem, 1);
+      break;
+    case "setnewbookmarkfolder":
+    case "setpersonaltoolbarfolder":
+    case "setnewsearchfolder":
+      BookmarksUtils.doBookmarksCommand(NODE_ID(selectedItem),
+                                        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 "properties":
+      this.showPropertiesForNode(selectedItem);
+      break;
+    case "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=no,resizable=yes", null, null, folder, null, "selectFolder", rv);
+      if (rv.selectedFolder) {
+        var additiveFlag = false;
+        var selectedItems = [].concat(this.getSelection())
+        for (var i = 0; i < selectedItems.length; ++i) {
+          var currItem = selectedItems[i];
+          var currURI = NODE_ID(currItem);
+          var parent = gBookmarksShell.findRDFNode(currItem, false);
+          gBookmarksShell.moveBookmark(currURI, NODE_ID(parent), rv.selectedFolder);
+          gBookmarksShell.selectFolderItem(rv.selectedFolder, currURI, additiveFlag);
+          if (!additiveFlag) additiveFlag = true;
+        }
+        gBookmarksShell.flushDataSource();
+      }
+      break;
+    case "newfolder":
+      var nfseln = this.getBestItem();
+      this.commands.createBookmarkItem("folder", nfseln);
+      break;
+    case "newbookmark":
+      var folder = this.getSelectedFolder();
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,modal=yes,dialog=no,resizable=no", null, null, folder, null, "newBookmark");
+      break;
+    case "newseparator":
+      nfseln = this.getBestItem();
+      var parentNode = this.findRDFNode(nfseln, false);
+      args = [{ property: NC_NS + "parent", 
+                resource: NODE_ID(parentNode) }];
+      BookmarksUtils.doBookmarksCommand(NODE_ID(nfseln), 
+                                        NC_NS_CMD + "newseparator", args);
+      break;
+    case "import":
+    case "export":
+      const isImport = aCommandID == "import";
+      try {
+        const kFilePickerContractID = "@mozilla.org/filepicker;1";
+        const kFilePickerIID = Components.interfaces.nsIFilePicker;
+        const kFilePicker = Components.classes[kFilePickerContractID].createInstance(kFilePickerIID);
+        
+        const kTitle = this.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(NODE_ID(seln), NC_NS_CMD + aCommandID, args);
+      break;
+    }
+  },
+  
+  openFolderInNewWindow: function (aSelectedItem)
+  {
+    openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", 
+               "", "chrome,all,dialog=no", NODE_ID(aSelectedItem));
+  },
+  
+  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-wstring;1";
+    const kSuppWStringIID = Components.interfaces.nsISupportsWString;
+    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 += NODE_ID(aSelection[i]) + "\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 = sTextHTML;
+    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.nsISupportsWString).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(NODE_ID(kParentNode));
+    const krSource = this.RDF.GetResource(NODE_ID(lastSelected));
+    
+    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);
+
+      ksRDFC.Init(kBMDS, krParent);
+      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-string;1";
+    const kSuppStringIID = Components.interfaces.nsISupportsString;
+    
+    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 hasFlavors = clipboard.hasDataMatchingFlavors(flavourArray, kClipboardIID.kGlobalClipboard);
+    return hasFlavors;
+  },
+  
+  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 = NODE_ID(aSelection[count]);
+
+      // 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;1";
+        const kPrefSvcIID = Components.interfaces.nsIPref;
+        const kPrefSvc = Components.classes[kPrefSvcContractID].getService(kPrefSvcIID);
+        kPrefSvc.SetBoolPref("browser.bookmarks.import_system_favorites", false);
+      }
+        
+      const krParent = this.RDF.GetResource(NODE_ID(currParent));
+      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);
+      // Manipulate the selection array ourselves. 
+      aSelection.splice(count,1);
+
+      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) {
+      }
+      
+      ++count;
+    }
+    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) 
+  { 
+    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 (this.openNewWindow)
+      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",
+                 "BookmarkProperties", "centerscreen,chrome,dialog=no,resizable=no", 
+                 NODE_ID(aBookmarkItem));
+  },
+
+  findInBookmarks: function ()
+  {
+    openDialog("chrome://communicator/content/bookmarks/findBookmark.xul",
+               "FindBookmarksWindow",
+               "centerscreen,chrome,dependent");
+  },
+
+  getLocaleString: function (aStringKey)
+  {
+    var bundle = document.getElementById("bookmarksbundle");
+    return bundle.getString (aStringKey);
+  },
+  
+  flushDataSource: function ()
+  {
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    var remoteDS = kBMDS.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+    remoteDS.Flush();
+  },
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Determine the rdf:type property for the given resource.
+  resolveType: function (aID)
+  {
+    const krType = this.RDF.GetResource(RDF_NS + "type");
+    const krElement = this.RDF.GetResource(aID);
+    const type = gBookmarksShell.db.GetTarget(krElement, krType, true);
+    try {
+      return type.QueryInterface(Components.interfaces.nsIRDFResource).Value;
+    }
+    catch (e) {
+      try { 
+        return type.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+      }
+      catch (e) {
+        return null;
+      }
+    }    
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // 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;
+  },
+
+  ///////////////////////////////////////////////////////////////////////////
+  // 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) 
+  {
+    const kBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    
+    const krNameArc = this.RDF.GetResource(NC_NS + "Name");
+    var rName = kBMDS.GetTarget(aFolder, krNameArc, true);
+    rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+    
+    const krNewFolder = this.createFolderWithID(rName.Value, aRelativeItem.Value, aParent.Value);
+    
+    // Now need to append kiddies. 
+    try {
+      const kRDFCContractID = "@mozilla.org/rdf/container;1";
+      const kRDFCIID = Components.interfaces.nsIRDFContainer;
+      const ksRDFC = Components.classes[kRDFCContractID].getService(kRDFCIID);
+      ksRDFC.Init(kBMDS, aFolder);
+
+      const kElts = ksRDFC.GetElements();
+      ksRDFC.Init(kBMDS, krNewFolder);
+      while (kElts.hasMoreElements()) {
+        var curr = kElts.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+        ksRDFC.AppendElement(curr);
+      }
+    }
+    catch (e) {
+    }
+    return krNewFolder;
+  },
+  
+  createFolderWithID: function (aTitle, aRelativeItem, aParentFolder)
+  {
+    const krBMDS = this.RDF.GetDataSource("rdf:bookmarks");
+    const kBMSvc = krBMDS.QueryInterface(Components.interfaces.nsIBookmarksService);
+    const krAnonymous = kBMSvc.GetAnonymousResource();
+    
+    var args = [{ property: NC_NS + "parent", resource: aParentFolder },
+                { property: NC_NS + "Name",   literal:  aTitle },
+                { property: NC_NS + "URL",    literal:  krAnonymous.Value}];
+    this.doBookmarksCommand(aRelativeItem, NC_NS_CMD + "newfolder", args);
+
+    // Tidy up.
+    const krURL = this.RDF.GetResource(NC_NS + "URL");
+    const krCurrURL = krBMDS.GetTarget(krAnonymous, krURL, true);
+    const krEmpty = this.RDF.GetLiteral("");
+    krBMDS.Change(krAnonymous, krURL, krCurrURL, krEmpty);
+    
+    return krAnonymous;
+  },
+
+  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=no,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.AddBookmark(aURL, aTitle, kBMSvcIID.BOOKMARK_DEFAULT_TYPE, aCharset);
+    }
+  }
+};
+
+var ContentUtils = {
+  childByLocalName: function (aSelectedItem, aLocalName)
+  {
+    var temp = aSelectedItem.firstChild;
+    while (temp) {
+      if (temp.localName == aLocalName)
+        return temp;
+      temp = temp.nextSibling;
+    }
+    return null;
+  }
+};
+
+
+
+
+
+

mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul

@@ -0,0 +1,72 @@
+<?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) 
+-->
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
+
+<overlay id="bookmarksOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <stringbundleset id="stringbundleset">
+    <stringbundle id="bookmarksbundle"
+                  src="chrome://communicator/locale/bookmarks/bookmark.properties"/>
+  </stringbundleset>
+         
+  <popupset id="bookmarksPopupset">
+    <popup id="bmContext" 
+           oncreate="gBookmarksShell.createContextMenu(event);"/>
+  </popupset>
+
+  <commands id="commands">
+    <commandset id="bookmarksItems">
+      <command id="cmd_open"                      oncommand="goDoCommand('cmd_open');"/>
+      <command id="cmd_openfolder"                oncommand="goDoCommand('cmd_openfolder');"/>
+      <command id="cmd_newfolder"                 oncommand="goDoCommand('cmd_newfolder');"/>
+      <command id="cmd_newbookmark"               oncommand="goDoCommand('cmd_newbookmark');"/>
+      <command id="cmd_newseparator"              oncommand="goDoCommand('cmd_newseparator');"/>
+      <command id="cmd_find"                      oncommand="goDoCommand('cmd_find');"/>
+      <command id="cmd_setnewbookmarkfolder"      oncommand="goDoCommand('cmd_setnewbookmarkfolder');"/>
+      <command id="cmd_setpersonaltoolbarfolder"  oncommand="goDoCommand('cmd_setpersonaltoolbarfolder');"/>
+      <command id="cmd_setnewsearchfolder"        oncommand="goDoCommand('cmd_setnewsearchfolder');"/>
+      <command id="cmd_properties"                oncommand="goDoCommand('cmd_properties');"/>
+      <command id="cmd_rename"                    oncommand="goDoCommand('cmd_rename');"/>
+      <command id="cmd_openfolderinnewwindow"     oncommand="goDoCommand('cmd_openfolderinnewwindow');"/>
+      <command id="cmd_import"                    oncommand="goDoCommand('cmd_import');"/>
+      <command id="cmd_export"                    oncommand="goDoCommand('cmd_export');"/>
+      <command id="cmd_bm_fileBookmark"           oncommand="goDoCommand('cmd_bm_fileBookmark');"/>
+
+      <command id="cmd_bm_cut"                    oncommand="goDoCommand('cmd_bm_cut');"/>
+      <command id="cmd_bm_copy"                   oncommand="goDoCommand('cmd_bm_copy');"/>
+      <command id="cmd_bm_paste"                  oncommand="goDoCommand('cmd_bm_paste');"/>
+      <command id="cmd_bm_delete"                 oncommand="goDoCommand('cmd_bm_delete');"/>
+      <command id="cmd_bm_selectAll"              oncommand="goDoCommand('cmd_bm_selectAll');"/>
+    </commandset>
+    <commandset id="selectEditMenuItems"/>
+    <commandset id="globalEditMenuItems"/>
+  </commands>
+
+</overlay>
+
+         

mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.js

@@ -0,0 +1,82 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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)
+ */
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Get the two bookmarks utility libraries running, attach controllers, focus
+// tree widget, etc. 
+function Startup() 
+{
+  // Create the Bookmarks Shell
+  var bookmarksTree = document.getElementById("bookmarksTree");
+  gBookmarksShell = new BookmarksPanelTree (bookmarksTree.database);
+
+  // Set up the tree controller
+  bookmarksTree.controllers.appendController(gBookmarksShell.controller);
+
+  // Update to the last sort.
+  RefreshSort();
+  
+  bookmarksTree.focus();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Class representing the bookmarks panel's tree. This subclasses BookmarksTree, 
+// which contains methods generic to any tree-like bookmarks UI representation. 
+// This class contains data specific to the tree in this panel, e.g. number of 
+// clicks required to load a bookmark, which differs from other bookmarks tree 
+// implementations (such as window). 
+function BookmarksPanelTree (aCompositeDataSource) 
+{ 
+  // 'db' is used by the base class. 
+  this.db = aCompositeDataSource;
+  this.id = "bookmarksTree";
+}
+
+BookmarksPanelTree.prototype = {
+  __proto__: BookmarksTree.prototype,
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Number of clicks to activate a bookmark. 
+  openClickCount: 1,
+  
+  /////////////////////////////////////////////////////////////////////////////
+  // Open Bookmark in most recent window
+  openNewWindow: false,
+  
+  addBookmark: function ()
+  {
+    // This is somewhat of a hack, and we'd like to parameterize this so that
+    // eventually we can bookmark mail messages and editor documents.
+    var contentArea = top.document.getElementById('content');
+    if (contentArea)
+      BookmarksUtils.addBookmarkForBrowser(contentArea.webNavigation, true);
+  },
+  
+  manageBookmarks: function ()
+  {
+    openDialog("chrome://communicator/content/bookmarks/bookmarks.xul", "", "chrome,dialog=no,resizable=yes");
+  }
+  
+};
+

mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul

@@ -0,0 +1,137 @@
+<?xml version="1.0"?> <!-- -*- Mode: SGML; 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, v2.0)
+
+-->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarksWindow.css" type="text/css"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/bookmarks/bookmarksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+
+<window id="bookmarksPanel" orient="vertical"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="Startup();">
+
+  <!-- Generic Utilities -->
+  <script type="application/x-javascript" src="chrome://global/content/nsTreeUtils.js"/>
+  <!-- XXX - would like to cut this dependency out -->
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+
+  <!-- Bookmarks Shell -->
+  <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/bookmarksPanel.js"/>
+
+  <!-- Drag and Drop -->
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <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://communicator/content/bookmarks/bookmarksDD.js"/>
+
+
+  <!-- context menu, tooltips, etc -->
+  <popupset id="bookmarksPopupset"/>
+  
+  <!-- bookmarks string bundle -->
+  <stringbundleset id="stringbundleset"/>
+  
+  <!-- bookmarks & edit commands -->
+  <commandset id="bookmarksItems"/>
+  
+  <box id="panel-bar" class="toolbar">
+    <button class="button-toolbar" label="&command.addBookmark.label;"
+            oncommand="gBookmarksShell.addBookmark();"/>
+    <button class="button-toolbar" label="&command.manageBookmarks.label;"
+            oncommand="gBookmarksShell.manageBookmarks();"/>
+  </box>
+  
+  <tree id="bookmarksTree" context="bmContext" ref="NC:BookmarksRoot"
+        datasources="rdf:bookmarks rdf:files rdf:httpindex rdf:localsearch rdf:internetsearch"
+        flags="dont-test-empty"
+        ondragover="nsDragAndDrop.dragOver(event, bookmarksDNDObserver);"
+        ondraggesture="nsDragAndDrop.startDrag(event, bookmarksDNDObserver);"
+        ondragdrop="nsDragAndDrop.drop(event, bookmarksDNDObserver);"
+        onclick="gBookmarksShell.treeClicked(event);"
+        style="height:0px" flex="1">
+
+    <template>
+      <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
+        <treechildren>
+          <treeitem uri="rdf:*"
+                    rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
+            <treerow>
+              <treecell autostretch="never"><treeindentation/>
+                        <separator class="groove" flex="1"/></treecell>
+            </treerow>
+          </treeitem>     
+        </treechildren>
+      </rule>
+  
+      <rule>
+        <treechildren>
+          <treeitem uri="rdf:*" persist="open" class="bookmark-item"
+                    web:status="rdf:http://home.netscape.com/WEB-rdf#status"
+                    rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                    loading="rdf:http://home.netscape.com/NC-rdf#loading">
+            <treerow>
+              <treecell class="treecell-indent treecell-editable"
+                        editable="true" label="rdf:http://home.netscape.com/NC-rdf#Name"
+                        src="rdf:http://home.netscape.com/NC-rdf#Icon"
+                        web:status="rdf:http://home.netscape.com/WEB-rdf#status"
+                        rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                        loading="rdf:http://home.netscape.com/NC-rdf#loading" />
+            </treerow>
+          </treeitem>
+        </treechildren>
+      </rule>
+    </template>
+
+    <treecolgroup id="theColumns">
+      <treecol id="Name"
+               sortSeparators="true" width="4*" flex="4"
+               persist="hidden width sortActive sortDirection" 
+               resource="http://home.netscape.com/NC-rdf#Name"/>
+    </treecolgroup>
+    
+    <treehead>
+      <treerow id="headRow">
+        <treecell class="treecell-header sortDirectionIndicator treecell-header-sidebarpanel"
+                  label="&tree.header.name.label;"
+                  onclick="return TriStateColumnSort('Name');"
+                  observes="Name" />
+      </treerow>
+    </treehead>
+
+    <treechildren flex="1" id="treechildren-bookmarks" 
+                  onclick="gBookmarksShell.treeOpen(event);"/>
+  </tree>
+
+</window>

mozilla/xpfe/components/bookmarks/resources/bookmarksTree.js

@@ -0,0 +1,678 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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)
+ */
+
+var gBookmarksShell = null;
+
+///////////////////////////////////////////////////////////////////////////////
+// Tracks the selected item, the cell last clicked on, and the number of clicks
+// given to it. Used to activate inline edit mode.
+var gSelectionTracker = { currentItem: null, currentCell: null, clickCount: 0 };
+
+///////////////////////////////////////////////////////////////////////////////
+// Class which defines methods for a bookmarks UI implementation based around
+// a treeview. Subclasses BookmarksBase in bookmarksOverlay.js. Some methods
+// are required by the base class, others are for event handling. Window specific
+// glue code should go into the BookmarksWindow class in bookmarks.js
+function BookmarksTree (aID)
+{
+  this.id = aID;
+}
+
+BookmarksTree.prototype = {
+  __proto__: BookmarksUIElement.prototype,
+
+  // XXX - change this to .element and move into base. 
+  get tree ()
+  {
+    return document.getElementById(this.id);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // This method constructs a menuitem for a context menu for the given command.
+  // This is implemented by the client so that it can intercept menuitem naming
+  // as appropriate.
+  createMenuItem: function (aDisplayName, aCommandName, aItemNode)
+  {
+    const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+    var xulElement = document.createElementNS(kXULNS, "menuitem");
+    xulElement.setAttribute("cmd", aCommandName);
+    xulElement.setAttribute("command", "cmd_" + aCommandName.substring(NC_NS_CMD.length));
+
+    switch (aCommandName) {
+    case NC_NS_CMD + "open":
+      xulElement.setAttribute("label", aDisplayName);
+      xulElement.setAttribute("default", "true");
+      break;
+    case NC_NS_CMD + "openfolder":
+      aDisplayName = aItemNode.getAttribute("open") == "true" ? this.getLocaleString("cmd_openfolder2") : aDisplayName;
+      xulElement.setAttribute("label", aDisplayName);
+      xulElement.setAttribute("default", "true");
+      break;
+    case NC_NS_CMD + "renamebookmark":
+      if (!document.popupNode.hasAttribute("type")) {
+        xulElement.setAttribute("label", this.getLocaleString("cmd_renamebookmark2"));
+        xulElement.setAttribute("cmd", (NC_NS_CMD + "editurl"));
+      }
+      else
+        xulElement.setAttribute("label", aDisplayName);
+      break;
+    default:
+      xulElement.setAttribute("label", aDisplayName);
+      break;
+    }
+    return xulElement;
+  },
+
+  // XXX - ideally this would be in the base. this.tree needs to change to 
+  // this.element and then we can do just that. 
+  setRoot: function (aRoot)
+  {
+    this.tree.setAttribute("ref", aRoot);
+  },
+
+  // Command implementation
+  commands: {
+    openFolder: function (aSelectedItem)
+    {
+      if (aSelectedItem.getAttribute("open") == "true")
+        aSelectedItem.removeAttribute("open");
+      else
+        aSelectedItem.setAttribute("open", "true");
+    },
+
+    // Things Needed to Satisfy Mac Weenies:
+    // 1) need to implement timed single click edit. This could be Hard.
+    // 2) need to implement some other method of key access apart from F2.
+    //    mpt claims that 'Cmd+U' is the excel equivalent.
+    editCell: function (aSelectedItem, aCell)
+    {
+      var editCell = aSelectedItem.firstChild.childNodes[aCell];
+      if (editCell.getAttribute("editable") != "true")
+        return;
+      
+      // Cause the inline edit cell binding to be used.
+      editCell.setAttribute("class", "treecell-indent treecell-editable");
+      var editColGroup = document.getElementById("theColumns");
+      var count = 0;
+      var property = "";
+      for (var i = 0; i < editColGroup.childNodes.length; ++i) {
+        var currCol = editColGroup.childNodes[i];
+        if (currCol.getAttribute("hidden") == "true")
+          return;
+        if (count == aCell) {
+          property = currCol.getAttribute("resource");
+          break;
+        }
+        ++count;
+
+        // Deal with interleaved column resizer splitters
+        if (currCol.nextSibling.localName == "splitter") ++i;
+      }
+
+      if (property) {
+        editCell.setMode("edit");
+        editCell.addObserver(this.postModifyCallback, "accept",
+                             [editCell, aSelectedItem, property]);
+      }
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Called after an inline-edit cell has left inline-edit mode, and data
+    // needs to be modified in the datasource.
+    postModifyCallback: function (aParams)
+    {
+      var selItemURI = NODE_ID(aParams[1]);
+      gBookmarksShell.propertySet(selItemURI, aParams[2], aParams[3]);
+      gBookmarksShell.selectFolderItem(NODE_ID(gBookmarksShell.findRDFNode(aParams[1], false)),
+                                       selItemURI, false);
+      gBookmarksShell.tree.focus();
+      gSelectionTracker.clickCount = 0;
+      
+      // Set the cell back to use the standard treecell binding.
+      var editCell = aParams[0];
+      editCell.setAttribute("class", "treecell-indent");
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // New Folder Creation
+    // Strategy: create a dummy row with edit fields to harvest information
+    //           from the user, then destroy these rows and create an item
+    //           in its place.
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Edit folder name & update the datasource if name is valid
+    onEditFolderName: function (aParams, aTopic)
+    {
+      var name = aParams[3];
+      var shell = gBookmarksShell.commands; // suck
+      var dummyItem = aParams[2];
+      var relativeNode = aParams[1];
+      var parentNode = relativeNode ? gBookmarksShell.findRDFNode(relativeNode, false) : gBookmarksShell.tree;
+
+      dummyItem.parentNode.removeChild(dummyItem);
+
+      if (!shell.validateNameAndTopic(name, aTopic, relativeNode, dummyItem)) {
+        gBookmarksShell.tree.selectItem(relativeNode);
+        gBookmarksShell.tree.focus();
+        return;
+      }
+
+      if (relativeNode) {
+        // If we're attempting to create a folder as a subfolder of an open folder,
+        // we need to set the parentFolder to be relativeNode, which will be the
+        // parent of the new folder, rather than the parent of the relativeNode,
+        // which will result in the folder being created in an incorrect position
+        // (adjacent to the relativeNode).
+        var selKids = ContentUtils.childByLocalName(relativeNode, "treechildren");
+        if (selKids && selKids.hasChildNodes() && selKids.lastChild == dummyItem)
+          parentNode = relativeNode;
+      }
+
+      var args = [{ property: NC_NS + "parent",
+                    resource: NODE_ID(parentNode) },
+                  { property: NC_NS + "Name",
+                    literal:  name }];
+
+      const kBMDS = gBookmarksShell.RDF.GetDataSource("rdf:bookmarks");
+      kBMDS.AddObserver(newFolderRDFObserver);
+      var relId = relativeNode ? NODE_ID(relativeNode) : "NC:BookmarksRoot";
+      BookmarksUtils.doBookmarksCommand(relId, NC_NS_CMD + "newfolder", args);
+      kBMDS.RemoveObserver(newFolderRDFObserver);
+      var newFolderItem = document.getElementById(newFolderRDFObserver._newFolderURI);
+      gBookmarksShell.tree.focus();
+      gBookmarksShell.tree.selectItem(newFolderItem);
+      // Can't use newFolderItem because it may not have been created yet. Hack, huh?
+      var index = gBookmarksShell.tree.getIndexOfItem(relativeNode);
+      gBookmarksShell.tree.ensureIndexIsVisible(index+1);
+      gSelectionTracker.clickCount = 0;
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Performs simple validation on what the user has entered:
+    //  1) prevents entering an empty string
+    //  2) in the case of a canceled operation, remove the dummy item and
+    //     restore selection.
+    validateNameAndTopic: function (aName, aTopic, aOldSelectedItem, aDummyItem)
+    {
+      // Don't allow user to enter an empty string "";
+      if (!aName) return false;
+
+      // If the user hit escape, go no further.
+      if (aTopic == "reject") {
+        if (aOldSelectedItem)
+          gBookmarksShell.tree.selectItem(aOldSelectedItem);
+        return false;
+      }
+      return true;
+    },
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Creates a dummy item that can be placed in edit mode to retrieve data
+    // to create new bookmarks/folders.
+    createBookmarkItem: function (aMode, aSelectedItem)
+    {
+      const kXULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+      var dummyItem = document.createElementNS(kXULNS, "treeitem");
+      dummyItem = gBookmarksShell.createBookmarkFolderDecorations(dummyItem);
+      dummyItem.setAttribute("class", "bookmark-item");
+
+      var dummyRow    = document.createElementNS(kXULNS, "treerow");
+      var dummyCell   = document.createElementNS(kXULNS, "treecell");
+      var dummyCell2  = document.createElementNS(kXULNS, "treecell");
+      dummyCell.setAttribute("label", gBookmarksShell.getLocaleString("ile_newfolder") + "  ");
+      dummyCell.setAttribute("type", NC_NS + "Folder");
+      dummyCell.setAttribute("editable", "true");
+      dummyCell.setAttribute("class", "treecell-indent treecell-editable");
+      dummyRow.appendChild(dummyCell);
+      dummyItem.appendChild(dummyRow);
+      
+      var relativeNode = null;
+
+      // If there are selected items, try to create the dummy item relative to the 
+      // best item, and position the bookmark there when created. Otherwise just
+      // append to the root. 
+      if (aSelectedItem && aSelectedItem.localName != "tree") {
+        // By default, create adjacent to the selected item
+        relativeNode = aSelectedItem;
+        if (relativeNode.getAttribute("container") == "true" && 
+            relativeNode.getAttribute("open") == "true") {
+          // But if it's an open container, the relative node should be the last child. 
+          var treechildren = ContentUtils.childByLocalName(relativeNode, "treechildren");
+          if (treechildren && treechildren.hasChildNodes()) 
+            relativeNode = treechildren.lastChild;
+        }
+
+        if (aSelectedItem.getAttribute("container") == "true") {
+          if (aSelectedItem.getAttribute("open") == "true") {
+            var treechildren = ContentUtils.childByLocalName(aSelectedItem, "treechildren");
+            if (!treechildren) {
+              treechildren = document.createElementNS(kXULNS, "treechildren");
+              aSelectedItem.appendChild(treechildren);
+            }
+            // Insert new item after last item.
+            treechildren.appendChild(dummyItem);
+          }
+          else {
+            if (aSelectedItem.nextSibling)
+              aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
+            else
+              aSelectedItem.parentNode.appendChild(dummyItem);
+          }
+          var index = gBookmarksShell.tree.getIndexOfItem(dummyItem);
+          gBookmarksShell.tree.ensureIndexIsVisible(index);
+        }
+        else {
+          if (aSelectedItem.nextSibling)
+            aSelectedItem.parentNode.insertBefore(dummyItem, aSelectedItem.nextSibling);
+          else
+            aSelectedItem.parentNode.appendChild(dummyItem);
+        }
+      }
+      else {
+        // No items in the tree. Append to the root. 
+        var rootKids = document.getElementById("treechildren-bookmarks");
+        rootKids.appendChild(dummyItem);
+      }
+
+      dummyCell.setMode("edit");
+      dummyCell.addObserver(this.onEditFolderName, "accept", [dummyCell, relativeNode, dummyItem]);
+      dummyCell.addObserver(this.onEditFolderName, "reject", [dummyCell, relativeNode, dummyItem]);
+    }
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Evaluates an event to determine whether or not it affords opening a tree
+  // item. Typically, this is when the left mouse button is used, and provided
+  // the click-rate matches that specified by our owning tree class. For example,
+  // some trees open an item when double clicked (bookmarks/history windows) and
+  // others on a single click (sidebar panels).
+  isValidOpenEvent: function (aEvent)
+  {
+    return !(aEvent.type == "click" && 
+             (aEvent.button != 0 || aEvent.detail != this.openClickCount))
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // For the given selection, selects the best adjacent element. This method is
+  // useful when an action such as a cut or a deletion is performed on a
+  // selection, and focus/selection needs to be restored after the operation
+  // is performed.
+  getNextElement: function (aElement)
+  {
+    if (aElement.nextSibling)
+      return aElement.nextSibling;
+    else if (aElement.previousSibling)
+      return aElement.previousSibling;
+    else
+      return aElement.parentNode.parentNode;
+  },
+
+  selectElement: function (aElement)
+  {
+    this.tree.selectItem(aElement);
+  },
+
+  //////////////////////////////////////////////////////////////////////////////
+  // Add the treeitem element specified by aURI to the tree's current selection.
+  addItemToSelection: function (aURI)
+  {
+    var item = document.getElementById(aURI) // XXX flawed for multiple ids
+    this.tree.addItemToSelection(item);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Return a set of DOM nodes that represent the selection in the tree widget.
+  // This method is takes a node parameter which is the popupNode for the
+  // document. If the popupNode is not contained by the selection, the
+  // popupNode is selected and the new selection returned.
+  getSelection: function ()
+  {
+    // Note that we don't just the selectedItems NodeList here because that
+    // is a reference to a LIVE DOM NODE LIST. We want to maintain control
+    // over what is in the selection array ourselves.
+    return [].concat(this.tree.selectedItems);
+  },
+
+  getBestItem: function ()
+  {
+    var seln = this.getSelection ();
+    if (seln.length < 1) {
+      var kids = ContentUtils.childByLocalName(this.tree, "treechildren");
+      return kids.lastChild || this.tree;
+    }
+    else
+      return seln[0];
+    return this.tree;
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Return a set of DOM nodes that represent the selection in the tree widget.
+  // This method is takes a node parameter which is the popupNode for the
+  // document. If the popupNode is not contained by the selection, the
+  // popupNode is selected and the new selection returned.
+  getContextSelection: function (aItemNode)
+  {
+    // How a context-click works:
+    // if the popup node is contained by the selection, the context menu is
+    // built for that selection. However, if the popup node is invoked on a
+    // non-selected node, unless modifiers are pressed**, the previous
+    // selection is discarded and that node selected.
+    var selectedItems = this.tree.selectedItems;
+    for (var i = 0; i < selectedItems.length; ++i) {
+      if (selectedItems[i] == aItemNode)
+        return selectedItems;
+    }
+    if (aItemNode.localName == "treeitem")
+      this.tree.selectItem(aItemNode);
+    return this.tree.selectedItems.length ? this.tree.selectedItems : [this.tree];
+  },
+
+  getSelectedFolder: function ()
+  {
+    var selectedItem = this.getBestItem();
+    if (!selectedItem) return "NC:BookmarksRoot";
+    while (selectedItem && selectedItem.nodeType == Node.ELEMENT_NODE) {
+      if (selectedItem.getAttribute("container") == "true" && 
+          selectedItem.getAttribute("open") == "true")
+        return NODE_ID(selectedItem);
+      selectedItem = selectedItem.parentNode.parentNode;
+    }
+    return "NC:BookmarksRoot";
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // For a given start DOM element, find the enclosing DOM element that contains
+  // the template builder RDF resource decorations (id, ref, etc).
+  findRDFNode: function (aStartNode, aIncludeStartNodeFlag)
+  {
+    var temp = aIncludeStartNodeFlag ? aStartNode : aStartNode.parentNode;
+    while (temp && temp.localName != "treeitem")
+      temp = temp.parentNode;
+    return temp || this.tree;
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Tree click events. This handles when to go into inline-edit mode for
+  // editable cells.
+  treeClicked: function (aEvent)
+  {
+    if (this.tree.selectedItems.length > 1 || aEvent.detail > 1 || aEvent.button != 0) {
+      gSelectionTracker.clickCount = 0;
+      return;
+    }
+    if (gSelectionTracker.currentItem == this.tree.currentItem &&
+        gSelectionTracker.currentCell == aEvent.target)
+      ++gSelectionTracker.clickCount;
+    else
+      gSelectionTracker.clickCount = 0;
+
+    if (!this.tree.currentItem)
+      return;
+
+    gSelectionTracker.currentItem = this.tree.currentItem;
+    gSelectionTracker.currentCell = aEvent.target;
+
+    if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" &&
+        gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Folder")
+      return;
+
+    var row = gSelectionTracker.currentItem.firstChild;
+    if (row) {
+      for (var i = 0; i < row.childNodes.length; ++i) {
+        if (row.childNodes[i] == gSelectionTracker.currentCell) {
+          // Don't allow inline-edit of cells other than name for folders.
+          // XXX - so so skeezy. Change this to look for NC:Name or some such.
+          if (gSelectionTracker.currentItem.getAttribute("type") != NC_NS + "Bookmark" && i)
+            return;
+          // Don't allow editing of the root folder name
+          if (gSelectionTracker.currentItem.id == "NC:BookmarksRoot")
+            return;
+          if (gSelectionTracker.clickCount == 1 && this.openClickCount > 1)
+            gBookmarksShell.commands.editCell(this.tree.currentItem, i);
+          break;
+        }
+      }
+    }
+  },
+
+  treeOpen: function (aEvent)
+  {
+    if (!this.isValidOpenEvent(aEvent))
+      return;
+
+    var rdfNode = this.findRDFNode(aEvent.target, true);
+    if (rdfNode.getAttribute("container") == "true") {
+      if (this.openClickCount == 1)
+        rdfNode.setAttribute("open", rdfNode.getAttribute("open") != "true");
+      gSelectionTracker.clickCount = 0;
+      return;
+    }
+
+    this.open(aEvent, rdfNode);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Tree key events. This handles when to go into inline-edit mode for editable
+  // cells, when to load a URL, etc.
+  treeKeyPress: function (aEvent)
+  {
+    if (this.tree.selectedItems.length > 1) return;
+    if (aEvent.keyCode == 113 && aEvent.shiftKey) {
+      const kNodeId = NODE_ID(this.tree.currentItem);
+      if (this.resolveType(kNodeId) == NC_NS + "Bookmark")
+        gBookmarksShell.commands.editCell (this.tree.currentItem, 1);
+    }
+    else if (aEvent.keyCode == 113)
+      goDoCommand("cmd_rename");
+    else if (aEvent.keyCode == 13 &&
+             this.tree.currentItem.firstChild.getAttribute("inline-edit") != "true")
+      goDoCommand(aEvent.altKey ? "cmd_properties" : "cmd_open");
+  },
+
+  selectFolderItem: function (aFolderURI, aItemURI, aAdditiveFlag)
+  {
+    var folder = document.getElementById(aFolderURI);
+    var kids = ContentUtils.childByLocalName(folder, "treechildren");
+    if (!kids) return;
+
+    var item = kids.firstChild;
+    while (item) {
+      if (item.id == aItemURI) break;
+      item = item.nextSibling;
+    }
+    if (!item) return;
+
+    this.tree[aAdditiveFlag ? "addItemToSelection" : "selectItem"](item);
+  },
+
+  /////////////////////////////////////////////////////////////////////////////
+  // Command handling & Updating.
+  controller: {
+    supportsCommand: function (aCommand)
+    {
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        return false;
+      case "cmd_bm_cut":
+      case "cmd_bm_copy":
+      case "cmd_bm_paste":
+      case "cmd_bm_delete":
+      case "cmd_bm_selectAll":
+        return true;
+      case "cmd_open":
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_find":
+      case "cmd_properties":
+      case "cmd_rename":
+      case "cmd_setnewbookmarkfolder":
+      case "cmd_setpersonaltoolbarfolder":
+      case "cmd_setnewsearchfolder":
+      case "cmd_import":
+      case "cmd_export":
+      case "cmd_bm_fileBookmark":
+        return true;
+      default:
+        return false;
+      }
+    },
+
+    isCommandEnabled: function (aCommand)
+    {
+      var numSelectedItems = gBookmarksShell.tree.selectedItems.length;
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        return false;
+      case "cmd_bm_paste":
+        return gBookmarksShell.canPaste();
+      case "cmd_bm_cut":
+      case "cmd_bm_copy":
+      case "cmd_bm_delete":
+        return numSelectedItems >= 1;
+      case "cmd_bm_selectAll":
+        return true;
+      case "cmd_open":
+        var seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Bookmark";
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+        seln = gBookmarksShell.tree.selectedItems;
+        return numSelectedItems == 1 && seln[0].getAttribute("type") == NC_NS + "Folder";
+      case "cmd_find":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_import":
+      case "cmd_export":
+        return true;
+      case "cmd_properties":
+      case "cmd_rename":
+        return numSelectedItems == 1;
+      case "cmd_setnewbookmarkfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        var firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        var folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        var bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:NewBookmarkFolder") && folderType;
+      case "cmd_setpersonaltoolbarfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        var firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        var folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        var bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect && !(NODE_ID(firstSelected) == "NC:PersonalToolbarFolder") && folderType;
+      case "cmd_setnewsearchfolder":
+        seln = gBookmarksShell.tree.selectedItems;
+        var firstSelected = seln.length ? seln[0] : gBookmarksShell.tree;
+        var folderType = firstSelected.getAttribute("type") == (NC_NS + "Folder");
+        var bItemCountCorrect = seln.length ? numSelectedItems == 1 : true;
+        return bItemCountCorrect == 1 && !(NODE_ID(firstSelected) == "NC:NewSearchFolder") && folderType;
+      case "cmd_bm_fileBookmark":
+        var seln = gBookmarksShell.tree.selectedItems;
+        return seln.length > 0;
+      default:
+        return false;
+      }
+    },
+
+    doCommand: function (aCommand)
+    {
+      switch(aCommand) {
+      case "cmd_undo":
+      case "cmd_redo":
+        break;
+      case "cmd_bm_paste":
+      case "cmd_bm_copy":
+      case "cmd_bm_cut":
+      case "cmd_bm_delete":
+      case "cmd_newbookmark":
+      case "cmd_newfolder":
+      case "cmd_newseparator":
+      case "cmd_properties":
+      case "cmd_rename":
+      case "cmd_open":
+      case "cmd_openfolder":
+      case "cmd_openfolderinnewwindow":
+      case "cmd_setnewbookmarkfolder":
+      case "cmd_setpersonaltoolbarfolder":
+      case "cmd_setnewsearchfolder":
+      case "cmd_find":
+      case "cmd_import":
+      case "cmd_export":
+      case "cmd_bm_fileBookmark":
+        gBookmarksShell.execCommand(aCommand.substring("cmd_".length));
+        break;
+      case "cmd_bm_selectAll":
+        gBookmarksShell.tree.selectAll();
+        break;
+      }
+    },
+
+    onEvent: function (aEvent)
+    {
+      switch (aEvent) {
+      case "tree-select":
+        this.onCommandUpdate();
+        break;
+      }
+    },
+
+    onCommandUpdate: function ()
+    {
+      var commands = ["cmd_properties", "cmd_rename", "cmd_bm_copy",
+                      "cmd_bm_paste", "cmd_bm_cut", "cmd_bm_delete",
+                      "cmd_setpersonaltoolbarfolder", "cmd_setnewbookmarkfolder",
+                      "cmd_setnewsearchfolder", "cmd_bm_fileBookmark", 
+                      "cmd_openfolderinnewwindow", "cmd_openfolder"];
+      for (var i = 0; i < commands.length; ++i)
+        goUpdateCommand(commands[i]);
+    }
+  }
+};
+
+var newFolderRDFObserver = {
+  _newFolderURI: null,
+  onAssert: function (aDS, aSource, aProperty, aValue)
+  {
+    try {
+      var value = aValue.QueryInterface(Components.interfaces.nsIRDFResource);
+      if (aDS.URI == "rdf:bookmarks" && aProperty.Value == RDF_NS + "type" &&
+          value.Value == NC_NS + "Folder")
+        this._newFolderURI = aSource.Value;
+    }
+    catch (e) {
+      // Failures are OK, the value could be a literal instead of a resource.
+    }
+  },
+
+  onUnassert: function (aDS, aSource, aProperty, aTarget) { },
+  onChange: function (aDS, aSource, aProperty, aOldTarget, aNewTarget) { },
+  onMove: function (aDS, aOldSource, aNewSource, aProperty, aTarget) { },
+  beginUpdateBatch: function (aDS) { },
+  endUpdateBatch: function (aDS) { }
+};
+

mozilla/xpfe/components/bookmarks/resources/findBookmark.js

@@ -0,0 +1,63 @@
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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)
+ */
+
+function Startup()
+{
+  doSetOKCancel(find);
+  var bundle = document.getElementById("bookmarksBundle");
+  document.getElementById("ok").label = bundle.getString("search_button_label");
+  document.getElementById("searchField").focus();
+}
+
+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 field = document.getElementById("searchField");
+  var searchURI = "find:datasource=rdf:bookmarks"
+  searchURI += "&match=" + match.selectedItem.value;
+  searchURI += "&method=" + method.selectedItem.value;
+  searchURI += "&text=" + escape(field.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.gBookmarksShell.setRoot(searchURI);
+
+  bmWindow.focus();
+  close();
+}
+
+var gCreatingNewWindow = false;
+function findMostRecentWindow(aType, aURI, aParam)
+{
+  var WM = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].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);
+}
+

mozilla/xpfe/components/bookmarks/resources/findBookmark.xul

@@ -0,0 +1,74 @@
+<?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/"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
+
+<window id="findBookmarkWindow" style="width: 36em;"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="&findBookmark.title;" 
+        orient="vertical" class="dialog"
+        onload="Startup();">
+
+  <keyset id="dialogKeys"/>
+
+  <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"/>
+
+  <text class="label" value="&search.for.label;"/>
+  <hbox autostretch="never" valign="middle">
+    <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" onkeypress="if (event.keyCode == 13) find();" flex="1"/>
+  </hbox>
+
+  <separator/>
+
+  <box id="okCancelButtonsRight"/>
+
+</window>

mozilla/xpfe/components/bookmarks/resources/jar.mn

@@ -0,0 +1,48 @@
+# 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): 
+
+comm.jar:
+	content/communicator/bookmarks/addBookmark.xul
+	content/communicator/bookmarks/addBookmark.js
+	content/communicator/bookmarks/bm-find.js
+	content/communicator/bookmarks/bm-find.xul
+	content/communicator/bookmarks/bm-props.js
+	content/communicator/bookmarks/bm-props.xul
+	content/communicator/bookmarks/bookmarksDD.js
+	content/communicator/bookmarks/bookmarks.xul
+	content/communicator/bookmarks/bookmarks.js
+	content/communicator/bookmarks/bookmarksTree.js
+	content/communicator/bookmarks/bookmarksOverlay.xul
+	content/communicator/bookmarks/bookmarksOverlay.js
+	content/communicator/bookmarks/bookmarksPanel.xul
+	content/communicator/bookmarks/bookmarksPanel.js
+	content/communicator/bookmarks/findBookmark.js
+	content/communicator/bookmarks/findBookmark.xul
+	content/communicator/bookmarks/pref-bookmarks.xul
+	content/communicator/bookmarks/oTest.xul
+
+en-US.jar:
+	locale/en-US/communicator/bookmarks/addBookmark.dtd         (locale/en-US/addBookmark.dtd)
+	locale/en-US/communicator/bookmarks/bm-find.dtd             (locale/en-US/bm-find.dtd)
+	locale/en-US/communicator/bookmarks/bm-props.dtd            (locale/en-US/bm-props.dtd)
+	locale/en-US/communicator/bookmarks/bookmarks.dtd           (locale/en-US/bookmarks.dtd)
+	locale/en-US/communicator/bookmarks/bookmark.properties     (locale/en-US/bookmark.properties)
+	locale/en-US/communicator/bookmarks/bookmarksOverlay.dtd    (locale/en-US/bookmarksOverlay.dtd)
+	locale/en-US/communicator/bookmarks/findBookmark.dtd	    (locale/en-US/findBookmark.dtd)
+	locale/en-US/communicator/bookmarks/pref-bookmarks.dtd	    (locale/en-US/pref-bookmarks.dtd)

mozilla/xpfe/components/bookmarks/resources/locale/MANIFEST

@@ -0,0 +1,4 @@
+en-US:bm-find.dtd
+en-US:bm-props.dtd
+en-US:bookmarks.dtd
+en-US:bookmark.properties

mozilla/xpfe/components/bookmarks/resources/locale/en-US/MANIFEST

@@ -0,0 +1,4 @@
+bm-find.dtd
+bm-props.dtd
+bookmark.properties
+bookmarks.dtd

mozilla/xpfe/components/bookmarks/resources/locale/en-US/addBookmark.dtd

@@ -0,0 +1,44 @@
+<!-- 
+   - 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">
+
+
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bm-find.dtd

@@ -0,0 +1,58 @@
+<!-- 
+   - 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.
+   - 
+   - Original Author(s):
+   -    Robert John Churchill    <rjc@netscape.com>
+   -
+   - Contributor(s):
+   -    Blake Ross               <blakeross@telocity.com>
+  --> 
+
+<!ENTITY window.title.label             "Search Bookmarks/History">
+
+<!ENTITY search1.label                  "Find items in ">
+<!ENTITY search2.label                  " whose ">
+
+<!ENTITY search.button.label            "Find">
+<!ENTITY search.button.accesskey        "n">
+<!ENTITY save.button.label              "Bookmark this Search">
+<!ENTITY save.button.accesskey          "b">
+
+<!ENTITY bookmarks.label                "Bookmarks">
+<!ENTITY history.label                  "History">
+
+<!ENTITY name.label                     "Name">
+<!ENTITY url.label                      "URL">
+<!ENTITY shortcut.label                 "Custom Keyword">
+<!ENTITY description.label              "Description">
+
+<!ENTITY contains.label                 "contains">
+<!ENTITY startswith.label               "starts with">
+<!ENTITY endswith.label                 "ends with">
+<!ENTITY is.label                       "is">
+<!ENTITY isnot.label                    "is not">
+<!ENTITY doesntcontain.label            "doesn't contain">
+
+<!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">

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bm-props.dtd

@@ -0,0 +1,92 @@
+<!-- 
+   - 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>
+   -                 Robert John Churchill <rjc@netscape.com>
+   -                 Ben Goodger           <ben@netscape.com>
+  --> 
+
+<!ENTITY bookmarks.windowtitle.label  "Properties for &quot;**bm_title**&quot;">
+
+<!ENTITY generalInfo.label            "Info">
+<!ENTITY generalInfo.accesskey        "i">
+<!ENTITY generaldesc.label            "&brandShortName; can remember the locations of sites on the Internet for you. Enter the site's name and location in the fields below, then select the site from the Bookmarks menu or your Bookmarks My Sidebar tab to visit the site.">
+
+<!ENTITY schedule.label               "Schedule">
+<!ENTITY schedule.accesskey           "s">
+<!ENTITY schedule.description         "&brandShortName; can check this site for updates and notify you when one occurs. Use these settings to customize the schedule for this Bookmark.">
+<!ENTITY notification.label           "Notify">
+<!ENTITY notification.accesskey       "n">
+<!-- ICK. fix me -->
+<!ENTITY notification.description     "&brandShortName; will notify you when this site changes. Use these settings to customize notification.">
+
+<!ENTITY bookmarks.information.label  "Information:">
+<!ENTITY bookmarks.name.label         "Name:">
+<!ENTITY bookmarks.location.label     "Location:">
+<!ENTITY bookmarks.shortcut.label     "Keyword:">
+<!ENTITY bookmarks.description.label  "Comments:">
+
+<!ENTITY checkforupdates.legend.label "Check this location for updates:">
+<!ENTITY when.label                   "When:">
+<!ENTITY from.label                   "from:">
+<!ENTITY to.label                     "to: ">
+<!ENTITY every.label                  "every">
+<!ENTITY minutes.label                "minute(s)">
+<!ENTITY notifications.legend.label   "Notification:">
+
+<!ENTITY checknever.label             "Never">
+<!ENTITY checkeveryday.label          "Every day">
+<!ENTITY checkweekdays.label          "Weekdays">
+<!ENTITY checkweekends.label          "Weekends">
+<!ENTITY checkmondays.label           "Mondays">
+<!ENTITY checktuesdays.label          "Tuesdays">
+<!ENTITY checkwednesdays.label        "Wednesdays">
+<!ENTITY checkthursdays.label         "Thursdays">
+<!ENTITY checkfridays.label           "Fridays">
+<!ENTITY checksaturdays.label         "Saturdays">
+<!ENTITY checksundays.label           "Sundays">
+
+<!ENTITY midnight.label               "Midnight">
+<!ENTITY AMone.label                  "1 AM">
+<!ENTITY AMtwo.label                  "2 AM">
+<!ENTITY AMthree.label                "3 AM">
+<!ENTITY AMfour.label                 "4 AM">
+<!ENTITY AMfive.label                 "5 AM">
+<!ENTITY AMsix.label                  "6 AM">
+<!ENTITY AMseven.label                "7 AM">
+<!ENTITY AMeight.label                "8 AM">
+<!ENTITY AMnine.label                 "9 AM">
+<!ENTITY AMten.label                  "10 AM">
+<!ENTITY AMeleven.label               "11 AM">
+<!ENTITY noon.label                   "Noon">
+<!ENTITY PMone.label                  "1 PM">
+<!ENTITY PMtwo.label                  "2 PM">
+<!ENTITY PMthree.label                "3 PM">
+<!ENTITY PMfour.label                 "4 PM">
+<!ENTITY PMfive.label                 "5 PM">
+<!ENTITY PMsix.label                  "6 PM">
+<!ENTITY PMseven.label                "7 PM">
+<!ENTITY PMeight.label                "8 PM">
+<!ENTITY PMnine.label                 "9 PM">
+<!ENTITY PMten.label                  "10 PM">
+<!ENTITY PMeleven.label               "11 PM">
+
+<!ENTITY notification.icon.label      "Change the bookmark's icon">
+<!ENTITY notification.sound.label     "Play a sound">
+<!ENTITY notification.alert.label     "Display an alert">
+<!ENTITY notification.window.label    "Open web page in a new window">

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties

@@ -0,0 +1,76 @@
+# 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): 
+#
+
+cmd_open = Open
+cmd_openfolder = Expand
+cmd_openfolder2 = Collapse
+cmd_find = Find a Bookmark...
+cmd_bm_cut = Cut
+cmd_bm_copy = Copy
+cmd_bm_paste = Paste
+cmd_bm_delete = Delete
+cmd_bm_selectAll = Select All
+cmd_rename = Rename...
+cmd_renamebookmark2 = Change Location...
+cmd_properties = Properties
+cmd_bm_fileBookmark = File Bookmark(s)...
+
+cmd_openfolderinnewwindow = Open in New Window
+cmd_newfolder = New Folder...
+cmd_newbookmark = New Bookmark...
+cmd_newseparator = New Separator
+cmd_setnewbookmarkfolder = Set as New Bookmark folder
+cmd_setpersonaltoolbarfolder = Set as Personal Toolbar folder
+cmd_setnewsearchfolder = Set as Saved Search Results folder
+
+ile_newfolder = New Folder
+ile_newbookmark = New Bookmark
+
+window_title = %folder_name% - Bookmarks
+search_results_title = Search Results
+
+file_in = File in "%folder_name%"
+
+bookmarks_root = Bookmarks for %user_name%
+status_foldercount = %num_items% object(s)
+
+WebPageUpdated = The following web page has been updated:
+WebPageTitle = Title:
+WebPageURL = URL:
+WebPageAskDisplay = Would you like to display it?
+WebPageAskStopOption = Stop checking for updates on this web page
+
+pleaseEnterALocation = Please enter a location
+pleaseEnterADuration = Please enter a duration.
+pleaseSelectANotification = Please enter at least one notification method.
+
+SortMenuItem = Sorted by %NAME%
+
+FindTitle = Find: %S %S '%S' in %S
+
+ImportedIEFavorites = Imported IE Favorites                                     
+ImportedNetPositiveBookmarks = Imported NetPositive Bookmarks                   
+DefaultPersonalToolbarFolder = Personal Toolbar Folder                          
+
+SelectImport = Import bookmark file:                                            
+EnterExport = Export bookmark file:                                             
+
+search_button_label = Find
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd

@@ -0,0 +1,73 @@
+<!-- 
+   - 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 command.newBookmark.label     "New Bookmark">
+<!ENTITY command.newBookmark.accesskey "n">
+<!ENTITY command.newFolder.label       "New Folder">
+<!ENTITY command.newFolder.accesskey   "f">
+<!ENTITY command.newSeparator.label    "New Separator">
+<!ENTITY command.newSeparator.accesskey "s">
+<!ENTITY menuitem.import.label         "Import Bookmarks...">
+<!ENTITY menuitem.export.label         "Export Bookmarks...">
+<!ENTITY menuitem.find.label           "Search Bookmarks...">
+<!ENTITY menuitem.find.accesskey       "s">
+<!ENTITY edit.find.keybinding          "f">
+<!ENTITY command.properties.label      "Properties">
+<!ENTITY command.properties.accesskey  "i">
+<!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 tree.header.name.label         "Name">
+<!ENTITY tree.header.url.label          "Location">
+<!ENTITY tree.header.shortcut.label     "Keyword">
+<!ENTITY tree.header.addedon.label      "Added">
+<!ENTITY tree.header.lastmod.label      "Last Modified">
+<!ENTITY tree.header.lastvisit.label    "Last Visited">
+<!ENTITY tree.header.description.label  "Description">
+<!ENTITY bookmarksWindowTitle.label	    "Bookmarks">
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarksOverlay.dtd

@@ -0,0 +1,22 @@
+
+<!ENTITY  findABookmark.label               "Find a Bookmark...">
+<!ENTITY  findABookmark.accesskey           "f">
+<!ENTITY  newBookmark.label                 "New Bookmark...">
+<!ENTITY  newBookmark.accesskey             "n">
+<!ENTITY  newFolder.label                   "New Folder...">
+<!ENTITY  newFolder.accesskey               "e">
+<!ENTITY  newSeparator.label                "New Separator">
+<!ENTITY  newSeparator.accesskey            "s">
+<!ENTITY  setAsNewBookmarkFolder.label      "Set as new Bookmark folder">
+<!ENTITY  setAsNewBookmarkFolder.accesskey  "b">
+<!ENTITY  setAsNewSearchFolder.label        "Set as new Search Results folder">
+<!ENTITY  setAsNewSearchFolder.accesskey    "r">
+<!ENTITY  setAsNewToolbarFolder.label       "Set as new Personal Toolbar folder">
+<!ENTITY  setAsNewToolbarFolder.accesskey   "p">
+<!ENTITY  exportBookmarks.label             "Export...">
+<!ENTITY  exportBookmarks.accesskey         "x">
+<!ENTITY  importBookmarks.label             "Import...">
+<!ENTITY  importBookmarks.accesskey         "i">
+
+
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/findBookmark.dtd

@@ -0,0 +1,14 @@
+
+<!ENTITY search.name.label              "name">
+<!ENTITY search.url.label               "location">
+<!ENTITY search.shortcut.label          "keyword">
+<!ENTITY search.description.label       "description">
+<!ENTITY search.startswith.label        "starts with">
+<!ENTITY search.endswith.label          "ends with">
+<!ENTITY search.is.label                "is">
+<!ENTITY search.isnot.label             "is not">
+<!ENTITY search.contains.label          "contains">
+<!ENTITY search.doesntcontain.label     "doesn't contain">
+<!ENTITY search.for.label               "Find Bookmarks whose">
+<!ENTITY findBookmark.title             "Find Bookmarks">
+

mozilla/xpfe/components/bookmarks/resources/locale/en-US/makefile.win

@@ -0,0 +1,24 @@
+#!nmake
+# 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 Communicator client code, released
+# March 31, 1998. 
+# 
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation. Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All 
+# Rights Reserved. 
+# 
+# Contributor(s): 
+# 
+DEPTH = ..\..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/bookmarks/resources/locale/en-US/pref-bookmarks.dtd

@@ -0,0 +1,13 @@
+
+<!ENTITY  lHeader                       "Bookmarks">
+<!ENTITY  filingBookmarks.label         "Adding Bookmarks">
+<!ENTITY  autoFile.label                "&brandShortName; will ask you to choose a title and folder when adding a new Bookmark.">
+<!ENTITY  enableAutoFile.label          "Automatically set title and destination">
+<!ENTITY  defaultFolder.label           "By default, all new Bookmarks will be added into this folder:">
+<!ENTITY  chooseDefaultFolder.label     "Choose Folder...">
+<!ENTITY  chooseDefaultFolder.accesskey "c">
+<!ENTITY  extendedDataViews.label       "Extended Data Views">
+<!ENTITY  extendedDataExplanation.label "&brandShortName; can display some types of special data (e.g. local file folders and ftp directories) in the bookmarks window or menu as folders, rather than as normal links.">
+<!ENTITY  showExtendedData.label        "Show Extended Data as folders in the Bookmarks window and menu">
+<!ENTITY  showExtendedData.accesskey    "x">
+

mozilla/xpfe/components/bookmarks/resources/locale/makefile.win

@@ -0,0 +1,27 @@
+#!nmake
+# 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 Communicator client code, released
+# March 31, 1998. 
+# 
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation. Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All 
+# Rights Reserved. 
+# 
+# Contributor(s): 
+# 
+
+DEPTH = ..\..\..\..\..
+
+DIRS = en-US
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/bookmarks/resources/makefile.win

@@ -0,0 +1,27 @@
+#!nmake
+#
+# 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=..\..\..\..
+
+DIRS= locale
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/xpfe/components/bookmarks/resources/manifest.jm

@@ -0,0 +1,29 @@
+# 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): 
+
+packages/core.jar:
+	communicator/content/bookmarks/bm-find.js
+	communicator/content/bookmarks/bm-find.xul
+	communicator/content/bookmarks/bm-panel.js
+	communicator/content/bookmarks/bm-panel.xul
+	communicator/content/bookmarks/bm-props.js
+	communicator/content/bookmarks/bm-props.xul
+	communicator/content/bookmarks/bookmarks.js
+	communicator/content/bookmarks/bookmarksDD.js
+	communicator/content/bookmarks/bookmarks.xul

mozilla/xpfe/components/bookmarks/resources/oTest.css

@@ -0,0 +1,2 @@
+
+

mozilla/xpfe/components/bookmarks/resources/oTest.xul

@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet href="chrome://communicator/skin/"?>
+<?xml-stylesheet href="chrome://communicator/content/bookmarks/oTest.css"?>
+
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+
+<window id="bookmarksOutlinerTest" width="640" height="480"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        orient="vertical"
+        onload="Startup();">
+
+
+  <script>
+  <![CDATA[
+    var bookmarksBuilderObserver = {
+      onToggleOpenState: function (aIndex) {
+        dump("*** onToggleOpenState(" + aIndex + ");\n");
+      },
+
+      onCycleHeader: function (aColID, aDOMElement) {
+        dump("*** onCycleHeader(" + aColID + ", " + aDOMElement + ");\n");
+      },
+
+      onCycleCell: function (aIndex, aColID) {
+        dump("*** onCycleCell(" + aIndex + ", " + aColID + ");\n");
+      },
+
+      onSelectionChanged: function () {
+        dump("*** onSelectionChanged\n");
+      },
+
+      isEditable: function (aIndex, aColID) {
+        dump("*** isEditable(" + aIndex + ", " + aColID + ");\n");
+        return aColID == "NameColumn";
+      },
+
+      onSetCellText: function (aIndex, aColID, aValue) {
+        dump("*** onSetCellText(" + aIndex + ", " + aColID + ", " + aValue + ");\n");
+      },
+
+      onPerformAction: function (aAction) {
+        dump("*** onPerformAction(" + aAction + ");\n");
+      },
+
+      onPerformActionOnRow: function (aAction, aIndex) {
+        dump("*** onPerformActionOnRow(" + aAction + ", " + aIndex + ");\n");
+      },
+
+      onPerformActionOnCell: function (aAction, aIndex, aColID) {
+        dump("*** onPerformActionOnCell(" + aAction + ", " + aIndex + ", " + aColID + ");\n");
+      }
+    };
+
+    function Startup()
+    {
+      var outliner = document.getElementById("tree");
+      var builder = outliner.builder.QueryInterface(Components.interfaces.nsIXULOutlinerBuilder);
+      builder.addObserver(bookmarksBuilderObserver);
+    }
+
+    function getItemRect(aEvent)
+    {
+      var outliner = document.getElementById("outliner-proper");
+      var obo = outliner.boxObject.QueryInterface(Components.interfaces.nsIOutlinerBoxObject);  
+      var row = { };
+      var col = { };
+      var elt = { };
+      obo.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
+
+      var x = { };
+      var y = { };
+      var w = { };
+      var h = { };
+      var crp = { };
+      obo.getCoordsForCellItem(row.value, col.value, elt.value, x, y, w, h, crp);
+      dump("*** (x,y) = (" + x.value + "," + y.value + "); (w,h) = (" + w.value + "," + h.value + ");\n");
+    }
+
+    const kRDF_NS = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+    function createContextMenu (aEvent)
+    {
+      var outliner = document.getElementById("outliner-proper");
+      var obo = outliner.boxObject.QueryInterface(Components.interfaces.nsIOutlinerBoxObject);
+      var row = { };
+      var col = { };
+      var elt = { };
+      obo.getCellAt(aEvent.clientX, aEvent.clientY, row, col, elt);
+      dump("*** row.value = " + row.value + "\n") 
+      
+      var outlinerBody = document.getElementById("tree");
+      var rowResource = outlinerBody.builder.getResourceAtIndex(row.value);
+      
+      const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFSvcIID = Components.interfaces.nsIRDFService;
+      const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+      var database = outlinerBody.database;
+
+      const krType = kRDFSvc.GetResource(kRDF_NS + "type");
+      var typeNode = kDatabase.GetTarget(rowResource, krType, true);
+      typeNode = typeNode.QueryInterface(Components.interfaces.nsIRDFResource);
+      dump("*** typeNode = " + typeNode.Value + "\n");
+      aEvent.preventBubble();
+    }
+  ]]>
+  </script>
+
+  <!-- tooltips -->
+  <popupset id="aTooltipSet"/>
+
+  <popupset id="contextSet">
+    <popup id="bookmarkContextMenu" oncreate="createContextMenu(event);"/>
+  </popupset>
+
+  <toolbox>
+    <toolbar>
+      <button class="button-toolbar-2" label="Foopy Noopy" oncommand="alert('hi');"/>
+    </toolbar>
+  </toolbox>
+
+  <stack>
+    <button label="Foopy Noopy" flex="1"/>
+    <bulletinboard flex="1">
+      <textbox value="NerpNerp" left="10" top="50" onblur="this.setAttribute('hidden','true');"/>
+    </bulletinboard>  
+  </stack>
+
+  <outliner flex="1" flags="dont-test-empty" id="outliner-proper">
+    <outlinercol id="NameColumn"
+                 class="outlinercol-header outlinercol-inset-header sortDirectionIndicator"
+                 flex="1"
+                 sort="rdf:http://home.netscape.com/NC-rdf#Name"
+                 sortActive="true"
+                 label="Name"
+                 persist="width hidden sortActive sortDirection"
+                 primary="true" />
+
+    <splitter class="tree-splitter"/>
+
+    <outlinercol id="URLColumn"
+                 class="outlinercol-header outlinercol-inset-header sortDirectionIndicator"
+                 flex="1"
+                 sort="rdf:http://home.netscape.com/NC-rdf#URL"
+                 label="Location"
+                 persist="width hidden sortActive sortDirection" />
+
+    <outlinerbody id="tree" datasources="rdf:bookmarks rdf:internetsearch rdf:files" flex="1"
+                  onclick="getItemRect(event);" ref="NC:BookmarksRoot">
+      <template>
+        <outlinerrow uri="rdf:*" properties="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type rdf:http://home.netscape.com/NC-rdf#loading">
+          <outlinercell ref="NameColumn"
+                        label="rdf:http://home.netscape.com/NC-rdf#Name" />
+
+          <outlinercell ref="URLColumn"
+                        label="rdf:http://home.netscape.com/NC-rdf#URL" />
+        </outlinerrow>
+      </template>
+    </outlinerbody>
+  </outliner>
+
+</window>
+

mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul

@@ -0,0 +1,119 @@
+<?xml version="1.0"?> 
+<!--
+   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 Communicator client code, released
+   March 31, 1998.
+   
+   The Initial Developer of the Original Code is Netscape
+   Communications Corporation. Portions created by Netscape are
+   Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   Rights Reserved.
+   
+   Contributor(s): 
+  -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/pref-bookmarks.dtd">
+%prefBookmarkDTD;
+]>
+
+<window xmlns:html="http://www.w3.org/1999/xhtml"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        orient="vertical"
+        onload="parent.initPanel('chrome://communicator/content/bookmarks/pref-bookmarks.xul');">
+
+  <script type="application/x-javascript">
+  <![CDATA[
+    var _elementIDs = ["enableAutoFile", "showExtendedData"];
+
+    var gCreateInFolder = "NC:NewBookmarkFolder";
+    function Startup ()
+    {
+      const kDisplay = document.getElementById("defaultFolder");
+      const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+      const kRDFSvcIID = Components.interfaces.nsIRDFService;
+      const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+      const kBMDS = kRDFSvc.GetDataSource("rdf:bookmarks");
+      const krDefaultFolder = kRDFSvc.GetResource("NC:NewBookmarkFolder");
+      const krType = kRDFSvc.GetResource("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+      const krFolder = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Folder");
+      const isFolder = kBMDS.HasAssertion(krDefaultFolder, krType, krFolder, true);
+      const krNameArc = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Name");
+      if (!isFolder) {
+        const krRoot = kRDFSvc.GetResource("NC:BookmarksRoot");
+        gCreateInFolder = "NC:BookmarksRoot";
+      }
+      var rName = kBMDS.GetTarget(isFolder ? krDefaultFolder : krRoot, krNameArc, true);
+      rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+      kDisplay.value = rName.Value;
+    }
+  
+    function chooseDefaultFolder ()
+    {
+      var rv = { selectedFolder: null };
+      openDialog("chrome://communicator/content/bookmarks/addBookmark.xul", "", 
+                 "centerscreen,chrome,dialog=no,resizable=no", 
+                 null, null, gCreateInFolder, null, "selectFolder", rv);
+      if (rv && rv.selectedFolder) {
+        const kRDFSvcContractID = "@mozilla.org/rdf/rdf-service;1";
+        const kRDFSvcIID = Components.interfaces.nsIRDFService;
+        const kRDFSvc = Components.classes[kRDFSvcContractID].getService(kRDFSvcIID);
+        const kBMDS = kRDFSvc.GetDataSource("rdf:bookmarks");
+        const krDefaultFolder = kRDFSvc.GetResource(rv.selectedFolder);
+        const krNameArc = kRDFSvc.GetResource("http://home.netscape.com/NC-rdf#Name");
+        rName = kBMDS.GetTarget(krDefaultFolder, krNameArc, true);
+        rName = rName.QueryInterface(Components.interfaces.nsIRDFLiteral);
+        document.getElementById("defaultFolder").value = rName.Value;
+      }  
+        
+    }
+  ]]>
+  </script>
+        
+  <box class="box-smallheader" title="&lHeader;"/>
+  
+  <titledbox orient="vertical">
+    <label value="&filingBookmarks.label;"/>
+    <html flex="1">&autoFile.label;</html>
+    <box autostretch="never">
+      <checkbox id="enableAutoFile" label="&enableAutoFile.label;"
+                pref="true" preftype="bool" prefstring="browser.bookmarks.add_without_dialog"
+                prefattribute="checked" valign="top"/>
+    </box>
+    <separator/>
+    <html flex="1">&defaultFolder.label;</html>
+    <box autostretch="never">
+      <textbox readonly="true" id="defaultFolder" crop="right" flex="1"/>
+      <button label="&chooseDefaultFolder.label;" accesskey="&chooseDefaultFolder.accesskey;"
+              oncommand="chooseDefaultFolder();"
+              id="browser.bookmarks.choosefolder" pref="true" preftype="bool"
+              prefstring="pref.browser.homepage.disable_button.choose_folder" prefattribute="disabled"/>
+    </box>
+  </titledbox>
+
+  <titledbox orient="vertical" autostretch="never">
+    <label value="&extendedDataViews.label;"/>
+    <html>&extendedDataExplanation.label;</html>
+    <checkbox id="showExtendedData" label="&showExtendedData.label;"
+              accesskey="&showExtendedData.accesskey;"
+              pref="true" preftype="bool" prefstring="browser.bookmarks.show_extended_data"
+              prefattribute="checked"/>
+  </titledbox>              
+
+
+</window>
+

mozilla/xpfe/components/bookmarks/src/Makefile.in

@@ -0,0 +1,41 @@
+#
+# 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
+
+MODULE		= appcomps
+LIBRARY_NAME	= bookmarks_s
+REQUIRES	= xpcom string rdf appshell widget necko uconv docshell pref timer dom js layout uriloader locale intl webshell gfx2 windowwatcher
+
+CPPSRCS		= nsBookmarksService.cpp
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpfe/components/bookmarks/src/makefile.win

@@ -0,0 +1,43 @@
+#!nmake
+#
+# 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=..\..\..\..
+MODULE=appcomps
+
+CPP_OBJS=                               \
+ .\$(OBJDIR)\nsBookmarksService.obj     \
+ $(NULL)
+
+LIBRARY_NAME=bookmarks_s
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+

mozilla/xpfe/components/bookmarks/src/nsBookmarksService.h

@@ -0,0 +1,213 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * 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): 
+ */
+
+#ifndef bookmarksservice___h___
+#define bookmarksservice___h___
+
+#include "nsIRDFDataSource.h"
+#include "nsIRDFRemoteDataSource.h"
+#include "nsIStreamListener.h"
+#include "nsIRDFObserver.h"
+#include "nsISupportsArray.h"
+#include "nsIStringBundle.h"
+#include "nsITimer.h"
+#include "nsIRDFNode.h"
+#include "nsIBookmarksService.h"
+#include "nsString.h"
+#include "nsIFileSpec.h"
+#include "nsIObserver.h"
+#include "nsWeakReference.h"
+
+#ifdef	DEBUG
+#ifdef	XP_MAC
+#include <Timer.h>
+#endif
+#endif
+
+class nsBookmarksService : public nsIBookmarksService,
+			   public nsIRDFDataSource,
+			   public nsIRDFRemoteDataSource,
+			   public nsIStreamListener,
+			   public nsIRDFObserver,
+			   public nsIObserver,
+			   public nsSupportsWeakReference
+{
+protected:
+	nsIRDFDataSource*		mInner;
+	PRBool				mBookmarksAvailable;
+	PRBool				mDirty;
+	PRBool				busySchedule;
+	nsCOMPtr<nsIRDFResource>	busyResource;
+	PRUint32			htmlSize;
+	nsCOMPtr<nsISupportsArray>      mObservers;
+	nsCOMPtr<nsIStringBundle>	mBundle;
+	nsString			mPersonalToolbarName;
+    PRInt32             mUpdateBatchNest;
+	nsCOMPtr<nsITimer>		mTimer;
+
+#ifdef	XP_MAC
+	PRBool				mIEFavoritesAvailable;
+
+	nsresult ReadFavorites();
+#endif
+
+static	void	FireTimer(nsITimer* aTimer, void* aClosure);
+nsresult	ExamineBookmarkSchedule(nsIRDFResource *theBookmark, PRBool & examineFlag);
+nsresult	GetBookmarkToPing(nsIRDFResource **theBookmark);
+
+	nsresult GetBookmarksFile(nsFileSpec* aResult);
+	nsresult WriteBookmarks(nsFileSpec *bookmarksFile, nsIRDFDataSource *ds, nsIRDFResource *root);
+	nsresult WriteBookmarksContainer(nsIRDFDataSource *ds, nsOutputFileStream& strm, nsIRDFResource *container, PRInt32 level, nsISupportsArray *parentArray);
+	nsresult GetTextForNode(nsIRDFNode* aNode, nsString& aResult);
+	nsresult UpdateBookmarkLastModifiedDate(nsIRDFResource *aSource);
+	nsresult WriteBookmarkProperties(nsIRDFDataSource *ds, nsOutputFileStream& strm, nsIRDFResource *node,
+					 nsIRDFResource *property, const char *htmlAttrib, PRBool isFirst);
+	PRBool   CanAccept(nsIRDFResource* aSource, nsIRDFResource* aProperty, nsIRDFNode* aTarget);
+
+	nsresult getArgumentN(nsISupportsArray *arguments, nsIRDFResource *res, PRInt32 offset, nsIRDFNode **argValue);
+	nsresult insertBookmarkItem(nsIRDFResource *src, nsISupportsArray *aArguments, nsIRDFResource *objType);
+	nsresult deleteBookmarkItem(nsIRDFResource *src, nsISupportsArray *aArguments, PRInt32 parentArgIndex, nsIRDFResource *objType);
+	nsresult setFolderHint(nsIRDFResource *src, nsIRDFResource *objType);
+	nsresult getFolderViaHint(nsIRDFResource *src, PRBool fallbackFlag, nsIRDFResource **folder);
+	nsresult importBookmarks(nsISupportsArray *aArguments);
+	nsresult exportBookmarks(nsISupportsArray *aArguments);
+
+	nsresult getResourceFromLiteralNode(nsIRDFNode *node, nsIRDFResource **res);
+
+	nsresult ChangeURL(nsIRDFResource* aOldURL,
+                           nsIRDFResource* aNewURL);
+
+	nsresult getLocaleString(const char *key, nsString &str);
+
+	// nsIStreamObserver methods:
+	NS_DECL_NSIREQUESTOBSERVER
+
+	// nsIStreamListener methods:
+	NS_DECL_NSISTREAMLISTENER
+
+	// nsIObserver methods:
+	NS_DECL_NSIOBSERVER
+
+public:
+	nsBookmarksService();
+	virtual ~nsBookmarksService();
+	nsresult Init();
+
+	// nsISupports
+	NS_DECL_ISUPPORTS
+
+	// nsIBookmarksService
+	NS_DECL_NSIBOOKMARKSSERVICE
+
+	// nsIRDFDataSource
+	NS_IMETHOD GetURI(char* *uri);
+
+	NS_IMETHOD GetSource(nsIRDFResource* property,
+			     nsIRDFNode* target,
+			     PRBool tv,
+			     nsIRDFResource** source) {
+		return mInner->GetSource(property, target, tv, source);
+	}
+
+	NS_IMETHOD GetSources(nsIRDFResource* property,
+			      nsIRDFNode* target,
+			      PRBool tv,
+			      nsISimpleEnumerator** sources) {
+		return mInner->GetSources(property, target, tv, sources);
+	}
+
+	NS_IMETHOD GetTarget(nsIRDFResource* source,
+			     nsIRDFResource* property,
+			     PRBool tv,
+			     nsIRDFNode** target);
+
+	NS_IMETHOD GetTargets(nsIRDFResource* source,
+			      nsIRDFResource* property,
+			      PRBool tv,
+			      nsISimpleEnumerator** targets) {
+		return mInner->GetTargets(source, property, tv, targets);
+	}
+
+	NS_IMETHOD Assert(nsIRDFResource* aSource,
+			  nsIRDFResource* aProperty,
+			  nsIRDFNode* aTarget,
+			  PRBool aTruthValue);
+
+	NS_IMETHOD Unassert(nsIRDFResource* aSource,
+			    nsIRDFResource* aProperty,
+			    nsIRDFNode* aTarget);
+
+	NS_IMETHOD Change(nsIRDFResource* aSource,
+			  nsIRDFResource* aProperty,
+			  nsIRDFNode* aOldTarget,
+			  nsIRDFNode* aNewTarget);
+
+	NS_IMETHOD Move(nsIRDFResource* aOldSource,
+			nsIRDFResource* aNewSource,
+			nsIRDFResource* aProperty,
+			nsIRDFNode* aTarget);
+			
+	NS_IMETHOD HasAssertion(nsIRDFResource* source,
+				nsIRDFResource* property,
+				nsIRDFNode* target,
+				PRBool tv,
+				PRBool* hasAssertion);
+
+	NS_IMETHOD AddObserver(nsIRDFObserver* aObserver);
+	NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver);
+
+	NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, PRBool *_retval);
+	NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, PRBool *_retval);
+
+	NS_IMETHOD ArcLabelsIn(nsIRDFNode* node,
+			       nsISimpleEnumerator** labels) {
+		return mInner->ArcLabelsIn(node, labels);
+	}
+
+    NS_IMETHOD ArcLabelsOut(nsIRDFResource* source,
+				nsISimpleEnumerator** labels);
+
+	NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult);
+
+	NS_IMETHOD GetAllCommands(nsIRDFResource* source,
+				  nsIEnumerator/*<nsIRDFResource>*/** commands);
+
+	NS_IMETHOD GetAllCmds(nsIRDFResource* source,
+                              nsISimpleEnumerator/*<nsIRDFResource>*/** commands);
+
+	NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+				    nsIRDFResource*   aCommand,
+				    nsISupportsArray/*<nsIRDFResource>*/* aArguments,
+				    PRBool* aResult);
+
+	NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
+			     nsIRDFResource*   aCommand,
+			     nsISupportsArray/*<nsIRDFResource>*/* aArguments);
+
+	// nsIRDFRemoteDataSource
+	NS_DECL_NSIRDFREMOTEDATASOURCE
+
+	// nsIRDFObserver
+	NS_DECL_NSIRDFOBSERVER
+};
+
+#endif // bookmarksservice___h___