Revision: 11392
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=11392&view=rev
Author: amaxwell
Date: 2007-10-25 14:29:49 -0700 (Thu, 25 Oct 2007)
Log Message:
-----------
compilation fixes
Modified Paths:
--------------
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.h
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.m
branches/TRY_ARM_FILE_INTERFACE/bibdesk/BibItem.m
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.h
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.h 2007-10-25 20:25:26 UTC
(rev 11391)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.h 2007-10-25 21:29:49 UTC
(rev 11392)
@@ -62,23 +62,28 @@
BDAlias *alias;
const FSRef *fileRef;
NSString *relativePath;
+ id delegate;
}
- (id)initWithBase64String:(NSString *)base64String delegate:(id)aDelegate;
- (id)initWithPath:(NSString *)aPath delegate:(id)aDelegate;
- (id)initWithURL:(NSURL *)aURL delegate:(id)aDelegate;
-- (const FSRef *)fsRef;
+- (const FSRef *)fileRef;
- (NSURL *)fileURL;
- (NSString *)path;
- (NSString *)base64StringRelativeToPath:(NSString *)newBasePath;
+- (NSData *)aliasDataRelativeToPath:(NSString *)newBasePath;
- (NSString *)relativePath;
- (void)setRelativePath:(NSString *)newRelativePath;
- (void)update;
+- (void)setDelegate:(id)aDelegate;
+- (id)delegate;
+
@end
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.m 2007-10-25 20:25:26 UTC
(rev 11391)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BDSKFile.m 2007-10-25 21:29:49 UTC
(rev 11392)
@@ -529,7 +529,7 @@
}
FSRef *newRef = (FSRef *)NSZoneMalloc([self zone], sizeof(FSRef));
if (newRef) {
- bcopy(fsRef, newRef, sizeof(FSRef));
+ bcopy(newFileRef, newRef, sizeof(FSRef));
fileRef = newRef;
}
}
Modified: branches/TRY_ARM_FILE_INTERFACE/bibdesk/BibItem.m
===================================================================
--- branches/TRY_ARM_FILE_INTERFACE/bibdesk/BibItem.m 2007-10-25 20:25:26 UTC
(rev 11391)
+++ branches/TRY_ARM_FILE_INTERFACE/bibdesk/BibItem.m 2007-10-25 21:29:49 UTC
(rev 11392)
@@ -1684,7 +1684,7 @@
}
}
if (!drop) {
- value = [self filesAsBibTeXFragmentRelativeToPath:[self
baseURLForAliasFile:nil]];
+ value = [self filesAsBibTeXFragmentRelativeToPath:[self
basePathForAliasFile:nil]];
if (value) [s appendString:value];
}
[knownKeys release];
@@ -2424,7 +2424,11 @@
#pragma mark -
#pragma mark URL handling
-- (NSString *)baseURLForAliasFile:(BDSKAliasFile *)file {
+- (NSString *)basePathForAliasFile:(BDSKAliasFile *)file {
+ return [[[[self owner] fileURL] path] stringByDeletingLastPathComponent];
+}
+
+- (NSURL *)baseURLForAliasFile:(BDSKAliasFile *)file {
NSString *basePath = [[[[self owner] fileURL] path]
stringByDeletingLastPathComponent];
return basePath ? [NSURL fileURLWithPath:basePath] : nil;
}
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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
