Commit 6e48f21c authored by darin's avatar darin
Browse files

WebKit:

	Removed the now-unnecessary iconURL from bookmarks and history.

        * Bookmarks.subproj/WebBookmark.h:
        * Bookmarks.subproj/WebBookmark.m:
        * Bookmarks.subproj/WebBookmarkGroup.h:
        * Bookmarks.subproj/WebBookmarkGroup.m:
        * Bookmarks.subproj/WebBookmarkLeaf.h:
        * Bookmarks.subproj/WebBookmarkLeaf.m:
        * History.subproj/WebHistory.h:
        * History.subproj/WebHistory.m:
        * History.subproj/WebHistoryItem.h:
        * History.subproj/WebHistoryItem.m:
        * History.subproj/WebHistoryPrivate.h:
        * History.subproj/WebHistoryPrivate.m:
	Removed iconURL instance variables, methods, and parameters.

WebBrowser:

	Update users of bookmark or history APIs from WebKit that no longer take an iconURL.

        * BookmarksController.m:
        (-[BookmarksController _blessOrCreateFavoritesRoot]):
        * BookmarksViewController.m:
        (-[BookmarksViewController newItemWithTitle:URLString:type:positionIgnoresSelection:]):
        * LocationChangeHandler.m:
        (-[LocationChangeHandler receivedPageTitle:forDataSource:]):
	Removed iconURL parameters.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4f74e34e
......@@ -33,9 +33,6 @@ typedef enum {
- (NSImage *)icon;
- (NSURL *)iconURL;
- (void)setIconURL:(NSURL *)iconURL;
// The type of bookmark
- (WebBookmarkType)bookmarkType;
......
......@@ -71,17 +71,6 @@ - (NSImage *)icon
return nil;
}
- (NSURL *)iconURL
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
return nil;
}
- (void)setIconURL:(NSURL *)iconURL
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
}
- (WebBookmarkType)bookmarkType
{
NSRequestConcreteImplementation(self, _cmd, [self class]);
......
......@@ -42,12 +42,10 @@
- (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
ofBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType;
- (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType;
......
......@@ -140,14 +140,12 @@ - (void)removeBookmark:(WebBookmark *)bookmark
- (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType
{
return [self insertNewBookmarkAtIndex:[parent numberOfChildren]
ofBookmark:parent
withTitle:newTitle
iconURL:iconURL
URLString:newURLString
type:bookmarkType];
}
......@@ -155,7 +153,6 @@ - (WebBookmark *)addNewBookmarkToBookmark:(WebBookmark *)parent
- (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
ofBookmark:(WebBookmark *)parent
withTitle:(NSString *)newTitle
iconURL:(NSURL *)iconURL
URLString:(NSString *)newURLString
type:(WebBookmarkType)bookmarkType
{
......@@ -168,7 +165,6 @@ - (WebBookmark *)insertNewBookmarkAtIndex:(unsigned)index
if (bookmarkType == WebBookmarkTypeLeaf) {
bookmark = [[WebBookmarkLeaf alloc] initWithURLString:newURLString
title:newTitle
iconURL:iconURL
group:self];
} else if (bookmarkType == WebBookmarkTypeSeparator) {
bookmark = [[WebBookmarkSeparator alloc] initWithGroup:self];
......
......@@ -17,7 +17,6 @@
- (id)initWithURLString:(NSString *)URLString
title:(NSString *)title
iconURL:(NSURL *)iconURL
group:(WebBookmarkGroup *)group;
@end
......@@ -29,7 +29,6 @@ - (id)init
- (id)initWithURLString:(NSString *)URLString
title:(NSString *)title
iconURL:(NSURL *)iconURL
group:(WebBookmarkGroup *)group;
{
[self init];
......@@ -38,7 +37,6 @@ - (id)initWithURLString:(NSString *)URLString
// just hang onto the string separately and don't bother creating
// an NSURL object for the WebHistoryItem.
[self setTitle:title];
[self setIconURL:iconURL];
[self setURLString:URLString];
[self _setGroup:group];
......@@ -86,7 +84,6 @@ - (id)copyWithZone:(NSZone *)zone
{
return [[WebBookmarkLeaf allocWithZone:zone] initWithURLString:_URLString
title:[self title]
iconURL:[self iconURL]
group:[self group]];
}
......@@ -112,17 +109,6 @@ - (NSImage *)icon
return [_entry icon];
}
- (NSURL *)iconURL
{
return [_entry iconURL];
}
- (void)setIconURL:(NSURL *)iconURL
{
[_entry setIconURL:iconURL];
[[self group] _bookmarkDidChange:self];
}
- (WebBookmarkType)bookmarkType
{
return WebBookmarkTypeLeaf;
......
2002-09-04 Darin Adler <darin@apple.com>
Removed the now-unnecessary iconURL from bookmarks and history.
* Bookmarks.subproj/WebBookmark.h:
* Bookmarks.subproj/WebBookmark.m:
* Bookmarks.subproj/WebBookmarkGroup.h:
* Bookmarks.subproj/WebBookmarkGroup.m:
* Bookmarks.subproj/WebBookmarkLeaf.h:
* Bookmarks.subproj/WebBookmarkLeaf.m:
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.h:
* History.subproj/WebHistoryItem.m:
* History.subproj/WebHistoryPrivate.h:
* History.subproj/WebHistoryPrivate.m:
Removed iconURL instance variables, methods, and parameters.
2002-09-04 Darin Adler <darin@apple.com>
Did some minor plugin cleanup, mostly to make sure we don't
......
2002-09-04 Darin Adler <darin@apple.com>
Removed the now-unnecessary iconURL from bookmarks and history.
* Bookmarks.subproj/WebBookmark.h:
* Bookmarks.subproj/WebBookmark.m:
* Bookmarks.subproj/WebBookmarkGroup.h:
* Bookmarks.subproj/WebBookmarkGroup.m:
* Bookmarks.subproj/WebBookmarkLeaf.h:
* Bookmarks.subproj/WebBookmarkLeaf.m:
* History.subproj/WebHistory.h:
* History.subproj/WebHistory.m:
* History.subproj/WebHistoryItem.h:
* History.subproj/WebHistoryItem.m:
* History.subproj/WebHistoryPrivate.h:
* History.subproj/WebHistoryPrivate.m:
Removed iconURL instance variables, methods, and parameters.
2002-09-04 Darin Adler <darin@apple.com>
Did some minor plugin cleanup, mostly to make sure we don't
......
......@@ -35,7 +35,6 @@ extern NSString *WebHistoryEntriesChangedNotification;
- (void)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString;
// retrieving contents for date-based presentation
......
......@@ -88,13 +88,11 @@ - (void)addEntries:(NSArray *)newEntries
- (void)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString
{
if ([_historyPrivate updateURL:newURLString
title:newTitle
displayTitle:newDisplayTitle
iconURL:iconURL
forURL:oldURLString] != nil) {
// Consider passing changed entry as parameter to notification
[self sendEntriesChangedNotification];
......
......@@ -8,7 +8,6 @@
@interface WebHistoryItem : NSObject
{
NSURL *_URL;
NSURL *_iconURL;
NSString *_target;
NSString *_parent;
NSString *_title;
......@@ -30,7 +29,6 @@
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict;
- (NSURL *)URL;
- (NSURL *)iconURL;
- (NSString *)target;
- (NSString *)parent;
- (NSString *)title;
......@@ -39,7 +37,6 @@
- (NSCalendarDate *)lastVisitedDate;
- (void)setURL:(NSURL *)URL;
- (void)setIconURL:(NSURL *)iconURL;
- (void)setTarget:(NSString *)target;
- (void)setParent:(NSString *)parent;
- (void)setTitle:(NSString *)title;
......
......@@ -68,7 +68,6 @@ - (void)dealloc
[_title release];
[_displayTitle release];
[_icon release];
[_iconURL release];
[_lastVisitedDate release];
[super dealloc];
......@@ -79,11 +78,6 @@ -(NSURL *)URL
return _URL;
}
- (NSURL *)iconURL
{
return _iconURL;
}
-(NSString *)target
{
return _target;
......@@ -134,20 +128,11 @@ -(void)setURL:(NSURL *)URL
[self _retainIconInDatabase:NO];
[_URL release];
_URL = [URL retain];
[self _retainIconInDatabase:YES];
}
}
- (void)setIconURL:(NSURL *)iconURL
{
if (iconURL != _iconURL) {
[_iconURL release];
_iconURL = [iconURL retain];
_loadedIcon = NO;
[self _retainIconInDatabase:YES];
}
}
-(void)setTitle:(NSString *)title
{
if (title != _title) {
......@@ -252,30 +237,20 @@ - (NSDictionary *)dictionaryRepresentation
[dict setObject: [NSString stringWithFormat:@"%lf", [_lastVisitedDate timeIntervalSinceReferenceDate]]
forKey: @"lastVisitedDate"];
}
if (_iconURL != nil) {
[dict setObject: [_iconURL absoluteString] forKey: @"iconURL"];
}
return dict;
}
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict
{
NSString *storedURLString, *iconURLString;
[super init];
storedURLString = [dict objectForKey: @""];
NSString *storedURLString = [dict objectForKey: @""];
if (storedURLString != nil) {
_URL = [[NSURL _web_URLWithString:storedURLString] retain];
[self _retainIconInDatabase:YES];
}
iconURLString = [dict objectForKey:@"iconURL"];
if(iconURLString){
_iconURL = [[NSURL _web_URLWithString:iconURLString] retain];
}
_title = [[dict objectForKey: @"title"] copy];
_displayTitle = [[dict objectForKey: @"displayTitle"] copy];
_lastVisitedDate = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate:
......
......@@ -28,7 +28,6 @@
- (WebHistoryItem *)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString;
- (NSArray *)orderedLastVisitedDays;
......
......@@ -225,7 +225,6 @@ - (void)addEntries:(NSArray *)newEntries
- (WebHistoryItem *)updateURL:(NSString *)newURLString
title:(NSString *)newTitle
displayTitle:(NSString *)newDisplayTitle
iconURL:(NSURL *)iconURL
forURL:(NSString *)oldURLString
{
WebHistoryItem *entry;
......@@ -249,10 +248,6 @@ - (WebHistoryItem *)updateURL:(NSString *)newURLString
[entry setDisplayTitle:newDisplayTitle];
}
if(iconURL != nil){
[entry setIconURL:iconURL];
}
return entry;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment