[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:47:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 958ae8e6a41370384028272ae6fd90cdd4d6d0d6
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 8 21:40:58 2002 +0000
WebKit:
- WebKit part of fix for 3069150 -- eliminate "separator"
feature from Bookmarks
* Bookmarks.subproj/WebBookmarkSeparator.h: Removed.
* Bookmarks.subproj/WebBookmarkSeparator.m: Removed.
Removed class
* Bookmarks.subproj/WebBookmark.h:
* Bookmarks.subproj/WebBookmark.m:
(+[WebBookmark bookmarkOfType:]):
(+[WebBookmark bookmarkFromDictionaryRepresentation:withGroup:]):
* Bookmarks.subproj/WebBookmarkGroup.m:
(-[WebBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:URLString:type:]):
* Bookmarks.subproj/WebBookmarkList.m:
(-[WebBookmarkList initFromDictionaryRepresentation:withGroup:]):
* Bookmarks.subproj/WebBookmarkPrivate.h:
* English.lproj/StringsNotToBeLocalized.txt:
Removed all references to class.
* WebKit.pbproj/project.pbxproj: Updated for removed files.
WebBrowser:
- WebBrowser part of fix for 3069150 -- eliminate "separator"
feature from Bookmarks
- fixed 3070014 -- Library view needs "New Folder" button
- fixed 3050660 -- the 5 editing items in the Bookmarks menu
before the bookmarks should be moved or made a submenu
- fixed 3069152 -- eliminate the ability to create new empty
bookmarks
* OutlineViewPlus.h:
* OutlineViewPlus.m:
(-[OutlineViewPlus keyDown:]):
Add delegate handling of keyDown events like that in TableViewPlus so I could
remove the ugly hack of out-of-sight buttons handling Delete and Return as
keyboard shortcuts.
* BookmarksController.m:
(-[BookmarksController imageForBookmark:]):
Remove bookmark separator handling.
(-[BookmarksController addMenuItemForBookmark:toMenu:]):
Remove bookmark separator handling.
* BookmarksViewController.h:
* BookmarksViewController.m:
(-[BookmarksViewController removeSelectedBookmarks]): removed sender parameter; no
longer used as IBAction.
(-[BookmarksViewController handleKeyDown:inSourceColumn:]): new bottleneck method
for handling Return and Delete (and forward delete) keys pressed in either table
view or outline view.
(-[BookmarksViewController tableView:keyDown:]):
now calls handleKeyDown:inSourceColumn:
(-[BookmarksViewController outlineView:objectValueForTableColumn:byItem:]):
Remove bookmark separator handling.
(-[BookmarksViewController outlineView:shouldEditTableColumn:item:]):
Remove bookmark separator handling.
(-[BookmarksViewController outlineView:keyDown:]): new delegate method,
calls handleKeyDown:inSourceColumn:
(-[BookmarksViewController delete:]):
No sender parameter for removeSelectedBookmarks anymore
(-[BookmarksViewController validateUserInterfaceItem:]):
Removed case for removeSelectedBookmarks since it's never auto-validated now
* BrowserWebBookmarkExtras.m:
(+[WebBookmark writeBookmarks:toPasteboard:withOwner:]):
Remove bookmark separator handling.
* English.lproj/Browser.nib: added New Folder button; removed ugly hack of
out-of-sight buttons handling Delete and Return; put table view and outline
view in boxes to handle New Folder button and future changes.
* English.lproj/Localizable.strings: update localizations
* English.lproj/MainMenu.nib: removed editing items from Bookmarks menu
* FavoriteButton.m:
(-[FavoriteButton setBookmark:]): Remove bookmark separator handling.
(-[FavoriteButton menu]): Remove bookmark separator handling.
* FavoritesBar.m:
(-[FavoritesBar performDragOperation:]): Remove bookmark separator handling.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2278 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.h b/WebKit/Bookmarks.subproj/WebBookmark.h
index caf348e..031f60a 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.h
+++ b/WebKit/Bookmarks.subproj/WebBookmark.h
@@ -13,7 +13,6 @@
typedef enum {
WebBookmarkTypeLeaf,
WebBookmarkTypeList,
- WebBookmarkTypeSeparator,
} WebBookmarkType;
@interface WebBookmark : NSObject <NSCopying> {
diff --git a/WebKit/Bookmarks.subproj/WebBookmark.m b/WebKit/Bookmarks.subproj/WebBookmark.m
index fb6ad36..cfb5e5b 100644
--- a/WebKit/Bookmarks.subproj/WebBookmark.m
+++ b/WebKit/Bookmarks.subproj/WebBookmark.m
@@ -12,7 +12,6 @@
#import <WebKit/WebBookmarkGroupPrivate.h>
#import <WebKit/WebBookmarkLeaf.h>
#import <WebKit/WebBookmarkList.h>
-#import <WebKit/WebBookmarkSeparator.h>
#import <WebFoundation/WebAssertions.h>
// to get NSRequestConcreteImplementation
@@ -148,8 +147,6 @@ static unsigned _highestUsedID = 0;
return [[[WebBookmarkList alloc] init] autorelease];
} else if (type == WebBookmarkTypeLeaf) {
return [[[WebBookmarkLeaf alloc] init] autorelease];
- } else if (type == WebBookmarkTypeSeparator) {
- return [[[WebBookmarkSeparator alloc] init] autorelease];
}
return nil;
@@ -167,8 +164,6 @@ static unsigned _highestUsedID = 0;
class = [WebBookmarkList class];
} else if ([typeString isEqualToString:WebBookmarkTypeLeafValue]) {
class = [WebBookmarkLeaf class];
- } else if ([typeString isEqualToString:WebBookmarkTypeSeparatorValue]) {
- class = [WebBookmarkSeparator class];
}
if (class) {
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
index da24946..c7cfa78 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkGroup.m
@@ -11,7 +11,6 @@
#import <WebKit/WebBookmarkPrivate.h>
#import <WebKit/WebBookmarkList.h>
#import <WebKit/WebBookmarkLeaf.h>
-#import <WebKit/WebBookmarkSeparator.h>
#import <WebKit/WebKitLogging.h>
@interface WebBookmarkGroup (WebForwardDeclarations)
@@ -166,8 +165,6 @@
bookmark = [[WebBookmarkLeaf alloc] initWithURLString:newURLString
title:newTitle
group:self];
- } else if (bookmarkType == WebBookmarkTypeSeparator) {
- bookmark = [[WebBookmarkSeparator alloc] initWithGroup:self];
} else {
ASSERT(bookmarkType == WebBookmarkTypeList);
bookmark = [[WebBookmarkList alloc] initWithTitle:newTitle
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkList.m b/WebKit/Bookmarks.subproj/WebBookmarkList.m
index dfc9e68..e825497 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkList.m
+++ b/WebKit/Bookmarks.subproj/WebBookmarkList.m
@@ -8,7 +8,6 @@
#import <WebKit/WebBookmarkList.h>
#import <WebKit/WebBookmarkLeaf.h>
-#import <WebKit/WebBookmarkSeparator.h>
#import <WebKit/WebBookmarkPrivate.h>
#import <WebKit/WebBookmarkGroupPrivate.h>
#import <WebFoundation/WebAssertions.h>
@@ -32,29 +31,26 @@
- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
{
- NSArray *storedChildren;
- WebBookmark *child;
- unsigned index, count;
-
ASSERT_ARG(dict, dict != nil);
[super init];
[self _setGroup:group];
- // FIXME: doesn't restore images
_title = [[dict objectForKey:TitleKey] retain];
_list = [[NSMutableArray alloc] init];
- storedChildren = [dict objectForKey:ChildrenKey];
+ NSArray *storedChildren = [dict objectForKey:ChildrenKey];
if (storedChildren != nil) {
- count = [storedChildren count];
- for (index = 0; index < count; ++index) {
- child = [WebBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:index]
+ unsigned count = [storedChildren count];
+ unsigned indexRead;
+ unsigned indexWritten = 0;
+ for (indexRead = 0; indexRead < count; ++indexRead) {
+ WebBookmark *child = [WebBookmark bookmarkFromDictionaryRepresentation:[storedChildren objectAtIndex:indexRead]
withGroup:group];
if (child != nil) {
- [self insertChild:child atIndex:index];
+ [self insertChild:child atIndex:indexWritten++];
}
}
}
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
index 8956cf3..66145dd 100644
--- a/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
+++ b/WebKit/Bookmarks.subproj/WebBookmarkPrivate.h
@@ -10,9 +10,8 @@
#import <WebKit/WebBookmark.h>
#define WebBookmarkTypeKey @"WebBookmarkType"
-#define WebBookmarkTypeLeafValue @"WebBookmarkTypeLeaf"
-#define WebBookmarkTypeListValue @"WebBookmarkTypeList"
-#define WebBookmarkTypeSeparatorValue @"WebBookmarkTypeSeparator"
+#define WebBookmarkTypeLeafValue @"WebBookmarkTypeLeaf"
+#define WebBookmarkTypeListValue @"WebBookmarkTypeList"
@interface WebBookmark(WebPrivate)
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h
deleted file mode 100644
index fadfa2e..0000000
--- a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// WebBookmarkSeparator.h
-// WebKit
-//
-// Created by John Sullivan on Mon May 20 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import <WebKit/WebBookmark.h>
-
-
- at interface WebBookmarkSeparator : WebBookmark {
-}
-
-- (id)initWithGroup:(WebBookmarkGroup *)group;
-
- at end
diff --git a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m b/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
deleted file mode 100644
index aeccf71..0000000
--- a/WebKit/Bookmarks.subproj/WebBookmarkSeparator.m
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// WebBookmarkSeparator.m
-// WebKit
-//
-// Created by John Sullivan on Mon May 20 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
-
-#import "WebBookmarkSeparator.h"
-
-#import "WebBookmarkPrivate.h"
-#import <WebFoundation/WebAssertions.h>
-
-
- at implementation WebBookmarkSeparator
-
-- (id)initWithGroup:(WebBookmarkGroup *)group
-{
- [super init];
- [self _setGroup:group];
-
- return self;
-}
-
-- (id)initFromDictionaryRepresentation:(NSDictionary *)dict withGroup:(WebBookmarkGroup *)group
-{
- if (![[dict objectForKey:WebBookmarkTypeKey] isEqualToString:WebBookmarkTypeSeparatorValue]) {
- ERROR("Can't initialize Bookmark separator from non-separator type");
- return nil;
- }
-
- return [self initWithGroup:group];
-}
-
-- (NSDictionary *)dictionaryRepresentation
-{
- return [NSDictionary dictionaryWithObject:WebBookmarkTypeSeparatorValue forKey:WebBookmarkTypeKey];
-}
-
-- (WebBookmarkType)bookmarkType
-{
- return WebBookmarkTypeSeparator;
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- return [[WebBookmarkSeparator alloc] initWithGroup:[self group]];
-}
-
-- (NSString *)title
-{
- return nil;
-}
-
-- (NSImage *)icon
-{
- return nil;
-}
-
- at end
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 737bafe..d8a6510 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2002-10-08 John Sullivan <sullivan at apple.com>
+
+ - WebKit part of fix for 3069150 -- eliminate "separator"
+ feature from Bookmarks
+
+ * Bookmarks.subproj/WebBookmarkSeparator.h: Removed.
+ * Bookmarks.subproj/WebBookmarkSeparator.m: Removed.
+ Removed class
+
+ * Bookmarks.subproj/WebBookmark.h:
+ * Bookmarks.subproj/WebBookmark.m:
+ (+[WebBookmark bookmarkOfType:]):
+ (+[WebBookmark bookmarkFromDictionaryRepresentation:withGroup:]):
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ (-[WebBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:URLString:type:]):
+ * Bookmarks.subproj/WebBookmarkList.m:
+ (-[WebBookmarkList initFromDictionaryRepresentation:withGroup:]):
+ * Bookmarks.subproj/WebBookmarkPrivate.h:
+ * English.lproj/StringsNotToBeLocalized.txt:
+ Removed all references to class.
+
+ * WebKit.pbproj/project.pbxproj: Updated for removed files.
+
2002-10-08 Richard Williamson <rjw at apple.com>
Fixes to the DOM API.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 737bafe..d8a6510 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,26 @@
+2002-10-08 John Sullivan <sullivan at apple.com>
+
+ - WebKit part of fix for 3069150 -- eliminate "separator"
+ feature from Bookmarks
+
+ * Bookmarks.subproj/WebBookmarkSeparator.h: Removed.
+ * Bookmarks.subproj/WebBookmarkSeparator.m: Removed.
+ Removed class
+
+ * Bookmarks.subproj/WebBookmark.h:
+ * Bookmarks.subproj/WebBookmark.m:
+ (+[WebBookmark bookmarkOfType:]):
+ (+[WebBookmark bookmarkFromDictionaryRepresentation:withGroup:]):
+ * Bookmarks.subproj/WebBookmarkGroup.m:
+ (-[WebBookmarkGroup insertNewBookmarkAtIndex:ofBookmark:withTitle:URLString:type:]):
+ * Bookmarks.subproj/WebBookmarkList.m:
+ (-[WebBookmarkList initFromDictionaryRepresentation:withGroup:]):
+ * Bookmarks.subproj/WebBookmarkPrivate.h:
+ * English.lproj/StringsNotToBeLocalized.txt:
+ Removed all references to class.
+
+ * WebKit.pbproj/project.pbxproj: Updated for removed files.
+
2002-10-08 Richard Williamson <rjw at apple.com>
Fixes to the DOM API.
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index ba971e1..50c8a89 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -54,7 +54,6 @@
"WebBookmarkType"
"WebBookmarkTypeLeaf"
"WebBookmarkTypeList"
-"WebBookmarkTypeSeparator"
"WebCurrentFrameState"
"WebElementFrame"
"WebElementImage"
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 88ca6e5..c6ac478 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -229,7 +229,6 @@
F5F717280288493C018635CA,
F5F71748028855C5018635CA,
F5F7174E02885C5B018635CA,
- F5C81E4302994EA401C1A525,
F8CA15B9029A39D901000122,
F8CA15BB029A39D901000122,
F8CA15C2029A3E0D01000122,
@@ -333,7 +332,6 @@
F5F717270288493C018635CA,
F5F717290288493C018635CA,
F5F7174F02885C5B018635CA,
- F5C81E4402994EA401C1A525,
F8CA15BA029A39D901000122,
F8CA15BC029A39D901000122,
F83DCC74029D09F301000131,
@@ -1719,8 +1717,6 @@
F506521E027F557E01C1A526,
F506521F027F557E01C1A526,
F5065220027F557E01C1A526,
- F5C81E4102994EA401C1A525,
- F5C81E4202994EA401C1A525,
);
isa = PBXGroup;
name = Bookmarks;
@@ -2663,30 +2659,6 @@
settings = {
};
};
- F5C81E4102994EA401C1A525 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebBookmarkSeparator.h;
- refType = 4;
- };
- F5C81E4202994EA401C1A525 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebBookmarkSeparator.m;
- refType = 4;
- };
- F5C81E4302994EA401C1A525 = {
- fileRef = F5C81E4102994EA401C1A525;
- isa = PBXBuildFile;
- settings = {
- };
- };
- F5C81E4402994EA401C1A525 = {
- fileRef = F5C81E4202994EA401C1A525;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5D538E802441F2601A80181 = {
fileEncoding = 4;
isa = PBXFileReference;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list