[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit e9a07cf9000a85aa84c0b679d53c6c02c0e20f8a
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 6 18:55:12 2002 +0000

    Previous commit didn't seem to take for some reason; trying again.
    
    
    	* Bookmarks.subproj/IFBookmarkList.m:
    	(-[IFBookmarkList removeChild:]): Added assert.
    	(-[IFBookmarkList insertChild:atIndex:]): Set the group of
    	the new child, and added assert.
    
    
    	Added Undo in the Bookmarks window for removing items and for changing
    	the titles and addresses of items. Also changed the image used for
    	Stop in the Bookmarks window per a conversation with Don and Chris
    	yesterday.
    
    	- fixed 2927231 -- should be able to Undo deleting bookmarks
    	- fixed 2948496 -- should be able to Undo title & address changes in Bookmarks window
    
    	* BookmarksController.m:
    	(-[UndoRemoveInfo initWithBookmark:]),
    	(-[UndoRemoveInfo dealloc]),
    	(+[UndoRemoveInfo infoWithBookmark:]):
    	New little helper class that hangs onto the info needed to put removed
    	bookmarks back in the right places.
    
    	(-[BookmarksController _redoRemoveBookmarks:]),
    	(-[BookmarksController _undoRemoveBookmarks:]): New methods
    	(-[BookmarksController removeSelectedBookmarks:]): Register for undo.
    
    	(-[BookmarksController _undoTitleChange:]),
    	(-[BookmarksController _changeTitleForBookmark:to:]),
    	(-[BookmarksController _undoAddressChange:]),
    	(-[BookmarksController _changeAddressForBookmark:to:]),
    	New methods used for undo/redo.
    
    	(-[BookmarksController outlineView:setObjectValue:forTableColumn:byItem:]):
    	Register for Undo, but only if the value has actually changed.
    
    	(-[BookmarksController windowWillClose:]): Empty undo/redo stack.
    
    	* Resources/Images/red_globe.tiff: Added, used by Stop in Downloads window.
    	* Resources/Images/green_globe.tiff: Added, to be used by Resume in Downloads window.
    	* Resources/Images/stop.tiff: Removed.
    
    	* DownloadMonitor.m:
    	(-[DownloadMonitor toolbar:itemForItemIdentifier:willBeInsertedIntoToolbar:]):
    	Use new Stop image.
    
    	* WebBrowser.pbproj/project.pbxproj: Updated for new image files.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1285 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Bookmarks.subproj/IFBookmarkList.m b/WebKit/Bookmarks.subproj/IFBookmarkList.m
index 6c4dd7e..e51df5c 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkList.m
@@ -228,6 +228,8 @@
 - (void)removeChild:(IFBookmark *)bookmark
 {
     WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == self);
+    WEBKIT_ASSERT_VALID_ARG (bookmark, [_list containsObject:bookmark]);
+    
     [_list removeObject:bookmark];
     [bookmark _setParent:nil];
 
@@ -237,8 +239,12 @@
 
 - (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index
 {
+    WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == nil);
+    WEBKIT_ASSERT_VALID_ARG (bookmark, ![_list containsObject:bookmark]);
+    
     [_list insertObject:bookmark atIndex:index];
     [bookmark _setParent:self];
+    [bookmark _setGroup:[self group]];
     
     [[self group] _bookmarkChildrenDidChange:self]; 
 }
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index 6c4dd7e..e51df5c 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -228,6 +228,8 @@
 - (void)removeChild:(IFBookmark *)bookmark
 {
     WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == self);
+    WEBKIT_ASSERT_VALID_ARG (bookmark, [_list containsObject:bookmark]);
+    
     [_list removeObject:bookmark];
     [bookmark _setParent:nil];
 
@@ -237,8 +239,12 @@
 
 - (void)insertChild:(IFBookmark *)bookmark atIndex:(unsigned)index
 {
+    WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == nil);
+    WEBKIT_ASSERT_VALID_ARG (bookmark, ![_list containsObject:bookmark]);
+    
     [_list insertObject:bookmark atIndex:index];
     [bookmark _setParent:self];
+    [bookmark _setGroup:[self group]];
     
     [[self group] _bookmarkChildrenDidChange:self]; 
 }
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 223065a..516c187 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2002-06-06  John Sullivan  <sullivan at apple.com>
+
+	* Bookmarks.subproj/IFBookmarkList.m:
+	(-[IFBookmarkList removeChild:]):
+	(-[IFBookmarkList insertChild:atIndex:]):
+	* ChangeLog:
+
+2002-06-06  John Sullivan  <sullivan at apple.com>
+
+	* Bookmarks.subproj/IFBookmarkList.m:
+	(-[IFBookmarkList removeChild:]): Added assert.
+	(-[IFBookmarkList insertChild:atIndex:]): Set the group of
+	the new child, and added assert.
+
 2002-06-06  Darin Adler  <darin at apple.com>
 
 	* MIME.subproj/IFContentHandler.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 223065a..516c187 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-06-06  John Sullivan  <sullivan at apple.com>
+
+	* Bookmarks.subproj/IFBookmarkList.m:
+	(-[IFBookmarkList removeChild:]):
+	(-[IFBookmarkList insertChild:atIndex:]):
+	* ChangeLog:
+
+2002-06-06  John Sullivan  <sullivan at apple.com>
+
+	* Bookmarks.subproj/IFBookmarkList.m:
+	(-[IFBookmarkList removeChild:]): Added assert.
+	(-[IFBookmarkList insertChild:atIndex:]): Set the group of
+	the new child, and added assert.
+
 2002-06-06  Darin Adler  <darin at apple.com>
 
 	* MIME.subproj/IFContentHandler.m:

-- 
WebKit Debian packaging