Revision: 4235
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4235&view=rev
Author:   hofman
Date:     2008-07-17 11:36:11 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
small code improvements

Modified Paths:
--------------
    trunk/SkimNotes/SKNAgentListener.m
    trunk/SkimNotes/skimnotes.m

Modified: trunk/SkimNotes/SKNAgentListener.m
===================================================================
--- trunk/SkimNotes/SKNAgentListener.m  2008-07-17 09:23:43 UTC (rev 4234)
+++ trunk/SkimNotes/SKNAgentListener.m  2008-07-17 11:36:11 UTC (rev 4235)
@@ -84,13 +84,10 @@
     
     if ([extension caseInsensitiveCompare:@"skim"] == NSOrderedSame) {
         NSArray *files = [[NSFileManager defaultManager] subpathsAtPath:path];
-        NSString *filename = @"notes.skim";
+        NSString *filename = [[[path lastPathComponent] 
stringByDeletingPathExtension] stringByAppendingPathExtension:@"skim"];
         if ([files containsObject:filename] == NO) {
-            filename = [[[path lastPathComponent] 
stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
-            if ([files containsObject:filename] == NO) {
-                NSUInteger idx = [[files 
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:@"skim"];
-                filename = idx == NSNotFound ? nil : [files objectAtIndex:idx];
-            }
+            NSUInteger idx = [[files 
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:@"skim"];
+            filename = idx == NSNotFound ? nil : [files objectAtIndex:idx];
         }
         if (filename)
             filePath = [path stringByAppendingPathComponent:filename];

Modified: trunk/SkimNotes/skimnotes.m
===================================================================
--- trunk/SkimNotes/skimnotes.m 2008-07-17 09:23:43 UTC (rev 4234)
+++ trunk/SkimNotes/skimnotes.m 2008-07-17 11:36:11 UTC (rev 4235)
@@ -218,7 +218,7 @@
                 NSString *extension = [notesPath pathExtension];
                 if ([extension caseInsensitiveCompare:RTF_EXTENSION] == 
NSOrderedSame)
                     format = SKNFormatRTF;
-                else if ([[notesPath pathExtension] 
caseInsensitiveCompare:TXT_EXTENSION] == NSOrderedSame || [[notesPath 
pathExtension] caseInsensitiveCompare:TEXT_EXTENSION] == NSOrderedSame)
+                else if ([extension caseInsensitiveCompare:TXT_EXTENSION] == 
NSOrderedSame || [extension caseInsensitiveCompare:TEXT_EXTENSION] == 
NSOrderedSame)
                     format = SKNFormatText;
                 else
                     format = SKNFormatSkim;


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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to