Revision: 18341
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18341&view=rev
Author: hofman
Date: 2011-12-29 11:48:42 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
rename some type select methods and category
Modified Paths:
--------------
trunk/bibdesk/BDSKMacroWindowController.m
trunk/bibdesk/BDSKOutlineView.h
trunk/bibdesk/BDSKOutlineView.m
trunk/bibdesk/BDSKTableView.h
trunk/bibdesk/BDSKTableView.m
trunk/bibdesk/BDSKTemplateDocument.m
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKTypeSelectHelper.h
trunk/bibdesk/BDSKTypeSelectHelper.m
trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m 2011-12-29 07:35:23 UTC (rev
18340)
+++ trunk/bibdesk/BDSKMacroWindowController.m 2011-12-29 11:48:42 UTC (rev
18341)
@@ -609,7 +609,7 @@
[tableView reloadData];
}
-- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)aTypeSelectHelper {
+- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)aTypeSelectHelper {
return [arrayController arrangedObjects];
}
@@ -736,7 +736,7 @@
}
- (void)keyDown:(NSEvent *)event{
- if ([typeSelectHelper processKeyDownEvent:event] == NO)
+ if ([typeSelectHelper handleEvent:event] == NO)
[super keyDown:event];
}
Modified: trunk/bibdesk/BDSKOutlineView.h
===================================================================
--- trunk/bibdesk/BDSKOutlineView.h 2011-12-29 07:35:23 UTC (rev 18340)
+++ trunk/bibdesk/BDSKOutlineView.h 2011-12-29 11:48:42 UTC (rev 18341)
@@ -44,7 +44,7 @@
- (void)outlineViewInsertNewline:(NSOutlineView *)anOutlineView;
-- (NSArray *)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)aTypeSelectHelper;
+- (NSArray *)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)aTypeSelectHelper;
- (void)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelper:(BDSKTypeSelectHelper *)aTypeSelectHelper
didFailToFindMatchForSearchString:(NSString *)searchString;
- (void)outlineView:(NSOutlineView *)anOutlineView
typeSelectHelper:(BDSKTypeSelectHelper *)aTypeSelectHelper
updateSearchString:(NSString *)searchString;
@@ -70,7 +70,7 @@
@end
-@interface BDSKOutlineView : NSOutlineView <BDSKTypeSelectDataSource> {
+@interface BDSKOutlineView : NSOutlineView <BDSKTypeSelectDelegate> {
BDSKTypeSelectHelper *typeSelectHelper;
NSString *fontNamePreferenceKey;
NSString *fontSizePreferenceKey;
Modified: trunk/bibdesk/BDSKOutlineView.m
===================================================================
--- trunk/bibdesk/BDSKOutlineView.m 2011-12-29 07:35:23 UTC (rev 18340)
+++ trunk/bibdesk/BDSKOutlineView.m 2011-12-29 11:48:42 UTC (rev 18341)
@@ -48,7 +48,7 @@
- (void)dealloc {
[self setFontNamePreferenceKey:nil]; // this will also stop observing
[self setFontSizePreferenceKey:nil];
- [typeSelectHelper setDataSource:nil];
+ [typeSelectHelper setDelegate:nil];
BDSKDESTROY(typeSelectHelper);
[super dealloc];
}
@@ -76,11 +76,11 @@
- (void)setTypeSelectHelper:(BDSKTypeSelectHelper *)newTypeSelectHelper {
if (typeSelectHelper != newTypeSelectHelper) {
- if ([typeSelectHelper dataSource] == self)
- [typeSelectHelper setDataSource:nil];
+ if ([typeSelectHelper delegate] == self)
+ [typeSelectHelper setDelegate:nil];
[typeSelectHelper release];
typeSelectHelper = [newTypeSelectHelper retain];
- [typeSelectHelper setDataSource:self];
+ [typeSelectHelper setDelegate:self];
}
}
@@ -226,7 +226,7 @@
[self scrollToBeginningOfDocument:self];
} else if (eventChar == NSEndFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
[self scrollToEndOfDocument:self];
- } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
+ } else if ([typeSelectHelper handleEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
}
@@ -510,9 +510,9 @@
#pragma mark SKTypeSelectHelper datasource protocol
-- (NSArray *)typeSelectHelperSelectionItems:(BDSKTypeSelectHelper
*)aTypeSelectHelper {
- if ([[self delegate]
respondsToSelector:@selector(outlineView:typeSelectHelperSelectionItems:)])
- return [[self delegate] outlineView:self
typeSelectHelperSelectionItems:aTypeSelectHelper];
+- (NSArray *)typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper
*)aTypeSelectHelper {
+ if ([[self delegate]
respondsToSelector:@selector(outlineView:typeSelectHelperSelectionStrings:)])
+ return [[self delegate] outlineView:self
typeSelectHelperSelectionStrings:aTypeSelectHelper];
return nil;
}
Modified: trunk/bibdesk/BDSKTableView.h
===================================================================
--- trunk/bibdesk/BDSKTableView.h 2011-12-29 07:35:23 UTC (rev 18340)
+++ trunk/bibdesk/BDSKTableView.h 2011-12-29 11:48:42 UTC (rev 18341)
@@ -46,7 +46,7 @@
- (void)tableViewInsertSpace:(NSTableView *)aTableView;
- (void)tableViewInsertShiftSpace:(NSTableView *)aTableView;
-- (NSArray *)tableView:(NSTableView *)aTableView
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)aTypeSelectHelper;
+- (NSArray *)tableView:(NSTableView *)aTableView
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)aTypeSelectHelper;
- (void)tableView:(NSTableView *)aTableView
typeSelectHelper:(BDSKTypeSelectHelper *)aTypeSelectHelper
didFailToFindMatchForSearchString:(NSString *)searchString;
- (void)tableView:(NSTableView *)aTableView
typeSelectHelper:(BDSKTypeSelectHelper *)aTypeSelectHelper
updateSearchString:(NSString *)searchString;
@@ -72,7 +72,7 @@
@end
-@interface BDSKTableView : NSTableView <BDSKTypeSelectDataSource> {
+@interface BDSKTableView : NSTableView <BDSKTypeSelectDelegate> {
BDSKTypeSelectHelper *typeSelectHelper;
NSString *fontNamePreferenceKey;
NSString *fontSizePreferenceKey;
Modified: trunk/bibdesk/BDSKTableView.m
===================================================================
--- trunk/bibdesk/BDSKTableView.m 2011-12-29 07:35:23 UTC (rev 18340)
+++ trunk/bibdesk/BDSKTableView.m 2011-12-29 11:48:42 UTC (rev 18341)
@@ -50,7 +50,7 @@
- (void)dealloc {
[self setFontNamePreferenceKey:nil]; // this will also stop observing
[self setFontSizePreferenceKey:nil];
- [typeSelectHelper setDataSource:nil];
+ [typeSelectHelper setDelegate:nil];
BDSKDESTROY(typeSelectHelper);
[super dealloc];
}
@@ -63,14 +63,14 @@
- (void)setTypeSelectHelper:(BDSKTypeSelectHelper *)newTypeSelectHelper {
if (typeSelectHelper != newTypeSelectHelper) {
- if ([typeSelectHelper dataSource] == self) {
+ if ([typeSelectHelper delegate] == self) {
if ([[self class] shouldQueueTypeSelectHelper])
[[typeSelectHelper class]
cancelPreviousPerformRequestsWithTarget:typeSelectHelper
selector:@selector(rebuildTypeSelectSearchCache) object:nil];
- [typeSelectHelper setDataSource:nil];
+ [typeSelectHelper setDelegate:nil];
}
[typeSelectHelper release];
typeSelectHelper = [newTypeSelectHelper retain];
- [typeSelectHelper setDataSource:self];
+ [typeSelectHelper setDelegate:self];
}
}
@@ -217,7 +217,7 @@
[self scrollToBeginningOfDocument:self];
} else if (eventChar == NSEndFunctionKey && (modifierFlags &
~NSFunctionKeyMask) == 0) {
[self scrollToEndOfDocument:self];
- } else if ([typeSelectHelper processKeyDownEvent:theEvent] == NO) {
+ } else if ([typeSelectHelper handleEvent:theEvent] == NO) {
[super keyDown:theEvent];
}
}
@@ -524,9 +524,9 @@
#pragma mark SKTypeSelectHelper datasource protocol
-- (NSArray *)typeSelectHelperSelectionItems:(BDSKTypeSelectHelper
*)aTypeSelectHelper {
- if ([[self delegate]
respondsToSelector:@selector(tableView:typeSelectHelperSelectionItems:)])
- return [[self delegate] tableView:self
typeSelectHelperSelectionItems:aTypeSelectHelper];
+- (NSArray *)typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper
*)aTypeSelectHelper {
+ if ([[self delegate]
respondsToSelector:@selector(tableView:typeSelectHelperSelectionStrings:)])
+ return [[self delegate] tableView:self
typeSelectHelperSelectionStrings:aTypeSelectHelper];
return nil;
}
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2011-12-29 07:35:23 UTC (rev
18340)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2011-12-29 11:48:42 UTC (rev
18341)
@@ -1229,7 +1229,7 @@
return NO;
}
-- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)aTypeSelectHelper {
+- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)aTypeSelectHelper {
return [[self typeTemplates] valueForKey:@"pubType"];
}
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2011-12-29 07:35:23 UTC (rev
18340)
+++ trunk/bibdesk/BDSKTextImportController.m 2011-12-29 11:48:42 UTC (rev
18341)
@@ -1473,7 +1473,7 @@
[statusLine setStringValue:[NSString stringWithFormat:@"%@ \"%@\"",
NSLocalizedString(@"No field:", @"Status message"), [searchString fieldName]]];
}
-- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)typeSelectHelper{
+- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)typeSelectHelper{
return fields;
}
Modified: trunk/bibdesk/BDSKTypeSelectHelper.h
===================================================================
--- trunk/bibdesk/BDSKTypeSelectHelper.h 2011-12-29 07:35:23 UTC (rev
18340)
+++ trunk/bibdesk/BDSKTypeSelectHelper.h 2011-12-29 11:48:42 UTC (rev
18341)
@@ -44,9 +44,9 @@
@class BDSKTypeSelectHelper;
-@protocol BDSKTypeSelectDataSource <NSObject>
+@protocol BDSKTypeSelectDelegate <NSObject>
-- (NSArray *)typeSelectHelperSelectionItems:(BDSKTypeSelectHelper
*)typeSelectHelper;
+- (NSArray *)typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper
*)typeSelectHelper;
- (NSUInteger)typeSelectHelperCurrentlySelectedIndex:(BDSKTypeSelectHelper
*)typeSelectHelper;
- (void)typeSelectHelper:(BDSKTypeSelectHelper *)typeSelectHelper
selectItemAtIndex:(NSUInteger)itemIndex;
@@ -59,7 +59,7 @@
@interface BDSKTypeSelectHelper : NSObject <NSTextDelegate> {
- id<BDSKTypeSelectDataSource> dataSource;
+ id<BDSKTypeSelectDelegate> delegate;
BOOL cycleResults;
BOOL matchPrefix;
@@ -69,8 +69,8 @@
BOOL processing;
}
-- (id<BDSKTypeSelectDataSource>)dataSource;
-- (void)setDataSource:(id<BDSKTypeSelectDataSource>)anObject;
+- (id<BDSKTypeSelectDelegate>)delegate;
+- (void)setDelegate:(id<BDSKTypeSelectDelegate>)anObject;
- (BOOL)cyclesSimilarResults;
- (void)setCyclesSimilarResults:(BOOL)newValue;
@@ -85,7 +85,7 @@
- (void)rebuildTypeSelectSearchCache;
-- (BOOL)processKeyDownEvent:(NSEvent *)keyEvent;
+- (BOOL)handleEvent:(NSEvent *)keyEvent;
- (void)searchWithEvent:(NSEvent *)keyEvent;
- (void)repeatSearch;
- (void)cancelSearch;
Modified: trunk/bibdesk/BDSKTypeSelectHelper.m
===================================================================
--- trunk/bibdesk/BDSKTypeSelectHelper.m 2011-12-29 07:35:23 UTC (rev
18340)
+++ trunk/bibdesk/BDSKTypeSelectHelper.m 2011-12-29 11:48:42 UTC (rev
18341)
@@ -84,7 +84,7 @@
- (void)dealloc;
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
- [self setDataSource:nil];
+ [self setDelegate:nil];
[self stopTimer];
BDSKDESTROY(searchString);
BDSKDESTROY(searchCache);
@@ -93,17 +93,17 @@
#pragma mark Accessors
-- (id)dataSource;
+- (id)delegate;
{
- return dataSource;
+ return delegate;
}
-- (void)setDataSource:(id)newDataSource;
+- (void)setDelegate:(id)newDelegate;
{
- if (dataSource == newDataSource)
+ if (delegate == newDelegate)
return;
- dataSource = newDataSource;
+ delegate = newDelegate;
[self rebuildTypeSelectSearchCache];
}
@@ -153,7 +153,7 @@
// this will be actually rebuild when we need it
}
-- (BOOL)processKeyDownEvent:(NSEvent *)keyEvent;
+- (BOOL)handleEvent:(NSEvent *)keyEvent;
{
if ([self isSearchEvent:keyEvent]) {
[self searchWithEvent:keyEvent];
@@ -186,8 +186,8 @@
[fieldEditor interpretKeyEvents:[NSArray arrayWithObject:keyEvent]];
[self setSearchString:[fieldEditor string]];
- if ([dataSource
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
- [dataSource typeSelectHelper:self updateSearchString:searchString];
+ if ([delegate
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
+ [delegate typeSelectHelper:self updateSearchString:searchString];
// Reset the timer if it hasn't expired yet
[self startTimer];
@@ -201,8 +201,8 @@
{
[self searchWithStickyMatch:NO];
- if ([searchString length] && [dataSource
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
- [dataSource typeSelectHelper:self updateSearchString:searchString];
+ if ([searchString length] && [delegate
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
+ [delegate typeSelectHelper:self updateSearchString:searchString];
[self startTimer];
@@ -260,7 +260,7 @@
- (NSArray *)searchCache;
{
if (searchCache == nil)
- searchCache = [[dataSource typeSelectHelperSelectionItems:self]
retain];
+ searchCache = [[delegate typeSelectHelperSelectionStrings:self]
retain];
return searchCache;
}
@@ -279,8 +279,8 @@
- (void)typeSelectSearchTimeout:(id)sender;
{
- if([dataSource
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
- [dataSource typeSelectHelper:self updateSearchString:nil];
+ if([delegate
respondsToSelector:@selector(typeSelectHelper:updateSearchString:)])
+ [delegate typeSelectHelper:self updateSearchString:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self stopTimer];
processing = NO;
@@ -316,13 +316,13 @@
- (void)searchWithStickyMatch:(BOOL)sticky;
{
- BDSKPRECONDITION(dataSource != nil);
+ BDSKPRECONDITION(delegate != nil);
if ([searchString length]) {
NSUInteger selectedIndex, startIndex, foundIndex;
if (cycleResults) {
- selectedIndex = [dataSource
typeSelectHelperCurrentlySelectedIndex:self];
+ selectedIndex = [delegate
typeSelectHelperCurrentlySelectedIndex:self];
if (selectedIndex >= [[self searchCache] count])
selectedIndex = NSNotFound;
} else {
@@ -336,11 +336,11 @@
foundIndex = [self indexOfMatchedItemAfterIndex:startIndex];
if (foundIndex == NSNotFound) {
- if ([dataSource
respondsToSelector:@selector(typeSelectHelper:didFailToFindMatchForSearchString:)])
- [dataSource typeSelectHelper:self
didFailToFindMatchForSearchString:searchString];
+ if ([delegate
respondsToSelector:@selector(typeSelectHelper:didFailToFindMatchForSearchString:)])
+ [delegate typeSelectHelper:self
didFailToFindMatchForSearchString:searchString];
} else if (foundIndex != selectedIndex) {
// Avoid flashing a selection all over the place while you're
still typing the thing you have selected
- [dataSource typeSelectHelper:self selectItemAtIndex:foundIndex];
+ [delegate typeSelectHelper:self selectItemAtIndex:foundIndex];
}
}
}
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2011-12-29 07:35:23 UTC (rev
18340)
+++ trunk/bibdesk/BibDocument_DataSource.m 2011-12-29 11:48:42 UTC (rev
18341)
@@ -820,7 +820,7 @@
}
// This is where we build the list of possible items which the user can select
by typing the first few letters. You should return an array of NSStrings.
-- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)typeSelectHelper{
+- (NSArray *)tableView:(NSTableView *)tv
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)typeSelectHelper{
if([tv isEqual:tableView]){
// Some users seem to expect that the currently sorted table column is
used for typeahead;
@@ -1428,7 +1428,7 @@
}
// This is where we build the list of possible items which the user can select
by typing the first few letters. You should return an array of NSStrings.
-- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionItems:(BDSKTypeSelectHelper *)typeSelectHelper{
+- (NSArray *)outlineView:(NSOutlineView *)ov
typeSelectHelperSelectionStrings:(BDSKTypeSelectHelper *)typeSelectHelper{
if ([ov isEqual:groupOutlineView]) {
NSInteger i;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
