Revision: 18429
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18429&view=rev
Author: hofman
Date: 2012-01-19 13:43:13 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
convenience accessor for URL from URL sheet controller
Modified Paths:
--------------
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKURLSheetController.h
trunk/bibdesk/BDSKURLSheetController.m
trunk/bibdesk/BibDocument_Actions.m
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2012-01-19 13:22:17 UTC (rev 18428)
+++ trunk/bibdesk/BDSKEditor.m 2012-01-19 13:43:13 UTC (rev 18429)
@@ -660,10 +660,7 @@
// remove the sheet in case we get an alert
[[urlController window] orderOut:nil];
- NSString *aURLString = [urlController urlString];
- if ([NSString isEmptyString:aURLString])
- return;
- NSURL *aURL = [NSURL
URLWithStringByNormalizingPercentEscapes:aURLString];
+ NSURL *aURL = [urlController url];
if (aURL == nil)
return;
NSUInteger anIndex = (NSUInteger)contextInfo;
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2012-01-19 13:22:17 UTC (rev
18428)
+++ trunk/bibdesk/BDSKTextImportController.m 2012-01-19 13:43:13 UTC (rev
18429)
@@ -845,10 +845,8 @@
[self setShowingWebView:YES];
- NSString *urlString = [urlSheetController urlString];
+ NSURL *url = [urlSheetController url];
- NSURL *url = [NSURL URLWithString:urlString];
-
if(url == nil){
[[urlSheetController window] orderOut:nil];
NSAlert *alert = [NSAlert
alertWithMessageText:NSLocalizedString(@"Error", @"Message in alert dialog when
error occurs")
Modified: trunk/bibdesk/BDSKURLSheetController.h
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.h 2012-01-19 13:22:17 UTC (rev
18428)
+++ trunk/bibdesk/BDSKURLSheetController.h 2012-01-19 13:43:13 UTC (rev
18429)
@@ -46,6 +46,8 @@
- (NSString *)urlString;
- (void)setUrlString:(NSString *)newUrlString;
+- (NSURL *)url;
+
- (void)openBookmark:(id)sender;
@end
Modified: trunk/bibdesk/BDSKURLSheetController.m
===================================================================
--- trunk/bibdesk/BDSKURLSheetController.m 2012-01-19 13:22:17 UTC (rev
18428)
+++ trunk/bibdesk/BDSKURLSheetController.m 2012-01-19 13:43:13 UTC (rev
18429)
@@ -38,6 +38,8 @@
#import "BDSKURLSheetController.h"
#import "NSWindowController_BDSKExtensions.h"
+#import "NSURL_BDSKExtensions.h"
+#import "NSString_BDSKExtensions.h"
@implementation BDSKURLSheetController
@@ -58,6 +60,11 @@
[urlField setStringValue:newUrlString ?: @""];
}
+- (NSURL *)url {
+ NSString *urlString = [self urlString];
+ return [NSString isEmptyString:urlString] ? nil : [NSURL
URLWithStringByNormalizingPercentEscapes:urlString];
+}
+
- (void)openBookmark:(id)sender {
[self setUrlString:[sender representedObject]];
}
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2012-01-19 13:22:17 UTC (rev 18428)
+++ trunk/bibdesk/BibDocument_Actions.m 2012-01-19 13:43:13 UTC (rev 18429)
@@ -1151,10 +1151,7 @@
return;
}
- NSString *aURLString = [urlController urlString];
- if ([NSString isEmptyString:aURLString])
- return;
- NSURL *aURL = [NSURL
URLWithStringByNormalizingPercentEscapes:aURLString];
+ NSURL *aURL = [urlController url];
if (aURL == nil)
return;
NSUInteger anIndex = (NSUInteger)contextInfo;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
