[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
sullivan
sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:18:01 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7f6fb2a0f312f8ba7c23e7b1e92958b1d0040cf5
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jun 11 21:16:55 2002 +0000
Made methods that convert bookmarks to and from
property-list-compatible dictionaries public so they
can be used in the Bookmarks window for cut/paste.
* Bookmarks.subproj/IFBookmark.h:
* Bookmarks.subproj/IFBookmark.m:
(+[IFBookmark bookmarkFromDictionaryRepresentation:withGroup:]): New method
(-[IFBookmark initFromDictionaryRepresentation:withGroup:]):
(-[IFBookmark dictionaryRepresentation]):
* Bookmarks.subproj/IFBookmarkGroup.m:
(-[IFBookmarkGroup _loadBookmarkGroupGuts]):
(-[IFBookmarkGroup _saveBookmarkGroupGuts]):
* Bookmarks.subproj/IFBookmarkLeaf.m:
(-[IFBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
(-[IFBookmarkLeaf dictionaryRepresentation]):
* Bookmarks.subproj/IFBookmarkList.m:
(-[IFBookmarkList initFromDictionaryRepresentation:withGroup:]):
(-[IFBookmarkList dictionaryRepresentation]):
* Bookmarks.subproj/IFBookmarkSeparator.m:
(-[IFBookmarkSeparator initFromDictionaryRepresentation:withGroup:]):
(-[IFBookmarkSeparator dictionaryRepresentation]):
* Bookmarks.subproj/IFBookmark_Private.h: Removed leading underscores from
_initFromDictionaryRepresentation and _dictionaryRepresentation, and made
them public.
-fixed 2921580 -- Need Cut/Copy/Paste support in Bookmarks window
-fixed 2952869 -- Alexander offers to undo Bookmark address change
when nothing changed
-made Activity, Bookmarks, and History window set the initial first
responder to their outline views, so Select All and keyboard navigation
work without requiring an initial click.
-eliminated unsightly gray line above outline views in Activity, Bookmarks,
and History windows
* ActivityViewer.m:
(-[ActivityViewer _setUpWindow]):
Make outline view be first responder.
* BookmarksController.h: Add ivars for _droppablePasteboardTypes
and _pasteablePasteboardTypes; maybe these will be the same eventually.
* BookmarksController.m:
(-[BookmarksController _droppablePasteboardTypes]),
(-[BookmarksController _pasteablePasteboardTypes]): Return array of the types we
handle, lazily creating the array if necessary.
(-[BookmarksController windowDidLoad]): Use _droppablePasteboardTypes; make outline
view be first responder.
(-[BookmarksController dealloc]): release new ivars
(-[BookmarksController _selectedBookmarksWithoutRedundantDescendants]),
(-[BookmarksController removeSelectedBookmarks:]): Extracted _selectedBookmarks...
from removeSelectedBookmarks.
(-[BookmarksController outlineView:setObjectValue:forTableColumn:byItem:]): Fixed
copy/paste error that was the cause of 2952869
(-[BookmarksController outlineView:validateDrop:proposedItem:proposedChildIndex:]):
Call [NSPasteboard availableTypeFromArray:] instead of making dangerous assumptions.
(-[BookmarksController _setSelectionToBookmarks:]),
(-[BookmarksController outlineView:acceptDrop:item:childIndex:]): extracted
_setSelectionToBookmarks: into its own function, and used availableTypeFromArray:
(-[BookmarksController copy:]),
(-[BookmarksController paste:]),
(-[BookmarksController clear:]),
(-[BookmarksController cut:]): New methods; the last three are Undoable
(-[BookmarksController _numberOfBookmarksOnPasteboard:]): New helper method used
to set title of Paste menu item.
(-[BookmarksController validateMenuItem:]): New method, used for items whose titles
change (i.e. Cut/Copy/Paste/Clear)
(-[BookmarksController validateUserInterfaceItem:]): No change, just moved.
* English.lproj/ActivityViewer.nib,
* English.lproj/Bookmarks.nib,
* English.lproj/History.nib: Made outline views one pixel taller to avoid unsightly
gray line at top.
* GlobalHistory.h:
* GlobalHistory.m:
(-[selectAll:]): Removed unnecessary method.
(-[GlobalHistory validateUserInterfaceItem:]): Removed validation for selectAll;
let outline view handle it.
(-[GlobalHistory showWindow:]): Make outline view be first responder.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1334 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/IFBookmark.h b/WebKit/Bookmarks.subproj/IFBookmark.h
index 048e0b2..266562b 100644
--- a/WebKit/Bookmarks.subproj/IFBookmark.h
+++ b/WebKit/Bookmarks.subproj/IFBookmark.h
@@ -22,6 +22,11 @@ typedef enum {
NSString *_identifier;
}
++ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
+
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
+- (NSDictionary *)dictionaryRepresentation;
+
- (NSString *)title;
- (void)setTitle:(NSString *)title;
diff --git a/WebKit/Bookmarks.subproj/IFBookmark.m b/WebKit/Bookmarks.subproj/IFBookmark.m
index dd227ad..e18323e 100644
--- a/WebKit/Bookmarks.subproj/IFBookmark.m
+++ b/WebKit/Bookmarks.subproj/IFBookmark.m
@@ -7,8 +7,12 @@
//
#import <WebKit/IFBookmark.h>
+#import <WebKit/IFBookmark_Private.h>
#import <WebKit/IFBookmarkGroup.h>
#import <WebKit/IFBookmarkGroup_Private.h>
+#import <WebKit/IFBookmarkLeaf.h>
+#import <WebKit/IFBookmarkList.h>
+#import <WebKit/IFBookmarkSeparator.h>
#import <WebKit/WebKitDebug.h>
// to get NSRequestConcreteImplementation
@@ -166,13 +170,32 @@ static unsigned _highestUsedID = 0;
[group _addedBookmark:self];
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
++ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+{
+ NSString *typeString;
+
+ typeString = [dict objectForKey:IFBookmarkTypeKey];
+ if ([typeString isEqualToString:IFBookmarkTypeListValue]) {
+ return [[[IFBookmarkList alloc] initFromDictionaryRepresentation:dict
+ withGroup:group] autorelease];
+ } else if ([typeString isEqualToString:IFBookmarkTypeLeafValue]) {
+ return [[[IFBookmarkLeaf alloc] initFromDictionaryRepresentation:dict
+ withGroup:group] autorelease];
+ } else if ([typeString isEqualToString:IFBookmarkTypeSeparatorValue]) {
+ return [[[IFBookmarkSeparator alloc] initFromDictionaryRepresentation:dict
+ withGroup:group] autorelease];
+ }
+
+ return nil;
+}
+
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
return nil;
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
return nil;
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
index 85522ff..d77e012 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
@@ -211,7 +211,7 @@
}
_loading = YES;
- newTopBookmark = [[[IFBookmarkList alloc] _initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
+ newTopBookmark = [[[IFBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
[self _setTopBookmark:newTopBookmark];
_loading = NO;
@@ -246,7 +246,7 @@
return NO;
}
- dictionary = [[self topBookmark] _dictionaryRepresentation];
+ dictionary = [[self topBookmark] dictionaryRepresentation];
if (![dictionary writeToFile:path atomically:YES]) {
WEBKITDEBUG("attempt to save %s to %s failed\n", DEBUG_OBJECT(dictionary), DEBUG_OBJECT(path));
return NO;
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m b/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
index a90bb48..0f0dfc5 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
@@ -37,7 +37,7 @@
return self;
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
@@ -52,7 +52,7 @@
return self;
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *dict;
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkList.m b/WebKit/Bookmarks.subproj/IFBookmarkList.m
index 0dbdcf5..3b2428c 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkList.m
@@ -34,12 +34,10 @@
return self;
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
NSArray *storedChildren;
- NSDictionary *childAsDictionary;
IFBookmark *child;
- NSString *typeString;
unsigned index, count;
WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
@@ -56,20 +54,8 @@
if (storedChildren != nil) {
count = [storedChildren count];
for (index = 0; index < count; ++index) {
- childAsDictionary = [storedChildren objectAtIndex:index];
- child = nil;
-
- typeString = [childAsDictionary objectForKey:IFBookmarkTypeKey];
- if ([typeString isEqualToString:IFBookmarkTypeListValue]) {
- child = [[[IFBookmarkList alloc] _initFromDictionaryRepresentation:childAsDictionary
- withGroup:group] autorelease];
- } else if ([typeString isEqualToString:IFBookmarkTypeLeafValue]) {
- child = [[[IFBookmarkLeaf alloc] _initFromDictionaryRepresentation:childAsDictionary
- withGroup:group] autorelease];
- } else if ([typeString isEqualToString:IFBookmarkTypeSeparatorValue]) {
- child = [[[IFBookmarkSeparator alloc] _initFromDictionaryRepresentation:childAsDictionary
- withGroup:group] autorelease];
- }
+ child = [IFBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:index]
+ withGroup:group];
if (child != nil) {
[self insertChild:child atIndex:index];
@@ -80,7 +66,7 @@
return self;
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *dict;
NSMutableArray *childrenAsDictionaries;
@@ -103,7 +89,7 @@
IFBookmark *child;
child = [_list objectAtIndex:index];
- [childrenAsDictionaries addObject:[child _dictionaryRepresentation]];
+ [childrenAsDictionaries addObject:[child dictionaryRepresentation]];
}
[dict setObject:childrenAsDictionaries forKey:ChildrenKey];
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m b/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
index 1a79e5e..f8f0d09 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
@@ -24,7 +24,7 @@
return self;
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
if (![[dict objectForKey:IFBookmarkTypeKey] isEqualToString:IFBookmarkTypeSeparatorValue]) {
WEBKITDEBUG("Can't initialize Bookmark separator from non-separator type");
@@ -34,7 +34,7 @@
return [self initWithGroup:group];
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
return [NSDictionary dictionaryWithObject:IFBookmarkTypeSeparatorValue forKey:IFBookmarkTypeKey];
}
diff --git a/WebKit/Bookmarks.subproj/IFBookmark_Private.h b/WebKit/Bookmarks.subproj/IFBookmark_Private.h
index 8a94e99..4d2c608 100644
--- a/WebKit/Bookmarks.subproj/IFBookmark_Private.h
+++ b/WebKit/Bookmarks.subproj/IFBookmark_Private.h
@@ -16,9 +16,6 @@
@interface IFBookmark(IFPrivate)
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
-- (NSDictionary *)_dictionaryRepresentation;
-
- (void)_setParent:(IFBookmark *)parent;
- (void)_setGroup:(IFBookmarkGroup *)group;
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.h b/WebKit/Bookmarks.subproj/WebBookmark.h
index 048e0b2..266562b 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.h
+++ b/WebKit/Bookmarks.subproj/WebBookmark.h
@@ -22,6 +22,11 @@ typedef enum {
NSString *_identifier;
}
++ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
+
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
+- (NSDictionary *)dictionaryRepresentation;
+
- (NSString *)title;
- (void)setTitle:(NSString *)title;
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index dd227ad..e18323e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -7,8 +7,12 @@
//
#import <WebKit/IFBookmark.h>
+#import <WebKit/IFBookmark_Private.h>
#import <WebKit/IFBookmarkGroup.h>
#import <WebKit/IFBookmarkGroup_Private.h>
+#import <WebKit/IFBookmarkLeaf.h>
+#import <WebKit/IFBookmarkList.h>
+#import <WebKit/IFBookmarkSeparator.h>
#import <WebKit/WebKitDebug.h>
// to get NSRequestConcreteImplementation
@@ -166,13 +170,32 @@ static unsigned _highestUsedID = 0;
[group _addedBookmark:self];
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
++ (IFBookmark *)bookmarkFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+{
+ NSString *typeString;
+
+ typeString = [dict objectForKey:IFBookmarkTypeKey];
+ if ([typeString isEqualToString:IFBookmarkTypeListValue]) {
+ return [[[IFBookmarkList alloc] initFromDictionaryRepresentation:dict
+ withGroup:group] autorelease];
+ } else if ([typeString isEqualToString:IFBookmarkTypeLeafValue]) {
+ return [[[IFBookmarkLeaf alloc] initFromDictionaryRepresentation:dict
+ withGroup:group] autorelease];
+ } else if ([typeString isEqualToString:IFBookmarkTypeSeparatorValue]) {
+ return [[[IFBookmarkSeparator alloc] initFromDictionaryRepresentation:dict
+ withGroup:group] autorelease];
+ }
+
+ return nil;
+}
+
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
return nil;
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
return nil;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 85522ff..d77e012 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -211,7 +211,7 @@
}
_loading = YES;
- newTopBookmark = [[[IFBookmarkList alloc] _initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
+ newTopBookmark = [[[IFBookmarkList alloc] initFromDictionaryRepresentation:dictionary withGroup:self] autorelease];
[self _setTopBookmark:newTopBookmark];
_loading = NO;
@@ -246,7 +246,7 @@
return NO;
}
- dictionary = [[self topBookmark] _dictionaryRepresentation];
+ dictionary = [[self topBookmark] dictionaryRepresentation];
if (![dictionary writeToFile:path atomically:YES]) {
WEBKITDEBUG("attempt to save %s to %s failed\n", DEBUG_OBJECT(dictionary), DEBUG_OBJECT(path));
return NO;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index a90bb48..0f0dfc5 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -37,7 +37,7 @@
return self;
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
@@ -52,7 +52,7 @@
return self;
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *dict;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index 0dbdcf5..3b2428c 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -34,12 +34,10 @@
return self;
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
NSArray *storedChildren;
- NSDictionary *childAsDictionary;
IFBookmark *child;
- NSString *typeString;
unsigned index, count;
WEBKIT_ASSERT_VALID_ARG (dict, dict != nil);
@@ -56,20 +54,8 @@
if (storedChildren != nil) {
count = [storedChildren count];
for (index = 0; index < count; ++index) {
- childAsDictionary = [storedChildren objectAtIndex:index];
- child = nil;
-
- typeString = [childAsDictionary objectForKey:IFBookmarkTypeKey];
- if ([typeString isEqualToString:IFBookmarkTypeListValue]) {
- child = [[[IFBookmarkList alloc] _initFromDictionaryRepresentation:childAsDictionary
- withGroup:group] autorelease];
- } else if ([typeString isEqualToString:IFBookmarkTypeLeafValue]) {
- child = [[[IFBookmarkLeaf alloc] _initFromDictionaryRepresentation:childAsDictionary
- withGroup:group] autorelease];
- } else if ([typeString isEqualToString:IFBookmarkTypeSeparatorValue]) {
- child = [[[IFBookmarkSeparator alloc] _initFromDictionaryRepresentation:childAsDictionary
- withGroup:group] autorelease];
- }
+ child = [IFBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:index]
+ withGroup:group];
if (child != nil) {
[self insertChild:child atIndex:index];
@@ -80,7 +66,7 @@
return self;
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
NSMutableDictionary *dict;
NSMutableArray *childrenAsDictionaries;
@@ -103,7 +89,7 @@
IFBookmark *child;
child = [_list objectAtIndex:index];
- [childrenAsDictionaries addObject:[child _dictionaryRepresentation]];
+ [childrenAsDictionaries addObject:[child dictionaryRepresentation]];
}
[dict setObject:childrenAsDictionaries forKey:ChildrenKey];
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
index 8a94e99..4d2c608 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
@@ -16,9 +16,6 @@
@interface IFBookmark(IFPrivate)
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
-- (NSDictionary *)_dictionaryRepresentation;
-
- (void)_setParent:(IFBookmark *)parent;
- (void)_setGroup:(IFBookmarkGroup *)group;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
index 1a79e5e..f8f0d09 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
@@ -24,7 +24,7 @@
return self;
}
-- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
+- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group
{
if (![[dict objectForKey:IFBookmarkTypeKey] isEqualToString:IFBookmarkTypeSeparatorValue]) {
WEBKITDEBUG("Can't initialize Bookmark separator from non-separator type");
@@ -34,7 +34,7 @@
return [self initWithGroup:group];
}
-- (NSDictionary *)_dictionaryRepresentation
+- (NSDictionary *)dictionaryRepresentation
{
return [NSDictionary dictionaryWithObject:IFBookmarkTypeSeparatorValue forKey:IFBookmarkTypeKey];
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7f763a1..1749433 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,31 @@
+2002-06-11 John Sullivan <sullivan at apple.com>
+
+ Made methods that convert bookmarks to and from
+ property-list-compatible dictionaries public so they
+ can be used in the Bookmarks window for cut/paste.
+
+ * Bookmarks.subproj/IFBookmark.h:
+ * Bookmarks.subproj/IFBookmark.m:
+ (+[IFBookmark bookmarkFromDictionaryRepresentation:withGroup:]): New method
+
+ (-[IFBookmark initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmark dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmarkGroup.m:
+ (-[IFBookmarkGroup _loadBookmarkGroupGuts]):
+ (-[IFBookmarkGroup _saveBookmarkGroupGuts]):
+ * Bookmarks.subproj/IFBookmarkLeaf.m:
+ (-[IFBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmarkLeaf dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmarkList.m:
+ (-[IFBookmarkList initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmarkList dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmarkSeparator.m:
+ (-[IFBookmarkSeparator initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmarkSeparator dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmark_Private.h: Removed leading underscores from
+ _initFromDictionaryRepresentation and _dictionaryRepresentation, and made
+ them public.
+
2002-06-11 Darin Adler <darin at apple.com>
* WebView.subproj/IFDOMNode.h: Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 7f763a1..1749433 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,31 @@
+2002-06-11 John Sullivan <sullivan at apple.com>
+
+ Made methods that convert bookmarks to and from
+ property-list-compatible dictionaries public so they
+ can be used in the Bookmarks window for cut/paste.
+
+ * Bookmarks.subproj/IFBookmark.h:
+ * Bookmarks.subproj/IFBookmark.m:
+ (+[IFBookmark bookmarkFromDictionaryRepresentation:withGroup:]): New method
+
+ (-[IFBookmark initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmark dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmarkGroup.m:
+ (-[IFBookmarkGroup _loadBookmarkGroupGuts]):
+ (-[IFBookmarkGroup _saveBookmarkGroupGuts]):
+ * Bookmarks.subproj/IFBookmarkLeaf.m:
+ (-[IFBookmarkLeaf initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmarkLeaf dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmarkList.m:
+ (-[IFBookmarkList initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmarkList dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmarkSeparator.m:
+ (-[IFBookmarkSeparator initFromDictionaryRepresentation:withGroup:]):
+ (-[IFBookmarkSeparator dictionaryRepresentation]):
+ * Bookmarks.subproj/IFBookmark_Private.h: Removed leading underscores from
+ _initFromDictionaryRepresentation and _dictionaryRepresentation, and made
+ them public.
+
2002-06-11 Darin Adler <darin at apple.com>
* WebView.subproj/IFDOMNode.h: Added.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list