[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:15:23 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1691bc8cc0956eb1feae6ba6ce46c63380bac7e7
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 28 23:55:07 2002 +0000
Made -[IFBookmark group] and -[IFBookmark parent] public
methods, and renamed them to not use leading underscores,
as part of support for revealing a particular bookmark in
the Bookmarks window.
* Bookmarks.subproj/IFBookmark_Private.h:
removed _group and _parent.
* Bookmarks.subproj/IFBookmark.h:
added group and parent.
- fixed 2923488 -- Silent failure when bookmark URL is invalid URL
- fixed 2935830 (urls in Bookmarks should be "canonicalized" like
urls in location field)
- fixed 2935388 (errors in Activity window shouldn't show numeric
error codes)
* IFBookmarkAdditions.h: Added.
* IFBookmarkAdditions.m: Added.
(-[IFBookmark goTo]):
New category, adds browser-specific behavior to IFBookmark. The first
and only method so far goes to the bookmark's address; if the address string
can't be turned into a valid URL, the user is told and given an opportunity
to fix the address.
* AppController.h:
* AppController.m:
(-[AppController showBookmarks:]):
Moved initialization of _bookmarksController ivar out of here.
(-[AppController _takeLocationFromBookmark:]):
Now calls -[IFBookmark goTo].
(-[AppController bookmarksController]):
New public method, initializes _bookmarksController ivar if necessary.
* BookmarksController.h:
* BookmarksController.m:
(-[BookmarksController _goToSelectedItem:]): Now calls -[IFBookmark goTo].
(-[BookmarksController _expandAncestorsOfBookmark:]): New method, ensures that
each ancestor folder of the specified bookmark is expanded in the outline view.
(-[BookmarksController revealBookmark:]): New method, expands the bookmark's
ancestors, then selects the bookmark and scrolls to reveal as necessary.
(-[BookmarksController _editSelectedColumnWithID:]): New helper method,
edits the contents of the specified column for the selected row.
(-[BookmarksController editSelectedAddress]),
(-[BookmarksController editSelectedName]): New methods, they call
_editSelectedColumnWithID: for different columns.
(-[BookmarksController _toggleEdit:]): Now calls editSelectedName.
* IFErrorAdditions.m:
(-[IFError errorSummary]): Removed error code from the string this method
returns.
* WebBrowser.pbproj/project.pbxproj: Updated for new files; also added new
WebKit Additions group and moved some existing files into it.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1230 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/IFBookmark.h b/WebKit/Bookmarks.subproj/IFBookmark.h
index 4f8a701..a32f1ed 100644
--- a/WebKit/Bookmarks.subproj/IFBookmark.h
+++ b/WebKit/Bookmarks.subproj/IFBookmark.h
@@ -50,4 +50,11 @@ typedef enum {
// Remove a bookmark from the list. Does nothing if bookmarkType is not IFBookmarkTypeList.
- (void)removeChild:(IFBookmark *)bookmark;
+// The parent of this bookmark, or nil if this is the top bookmark in a group
+- (IFBookmark *)parent;
+
+// The group that this bookmark belongs to.
+- (IFBookmarkGroup *)group;
+
+
@end
diff --git a/WebKit/Bookmarks.subproj/IFBookmark.m b/WebKit/Bookmarks.subproj/IFBookmark.m
index 2460d9b..47cdc5c 100644
--- a/WebKit/Bookmarks.subproj/IFBookmark.m
+++ b/WebKit/Bookmarks.subproj/IFBookmark.m
@@ -114,7 +114,7 @@
}
}
-- (IFBookmark *)_parent
+- (IFBookmark *)parent
{
return _parent;
}
@@ -126,7 +126,7 @@
_parent = parent;
}
-- (IFBookmarkGroup *)_group
+- (IFBookmarkGroup *)group
{
return _group;
}
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
index 5bd7bc5..38e24e8 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkGroup.m
@@ -117,13 +117,13 @@
- (void)removeBookmark:(IFBookmark *)bookmark
{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark _group] == self);
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark _parent] != nil || bookmark == _topBookmark);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark group] == self);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] != nil || bookmark == _topBookmark);
if (bookmark == _topBookmark) {
[self _setTopBookmark:nil];
} else {
- [[bookmark _parent] removeChild:bookmark];
+ [[bookmark parent] removeChild:bookmark];
[bookmark _setGroup:nil];
}
}
@@ -151,7 +151,7 @@
{
IFBookmark *bookmark;
- WEBKIT_ASSERT_VALID_ARG (parent, [parent _group] == self);
+ WEBKIT_ASSERT_VALID_ARG (parent, [parent group] == self);
WEBKIT_ASSERT_VALID_ARG (parent, [parent bookmarkType] == IFBookmarkTypeList);
WEBKIT_ASSERT_VALID_ARG (newURLString, bookmarkType == IFBookmarkTypeLeaf || (newURLString == nil));
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m b/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
index 1ae3274..a90bb48 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkLeaf.m
@@ -79,7 +79,7 @@
return [[IFBookmarkLeaf alloc] initWithURLString:_URLString
title:[self title]
image:[self image]
- group:[self _group]];
+ group:[self group]];
}
- (NSString *)title
@@ -95,7 +95,7 @@
[_entry setTitle:title];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (NSImage *)image
@@ -107,7 +107,7 @@
{
[_entry setImage:image];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (IFBookmarkType)bookmarkType
@@ -129,7 +129,7 @@
[_URLString release];
_URLString = [URLString copy];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkList.m b/WebKit/Bookmarks.subproj/IFBookmarkList.m
index f55d2b1..6c4dd7e 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkList.m
@@ -127,7 +127,7 @@
copy = [[IFBookmarkList alloc] initWithTitle:[self title]
image:[self image]
- group:[self _group]];
+ group:[self group]];
count = [self numberOfChildren];
for (index = 0; index < count; ++index) {
@@ -154,7 +154,7 @@
[_title release];
_title = [title copy];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (NSImage *)image
@@ -190,7 +190,7 @@
[_image release];
_image = image;
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (IFBookmarkType)bookmarkType
@@ -227,11 +227,11 @@
- (void)removeChild:(IFBookmark *)bookmark
{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark _parent] == self);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == self);
[_list removeObject:bookmark];
[bookmark _setParent:nil];
- [[self _group] _bookmarkChildrenDidChange:self];
+ [[self group] _bookmarkChildrenDidChange:self];
}
@@ -240,12 +240,12 @@
[_list insertObject:bookmark atIndex:index];
[bookmark _setParent:self];
- [[self _group] _bookmarkChildrenDidChange:self];
+ [[self group] _bookmarkChildrenDidChange:self];
}
- (void)_setGroup:(IFBookmarkGroup *)group
{
- if (group == [self _group]) {
+ if (group == [self group]) {
return;
}
diff --git a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m b/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
index fbe17f2..1a79e5e 100644
--- a/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
+++ b/WebKit/Bookmarks.subproj/IFBookmarkSeparator.m
@@ -46,7 +46,7 @@
- (id)copyWithZone:(NSZone *)zone
{
- return [[IFBookmarkSeparator alloc] initWithGroup:[self _group]];
+ return [[IFBookmarkSeparator alloc] initWithGroup:[self group]];
}
@end
diff --git a/WebKit/Bookmarks.subproj/IFBookmark_Private.h b/WebKit/Bookmarks.subproj/IFBookmark_Private.h
index e4f97aa..8a94e99 100644
--- a/WebKit/Bookmarks.subproj/IFBookmark_Private.h
+++ b/WebKit/Bookmarks.subproj/IFBookmark_Private.h
@@ -19,10 +19,7 @@
- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
- (NSDictionary *)_dictionaryRepresentation;
-- (IFBookmark *)_parent;
- (void)_setParent:(IFBookmark *)parent;
-
-- (IFBookmarkGroup *)_group;
- (void)_setGroup:(IFBookmarkGroup *)group;
- (unsigned)_numberOfDescendants;
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.h b/WebKit/Bookmarks.subproj/WebBookmark.h
index 4f8a701..a32f1ed 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.h
+++ b/WebKit/Bookmarks.subproj/WebBookmark.h
@@ -50,4 +50,11 @@ typedef enum {
// Remove a bookmark from the list. Does nothing if bookmarkType is not IFBookmarkTypeList.
- (void)removeChild:(IFBookmark *)bookmark;
+// The parent of this bookmark, or nil if this is the top bookmark in a group
+- (IFBookmark *)parent;
+
+// The group that this bookmark belongs to.
+- (IFBookmarkGroup *)group;
+
+
@end
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index 2460d9b..47cdc5c 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -114,7 +114,7 @@
}
}
-- (IFBookmark *)_parent
+- (IFBookmark *)parent
{
return _parent;
}
@@ -126,7 +126,7 @@
_parent = parent;
}
-- (IFBookmarkGroup *)_group
+- (IFBookmarkGroup *)group
{
return _group;
}
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index 5bd7bc5..38e24e8 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -117,13 +117,13 @@
- (void)removeBookmark:(IFBookmark *)bookmark
{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark _group] == self);
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark _parent] != nil || bookmark == _topBookmark);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark group] == self);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] != nil || bookmark == _topBookmark);
if (bookmark == _topBookmark) {
[self _setTopBookmark:nil];
} else {
- [[bookmark _parent] removeChild:bookmark];
+ [[bookmark parent] removeChild:bookmark];
[bookmark _setGroup:nil];
}
}
@@ -151,7 +151,7 @@
{
IFBookmark *bookmark;
- WEBKIT_ASSERT_VALID_ARG (parent, [parent _group] == self);
+ WEBKIT_ASSERT_VALID_ARG (parent, [parent group] == self);
WEBKIT_ASSERT_VALID_ARG (parent, [parent bookmarkType] == IFBookmarkTypeList);
WEBKIT_ASSERT_VALID_ARG (newURLString, bookmarkType == IFBookmarkTypeLeaf || (newURLString == nil));
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
index 1ae3274..a90bb48 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkLeaf.m
@@ -79,7 +79,7 @@
return [[IFBookmarkLeaf alloc] initWithURLString:_URLString
title:[self title]
image:[self image]
- group:[self _group]];
+ group:[self group]];
}
- (NSString *)title
@@ -95,7 +95,7 @@
[_entry setTitle:title];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (NSImage *)image
@@ -107,7 +107,7 @@
{
[_entry setImage:image];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (IFBookmarkType)bookmarkType
@@ -129,7 +129,7 @@
[_URLString release];
_URLString = [URLString copy];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index f55d2b1..6c4dd7e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -127,7 +127,7 @@
copy = [[IFBookmarkList alloc] initWithTitle:[self title]
image:[self image]
- group:[self _group]];
+ group:[self group]];
count = [self numberOfChildren];
for (index = 0; index < count; ++index) {
@@ -154,7 +154,7 @@
[_title release];
_title = [title copy];
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (NSImage *)image
@@ -190,7 +190,7 @@
[_image release];
_image = image;
- [[self _group] _bookmarkDidChange:self];
+ [[self group] _bookmarkDidChange:self];
}
- (IFBookmarkType)bookmarkType
@@ -227,11 +227,11 @@
- (void)removeChild:(IFBookmark *)bookmark
{
- WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark _parent] == self);
+ WEBKIT_ASSERT_VALID_ARG (bookmark, [bookmark parent] == self);
[_list removeObject:bookmark];
[bookmark _setParent:nil];
- [[self _group] _bookmarkChildrenDidChange:self];
+ [[self group] _bookmarkChildrenDidChange:self];
}
@@ -240,12 +240,12 @@
[_list insertObject:bookmark atIndex:index];
[bookmark _setParent:self];
- [[self _group] _bookmarkChildrenDidChange:self];
+ [[self group] _bookmarkChildrenDidChange:self];
}
- (void)_setGroup:(IFBookmarkGroup *)group
{
- if (group == [self _group]) {
+ if (group == [self group]) {
return;
}
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
index e4f97aa..8a94e99 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
@@ -19,10 +19,7 @@
- (id)_initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(IFBookmarkGroup *)group;
- (NSDictionary *)_dictionaryRepresentation;
-- (IFBookmark *)_parent;
- (void)_setParent:(IFBookmark *)parent;
-
-- (IFBookmarkGroup *)_group;
- (void)_setGroup:(IFBookmarkGroup *)group;
- (unsigned)_numberOfDescendants;
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
index fbe17f2..1a79e5e 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
@@ -46,7 +46,7 @@
- (id)copyWithZone:(NSZone *)zone
{
- return [[IFBookmarkSeparator alloc] initWithGroup:[self _group]];
+ return [[IFBookmarkSeparator alloc] initWithGroup:[self group]];
}
@end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8c568a1..7a41c44 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,39 @@
+2002-05-28 John Sullivan <sullivan at apple.com>
+
+ Made -[IFBookmark group] and -[IFBookmark parent] public
+ methods, and renamed them to not use leading underscores,
+ as part of support for revealing a particular bookmark in
+ the Bookmarks window.
+
+ * Bookmarks.subproj/IFBookmark_Private.h:
+ removed _group and _parent.
+
+ * Bookmarks.subproj/IFBookmark.h:
+ added group and parent.
+
+ * Bookmarks.subproj/IFBookmark.m:
+ (-[IFBookmark parent]):
+ (-[IFBookmark group]):
+ * Bookmarks.subproj/IFBookmarkGroup.m:
+ (-[IFBookmarkGroup removeBookmark:]):
+ (-[IFBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:image:URLString:type:]):
+ * Bookmarks.subproj/IFBookmarkLeaf.m:
+ (-[IFBookmarkLeaf copyWithZone:]):
+ (-[IFBookmarkLeaf setTitle:]):
+ (-[IFBookmarkLeaf setImage:]):
+ (-[IFBookmarkLeaf setURLString:]):
+ * Bookmarks.subproj/IFBookmarkList.m:
+ (-[IFBookmarkList copyWithZone:]):
+ (-[IFBookmarkList setTitle:]):
+ (-[IFBookmarkList setImage:]):
+ (-[IFBookmarkList removeChild:]):
+ (-[IFBookmarkList insertChild:atIndex:]):
+ (-[IFBookmarkList _setGroup:]):
+ * Bookmarks.subproj/IFBookmarkSeparator.m:
+ (-[IFBookmarkSeparator copyWithZone:]):
+ Fixed up all references to _group and _parent to now refer to
+ group and parent.
+
2002-05-28 Richard Williamson <rjw at apple.com>
Backed out band-aid add to fixed malformed resources URLs.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8c568a1..7a41c44 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,39 @@
+2002-05-28 John Sullivan <sullivan at apple.com>
+
+ Made -[IFBookmark group] and -[IFBookmark parent] public
+ methods, and renamed them to not use leading underscores,
+ as part of support for revealing a particular bookmark in
+ the Bookmarks window.
+
+ * Bookmarks.subproj/IFBookmark_Private.h:
+ removed _group and _parent.
+
+ * Bookmarks.subproj/IFBookmark.h:
+ added group and parent.
+
+ * Bookmarks.subproj/IFBookmark.m:
+ (-[IFBookmark parent]):
+ (-[IFBookmark group]):
+ * Bookmarks.subproj/IFBookmarkGroup.m:
+ (-[IFBookmarkGroup removeBookmark:]):
+ (-[IFBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:image:URLString:type:]):
+ * Bookmarks.subproj/IFBookmarkLeaf.m:
+ (-[IFBookmarkLeaf copyWithZone:]):
+ (-[IFBookmarkLeaf setTitle:]):
+ (-[IFBookmarkLeaf setImage:]):
+ (-[IFBookmarkLeaf setURLString:]):
+ * Bookmarks.subproj/IFBookmarkList.m:
+ (-[IFBookmarkList copyWithZone:]):
+ (-[IFBookmarkList setTitle:]):
+ (-[IFBookmarkList setImage:]):
+ (-[IFBookmarkList removeChild:]):
+ (-[IFBookmarkList insertChild:atIndex:]):
+ (-[IFBookmarkList _setGroup:]):
+ * Bookmarks.subproj/IFBookmarkSeparator.m:
+ (-[IFBookmarkSeparator copyWithZone:]):
+ Fixed up all references to _group and _parent to now refer to
+ group and parent.
+
2002-05-28 Richard Williamson <rjw at apple.com>
Backed out band-aid add to fixed malformed resources URLs.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list