Revision: 6723
http://skim-app.svn.sourceforge.net/skim-app/?rev=6723&view=rev
Author: hofman
Date: 2010-08-22 11:38:04 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
use more common convenience methods for paths with replaced path extension
Modified Paths:
--------------
trunk/NSString_SKExtensions.h
trunk/NSString_SKExtensions.m
trunk/NSURL_SKExtensions.h
trunk/NSURL_SKExtensions.m
trunk/SKConversionProgressController.m
trunk/SKDocumentController.m
trunk/SKMainDocument.m
trunk/SKNotesDocument.m
trunk/SKPDFSynchronizerServer.m
Modified: trunk/NSString_SKExtensions.h
===================================================================
--- trunk/NSString_SKExtensions.h 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/NSString_SKExtensions.h 2010-08-22 11:38:04 UTC (rev 6723)
@@ -49,7 +49,7 @@
- (NSString *)stringByAppendingEllipsis;
-- (NSString *)stringByReplacingPathExtension:(NSString *)ext;
+- (NSString *)lastPathComponentReplacingPathExtension:(NSString *)ext;
- (NSString *)stringByBackslashEscapingCharactersFromSet:(NSCharacterSet
*)charSet;
- (NSString *)stringByEscapingShellChars;
Modified: trunk/NSString_SKExtensions.m
===================================================================
--- trunk/NSString_SKExtensions.m 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/NSString_SKExtensions.m 2010-08-22 11:38:04 UTC (rev 6723)
@@ -252,9 +252,9 @@
return [self stringByAppendingFormat:@"%C", ELLIPSIS_CHARACTER];
}
-- (NSString *)stringByReplacingPathExtension:(NSString *)ext;
+- (NSString *)lastPathComponentReplacingPathExtension:(NSString *)ext;
{
- return [[self stringByDeletingPathExtension]
stringByAppendingPathExtension:ext];
+ return [[[self lastPathComponent] stringByDeletingPathExtension]
stringByAppendingPathExtension:ext];
}
- (NSString *)stringByBackslashEscapingCharactersFromSet:(NSCharacterSet
*)charSet {
Modified: trunk/NSURL_SKExtensions.h
===================================================================
--- trunk/NSURL_SKExtensions.h 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/NSURL_SKExtensions.h 2010-08-22 11:38:04 UTC (rev 6723)
@@ -44,6 +44,8 @@
+ (NSURL *)URLFromPasteboardAnyType:(NSPasteboard *)pasteboard;
+- (NSString *)pathReplacingPathExtension:(NSString *)ext;
+
- (NSAttributedString *)icon;
- (NSAttributedString *)smallIcon;
Modified: trunk/NSURL_SKExtensions.m
===================================================================
--- trunk/NSURL_SKExtensions.m 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/NSURL_SKExtensions.m 2010-08-22 11:38:04 UTC (rev 6723)
@@ -85,6 +85,10 @@
return theURL;
}
+- (NSString *)pathReplacingPathExtension:(NSString *)ext {
+ return [[[self path] stringByDeletingPathExtension]
stringByAppendingPathExtension:ext];
+}
+
- (NSAttributedString *)icon {
NSAttributedString *attrString = nil;
Modified: trunk/SKConversionProgressController.m
===================================================================
--- trunk/SKConversionProgressController.m 2010-08-22 09:30:33 UTC (rev
6722)
+++ trunk/SKConversionProgressController.m 2010-08-22 11:38:04 UTC (rev
6723)
@@ -38,6 +38,7 @@
#import "SKConversionProgressController.h"
#import "NSString_SKExtensions.h"
+#import "NSURL_SKExtensions.h"
#import "NSTask_SKExtensions.h"
#import "NSFileManager_SKExtensions.h"
#import "NSInvocation_SKExtensions.h"
@@ -323,7 +324,7 @@
NSString *commandName = [commandPath lastPathComponent];
NSString *tmpDir = SKUniqueTemporaryDirectory();
BOOL outputPS = [commandName isEqualToString:@"dvips"];
- NSString *outFile = [tmpDir stringByAppendingPathComponent:[[dviFile
lastPathComponent] stringByReplacingPathExtension:outputPS ? @"ps" : @"pdf"]];
+ NSString *outFile = [tmpDir stringByAppendingPathComponent:[dviFile
lastPathComponentReplacingPathExtension:outputPS ? @"ps" : @"pdf"]];
NSArray *arguments = [commandName isEqualToString:@"dvipdf"] ? [NSArray
arrayWithObjects:dviFile, outFile, nil] : [NSArray arrayWithObjects:@"-o",
outFile, dviFile, nil];
BOOL success = NO;
Modified: trunk/SKDocumentController.m
===================================================================
--- trunk/SKDocumentController.m 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/SKDocumentController.m 2010-08-22 11:38:04 UTC (rev 6723)
@@ -40,7 +40,6 @@
#import "NSDocument_SKExtensions.h"
#import "SKMainDocument.h"
#import "SKDownloadController.h"
-#import "NSString_SKExtensions.h"
#import "NSURL_SKExtensions.h"
#import "SKStringConstants.h"
#import "SKApplicationController.h"
@@ -313,7 +312,7 @@
if (SKIsNotesDocumentType(type)) {
NSAppleEventDescriptor *event = [[NSAppleEventManager
sharedAppleEventManager] currentAppleEvent];
if ([event eventID] == kAEOpenDocuments && [event
descriptorForKeyword:keyAESearchText]) {
- NSString *pdfFile = [[absoluteURL path]
stringByReplacingPathExtension:@"pdf"];
+ NSString *pdfFile = [absoluteURL
pathReplacingPathExtension:@"pdf"];
BOOL isDir;
if ([[NSFileManager defaultManager] fileExistsAtPath:pdfFile
isDirectory:&isDir] && isDir == NO)
absoluteURL = [NSURL fileURLWithPath:pdfFile];
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/SKMainDocument.m 2010-08-22 11:38:04 UTC (rev 6723)
@@ -81,6 +81,7 @@
#import "NSInvocation_SKExtensions.h"
#import "SKSyncPreferences.h"
#import "NSScreen_SKExtensions.h"
+#import "NSURL_SKExtensions.h"
#define BUNDLE_DATA_FILENAME @"data"
#define PRESENTATION_OPTIONS_KEY
@"net_sourceforge_skim-app_presentation_options"
@@ -344,7 +345,7 @@
BOOL saveNotesOK = NO;
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKAutoSaveSkimNotesKey]) {
- NSString *notesPath = [[absoluteURL path]
stringByReplacingPathExtension:@"skim"];
+ NSString *notesPath = [absoluteURL pathReplacingPathExtension:@"skim"];
BOOL fileExists = [fm fileExistsAtPath:notesPath];
if (fileExists && (saveOperation == NSSaveAsOperation || saveOperation
== NSSaveToOperation)) {
@@ -744,7 +745,7 @@
}
}
if (pdfDoc) {
- NSString *path = [[absoluteURL path]
stringByReplacingPathExtension:@"skim"];
+ NSString *path = [absoluteURL
pathReplacingPathExtension:@"skim"];
if ([[NSFileManager defaultManager]
fileExistsAtPath:path]) {
NSInteger readOption = [[NSUserDefaults
standardUserDefaults] integerForKey:SKReadMissingNotesFromSkimFileOptionKey];
if (readOption == NSAlertOtherReturn) {
@@ -901,7 +902,7 @@
}
[oPanel beginSheetForDirectory:[path stringByDeletingLastPathComponent]
- file:[[path lastPathComponent]
stringByReplacingPathExtension:@"skim"]
+ file:[path
lastPathComponentReplacingPathExtension:@"skim"]
types:[NSArray arrayWithObjects:@"skim", @"fdf",
nil]
modalForWindow:[self windowForSheet]
modalDelegate:self
@@ -1050,7 +1051,7 @@
[sp setRequiredFileType:@"tgz"];
[sp setCanCreateDirectories:YES];
[sp beginSheetForDirectory:nil
- file:[[path lastPathComponent]
stringByReplacingPathExtension:@"tgz"]
+ file:[path
lastPathComponentReplacingPathExtension:@"tgz"]
modalForWindow:[self windowForSheet]
modalDelegate:self
didEndSelector:@selector(archiveSavePanelDidEnd:returnCode:contextInfo:)
@@ -1132,7 +1133,7 @@
NSString *path = [[self fileURL] path];
if (path && [[NSFileManager defaultManager] fileExistsAtPath:path] &&
[self isDocumentEdited] == NO) {
NSString *tmpDir = SKUniqueChewableItemsDirectory();
- NSString *tmpFile = [tmpDir stringByAppendingPathComponent:[[[[self
fileURL] path] lastPathComponent] stringByReplacingPathExtension:@"tgz"]];
+ NSString *tmpFile = [tmpDir stringByAppendingPathComponent:[[[self
fileURL] path] lastPathComponentReplacingPathExtension:@"tgz"]];
if ([self saveArchiveToFile:tmpFile] == NO || [self
emailAttachmentFile:tmpFile] == NO)
NSBeep();
} else {
@@ -1181,7 +1182,7 @@
[sp setRequiredFileType:@"dmg"];
[sp setCanCreateDirectories:YES];
[sp beginSheetForDirectory:nil
- file:[[path lastPathComponent]
stringByReplacingPathExtension:@"dmg"]
+ file:[path
lastPathComponentReplacingPathExtension:@"dmg"]
modalForWindow:[self windowForSheet]
modalDelegate:self
didEndSelector:@selector(diskImageSavePanelDidEnd:returnCode:contextInfo:)
@@ -1196,7 +1197,7 @@
NSString *path = [[self fileURL] path];
if (path && [[NSFileManager defaultManager] fileExistsAtPath:path] &&
[self isDocumentEdited] == NO) {
NSString *tmpDir = SKUniqueChewableItemsDirectory();
- NSString *tmpFile = [tmpDir stringByAppendingPathComponent:[[[[self
fileURL] path] lastPathComponent] stringByReplacingPathExtension:@"dmg"]];
+ NSString *tmpFile = [tmpDir stringByAppendingPathComponent:[[[self
fileURL] path] lastPathComponentReplacingPathExtension:@"dmg"]];
[self saveDiskImageToFile:tmpFile email:YES];
} else {
NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"You
must save this file first", @"Alert text when trying to create archive for
unsaved document") defaultButton:nil alternateButton:nil otherButton:nil
informativeTextWithFormat:NSLocalizedString(@"The document has unsaved changes,
or has not previously been saved to disk.", @"Informative text in alert
dialog")];
@@ -2069,7 +2070,7 @@
source = [NSURL fileURLWithPath:source];
if ([source isKindOfClass:[NSURL class]] == NO)
source = [self fileURL];
- [[self synchronizer] findPageAndLocationForLine:[location index]
inFile:[[source path] stringByReplacingPathExtension:@"tex"] options:options];
+ [[self synchronizer] findPageAndLocationForLine:[location index]
inFile:[source pathReplacingPathExtension:@"tex"] options:options];
} else {
PDFSelection *selection = [PDFSelection
selectionWithSpecifier:[[command arguments] objectForKey:@"To"]];
if ([selection hasCharacters]) {
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/SKNotesDocument.m 2010-08-22 11:38:04 UTC (rev 6723)
@@ -42,7 +42,7 @@
#import "SKTemplateParser.h"
#import "SKApplicationController.h"
#import "NSValue_SKExtensions.h"
-#import "NSString_SKExtensions.h"
+#import "NSURL_SKExtensions.h"
#import "SKTypeSelectHelper.h"
#import <SkimNotes/SkimNotes.h>
#import "SKNotesPage.h"
@@ -236,7 +236,7 @@
} else if (SKIsNotesRTFDocumentType(typeName)) {
data = [self notesRTFData];
} else if (SKIsNotesFDFDocumentType(typeName)) {
- NSString *filename = [[[self fileURL] path]
stringByReplacingPathExtension:@"pdf"];
+ NSString *filename = [[self fileURL]
pathReplacingPathExtension:@"pdf"];
if ([[NSFileManager defaultManager] fileExistsAtPath:filename])
filename = [filename lastPathComponent];
else
@@ -375,7 +375,7 @@
#pragma mark Actions
- (IBAction)openPDF:(id)sender {
- NSString *path = [[[self fileURL] path]
stringByReplacingPathExtension:@"pdf"];
+ NSString *path = [[self fileURL] pathReplacingPathExtension:@"pdf"];
NSError *error = nil;
if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {
// resolve symlinks and aliases
@@ -747,7 +747,7 @@
if ([[[[[self windowControllers] objectAtIndex:0] window] toolbar]
customizationPaletteIsRunning])
return NO;
else if ([[toolbarItem itemIdentifier]
isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
- return [[NSFileManager defaultManager] fileExistsAtPath:[[[self
fileURL] path] stringByReplacingPathExtension:@"pdf"]];
+ return [[NSFileManager defaultManager] fileExistsAtPath:[[self
fileURL] pathReplacingPathExtension:@"pdf"]];
return YES;
}
Modified: trunk/SKPDFSynchronizerServer.m
===================================================================
--- trunk/SKPDFSynchronizerServer.m 2010-08-22 09:30:33 UTC (rev 6722)
+++ trunk/SKPDFSynchronizerServer.m 2010-08-22 11:38:04 UTC (rev 6723)
@@ -44,7 +44,6 @@
#import "NSScanner_SKExtensions.h"
#import <CoreFoundation/CoreFoundation.h>
#import "NSFileManager_SKExtensions.h"
-#import "NSString_SKExtensions.h"
#import "NSMapTable_SKExtensions.h"
#define PDFSYNC_TO_PDF(coord) ((CGFloat)coord / 65536.0)
@@ -596,7 +595,7 @@
} else {
rv = [self loadSynctexFileForFile:theFileName];
if (rv == NO) {
- theSyncFileName = [theFileName
stringByReplacingPathExtension:SKPDFSynchronizerPdfsyncExtension];
+ theSyncFileName = [[theFileName stringByDeletingPathExtension]
stringByAppendingPathExtension:SKPDFSynchronizerPdfsyncExtension];
if ([fileManager fileExistsAtPath:theSyncFileName])
rv = [self loadPdfsyncFile:theSyncFileName];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit