Converts to modern Objective-C syntax.

joehsieh · May 23, 2015 · e13cd36 · e13cd36
1 parent 3d80b8f
commit e13cd36
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 39 deletions.
diff --git a/ExternalLibraries/NSString+RelativePath/NSString+RelativePath.m b/ExternalLibraries/NSString+RelativePath/NSString+RelativePath.m
@@ -26,7 +26,7 @@ - (NSString *)absolutePathFromBaseDirPath:(NSString *)baseDirPath
     NSMutableArray *pathComponents2 = [NSMutableArray arrayWithArray:[theBasePath pathComponents]];
 
     while ([pathComponents1 count] > 0) {        
-        NSString *topComponent1 = [pathComponents1 objectAtIndex:0];
+        NSString *topComponent1 = pathComponents1[0];
         [pathComponents1 removeObjectAtIndex:0];
 
         if ([topComponent1 isEqualToString:@".."]) {
@@ -55,8 +55,8 @@ - (NSString *)relativePathFromBaseDirPath:(NSString *)baseDirPath
 
     // Remove same path components
     while ([pathComponents1 count] > 0 && [pathComponents2 count] > 0) {
-        NSString *topComponent1 = [pathComponents1 objectAtIndex:0];
-        NSString *topComponent2 = [pathComponents2 objectAtIndex:0];
+        NSString *topComponent1 = pathComponents1[0];
+        NSString *topComponent2 = pathComponents2[0];
         if (![topComponent1 isEqualToString:topComponent2]) {
             break;
         }

diff --git a/Localizer/JHDocument.m b/Localizer/JHDocument.m
@@ -52,7 +52,7 @@ - (void)dealloc
 	[super dealloc];
 }
 
-- (id)init
+- (instancetype)init
 {
 	self = [super init];
 	if (self) {
@@ -154,9 +154,9 @@ - (IBAction)addScanFolderAndFiles:(id)sender
 	[openPanel setCanChooseFiles:YES];
 	[openPanel setCanChooseDirectories:YES];
 	[openPanel setAllowsMultipleSelection:YES];
-	[openPanel setAllowedFileTypes:[NSArray arrayWithObjects:@"h", @"m",@"mm", nil]];
+	[openPanel setAllowedFileTypes:@[@"h", @"m",@"mm"]];
 
-	NSWindow *window = [[[self windowControllers] objectAtIndex:0] window];
+	NSWindow *window = [[self windowControllers][0] window];
 	[openPanel beginSheetModalForWindow:window completionHandler:^(NSInteger result) {
 		if (result == NSOKButton) {
 			NSMutableArray *pathsToAdd = [NSMutableArray array];
@@ -195,7 +195,7 @@ - (IBAction)scan:(id)sender
 			[message appendFormat:@"%d. %@\n\n",count, addedMatchInfo.key];
 		}
 		NSAlert *alert = [NSAlert alertWithMessageText:message defaultButton:NSLocalizedString(@"OK", @"") alternateButton:nil otherButton:nil informativeTextWithFormat:@""];
-		NSWindow *window = [[[self windowControllers] objectAtIndex:0] window];
+		NSWindow *window = [[self windowControllers][0] window];
 		[alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:nil contextInfo:nil];
 	}
 	// merge src info set and localizable info set
@@ -212,7 +212,7 @@ - (IBAction)translate:(id)sender
 		translatedWindowController.translatedWindowControllerDelegate = self;
 		[self addWindowController:translatedWindowController];
 	}
-	NSWindow *window = [[[self windowControllers] objectAtIndex:0] window];
+	NSWindow *window = [[self windowControllers][0] window];
 	[NSApp beginSheet:translatedWindowController.window modalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:nil];
 }
 
@@ -226,7 +226,7 @@ - (IBAction)filterWithSearchType:(id)sender
 - (IBAction)performFindPanelAction:(id)sender
 {
 	if ([sender tag] == 1) {
-		NSWindow *window = [[[self windowControllers] objectAtIndex:0] window];
+		NSWindow *window = [[self windowControllers][0] window];
 		[window makeFirstResponder:searchField];
 	}
 }
@@ -313,7 +313,7 @@ - (void)windowController:(JHTranslatedWindowController *)inWindowController didM
 				if ([localizableInfoSet containsObject:obj]) {
 					NSUInteger index = [result indexOfObject:obj];
 
-					JHMatchInfo *matchInfo = [result objectAtIndex:index];
+					JHMatchInfo *matchInfo = result[index];
 					obj.filePath = matchInfo.filePath;
 
 					if ([obj.key isEqualToString:obj.translateString]) {
@@ -323,7 +323,7 @@ - (void)windowController:(JHTranslatedWindowController *)inWindowController didM
 					if ([obj.filePath isEqualToString:@"Not exist"]) {
 						obj.state = notExist;
 					}
-					[result replaceObjectAtIndex:index withObject:obj];
+					result[index] = obj;
 				}
 				else {
 					obj.state = notExist;

diff --git a/Localizer/JHFilePathTableViewController.m b/Localizer/JHFilePathTableViewController.m
@@ -83,7 +83,7 @@ - (void)dealloc
     [super dealloc];
 }
 
-- (id)init
+- (instancetype)init
 {
     self = [super init];
     if (self) {
@@ -97,7 +97,7 @@ - (id)init
 - (void)awakeFromNib
 {
 	// Register to accept filename drag/drop
-	[self.view registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]];
+	[self.view registerForDraggedTypes:@[NSFilenamesPboardType]];
     NSTableView *tableView = (NSTableView *)self.view;
     NSTableColumn *column = [tableView tableColumnWithIdentifier:@"path"];
     [column setEditable:NO];
@@ -129,7 +129,7 @@ - (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColu
 
 - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row
 {
-    return [[filePathArray  objectAtIndex:row] path];
+    return [filePathArray[row] path];
 }
 
 - (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation
@@ -172,8 +172,8 @@ - (void)tableView:(NSTableView *)inTableView didDeleteScanFoldersWithIndexes:(NS
 - (void)tableView:(NSTableView *)inTableView didOpenScanFoldersWithIndexes:(NSIndexSet *)inIndexes
 {
     [inIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *stop) {
-        NSDictionary* errors = [NSDictionary dictionary];
-		NSString *scriptString = [NSString stringWithFormat:@"tell application \"Finder\" \n activate\n open (\"%@\" as POSIX file) \n end tell",[filePathArray objectAtIndex:idx]];
+        NSDictionary* errors = @{};
+		NSString *scriptString = [NSString stringWithFormat:@"tell application \"Finder\" \n activate\n open (\"%@\" as POSIX file) \n end tell",filePathArray[idx]];
         NSAppleScript* appleScript = [[NSAppleScript alloc] initWithSource:scriptString];
         [appleScript executeAndReturnError:&errors];
         [appleScript release];

diff --git a/Localizer/JHLocalizableSettingParser.m b/Localizer/JHLocalizableSettingParser.m
@@ -49,7 +49,7 @@ - (void)parse:(NSString *)fileContent scanFolderPathArray:(out NSArray **)outArr
 - (NSArray *)scanFolderPathsFromString:(NSString *)inFolderPaths
 {
     if (![inFolderPaths length]) {
-        return [NSArray array];
+        return @[];
     }
     NSMutableArray *result = [NSMutableArray array];
     for (NSString *folderPath in [inFolderPaths componentsSeparatedByString:@","]) {
@@ -133,7 +133,7 @@ - (NSSet *)makeMatchRecord:(NSString *)belongFilePath bodyString:(NSString *)inB
         //matchInfo 是以 key 為比對方式，key 相同就存在，在除了 key 以外的資訊有可能不同，所以採用 replace 的方式置換
         if ([result containsObject:matchInfo]) {
             NSUInteger index = [result indexOfObject:matchInfo];
-            [result replaceObjectAtIndex:index withObject:matchInfo];
+            result[index] = matchInfo;
         }
         else {
             [result addObject:matchInfo];

diff --git a/Localizer/JHMatchInfo.h b/Localizer/JHMatchInfo.h
@@ -25,11 +25,11 @@
 
 #import <Foundation/Foundation.h>
 
-typedef enum {
+typedef NS_ENUM(unsigned int, MatchInfoRecordState) {
     notExist, // not exist
     unTranslated, // untranslatedString
     translated // translatedString
-} MatchInfoRecordState;
+};
 
 @interface JHMatchInfo : NSObject<NSCopying, NSCoding, NSPasteboardWriting, NSPasteboardReading>
 {
@@ -45,7 +45,6 @@ typedef enum {
 @property (retain, nonatomic) NSString *comment;
 @property (retain, nonatomic) NSString *filePath;
 
-- (MatchInfoRecordState)state;
-- (void)setState:(MatchInfoRecordState)state;
+@property (NS_NONATOMIC_IOSONLY) MatchInfoRecordState state;
 
 @end
diff --git a/Localizer/JHMatchInfo.m b/Localizer/JHMatchInfo.m
@@ -136,7 +136,7 @@ - (void)encodeWithCoder:(NSCoder *)coder
     [coder encodeObject:self.filePath forKey:@"kFilePath"];
 }
 
-- (id)initWithCoder:(NSCoder *)aDecoder
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
 {
     self = [super init];
     if (self) {

diff --git a/Localizer/JHMatchInfoRecordColorTransformer.m b/Localizer/JHMatchInfoRecordColorTransformer.m
@@ -58,13 +58,13 @@ - (id)transformedValue:(id)value
 - (id)reverseTransformedValue:(id)value
 {
     if (value == [NSColor blueColor]) {
-        return [NSNumber numberWithInt:unTranslated];
+        return @(unTranslated);
     }
     else if(value == [NSColor redColor]) {
-        return [NSNumber numberWithInt:notExist];
+        return @(notExist);
     }
     else if(value == [NSColor blackColor]) {
-        return [NSNumber numberWithInt:translated];
+        return @(translated);
     }
     return nil;
 }

diff --git a/Localizer/JHMatchInfoTableView.m b/Localizer/JHMatchInfoTableView.m
@@ -27,7 +27,7 @@ a copy of this software and associated documentation files (the
 
 @implementation JHMatchInfoTableView
 
-- (id)initWithCoder:(NSCoder *)aDecoder
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
 {
     self = [super initWithCoder:aDecoder];
 
@@ -43,7 +43,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder
         [self setAllowsMultipleSelection: YES];
 
         for (int i = 0; i < [self.tableColumns count] ; i++) {
-            [[self.tableColumns objectAtIndex:i] setHeaderCell:[[[NSTableHeaderCell alloc] initTextCell:[headerNameArray objectAtIndex:i]] autorelease]];
+            [(self.tableColumns)[i] setHeaderCell:[[[NSTableHeaderCell alloc] initTextCell:headerNameArray[i]] autorelease]];
         }
     }
     return self;

diff --git a/Localizer/JHMatchInfoTableViewController.h b/Localizer/JHMatchInfoTableViewController.h
@@ -42,10 +42,10 @@
 - (void)reloadMatchInfoRecords:(NSArray *)inArray;
 
 //利用 match info 的所有資訊生成一個固定格式的字串
-- (NSString *)matchInfosString;
+@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSString *matchInfosString;
 
 //回傳排序好的 match info file path 陣列
-- (NSArray *)sortedMatchInfoFilePathArray;
+@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSArray *sortedMatchInfoFilePathArray;
 
 //matchInfo array 要 redo 的時候使用這個介面 restore 資料
 - (void)restoreMatchinfoArray:(NSArray *)inArray actionName:(NSString *)inActionName;

diff --git a/Localizer/JHMatchInfoTableViewController.m b/Localizer/JHMatchInfoTableViewController.m
@@ -100,8 +100,8 @@ - (JHMatchInfo *)copiedMatchInfo:(JHMatchInfo *)inMatchInfo
 - (void)tableView:(NSTableView *)inTableView didPasteMatchInfosWithIndexes:(NSIndexSet *)inIndexes
 {
     NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-    NSArray *classArray = [NSArray arrayWithObject:[JHMatchInfo class]];
-    NSDictionary *options = [NSDictionary dictionary];
+    NSArray *classArray = @[[JHMatchInfo class]];
+    NSDictionary *options = @{};
 
     BOOL ok = [pasteboard canReadObjectForClasses:classArray options:options];
     if (ok) {
@@ -209,7 +209,7 @@ - (void)changeKeyPath:(NSString *)keyPath ofObject:(id)object toValue:(id)newVal
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(JHMatchInfo *)object change:(NSDictionary *)change context:(void *)context
 {
-    id oldValue = [change objectForKey:NSKeyValueChangeOldKey];
+    id oldValue = change[NSKeyValueChangeOldKey];
     [[undoManager prepareWithInvocationTarget:self] changeKeyPath:keyPath ofObject:object toValue:oldValue];
     if (!undoManager.isUndoing) {
         [undoManager setActionName:NSLocalizedString(@"Edit", @"")];

diff --git a/Localizer/JHScanFoldersTableView.m b/Localizer/JHScanFoldersTableView.m
@@ -13,7 +13,7 @@
 
 @implementation JHScanFoldersTableView
 
-- (id)initWithCoder:(NSCoder *)aDecoder
+- (instancetype)initWithCoder:(NSCoder *)aDecoder
 {
     self = [super initWithCoder:aDecoder];
 
@@ -23,7 +23,7 @@ - (id)initWithCoder:(NSCoder *)aDecoder
         [self setAllowsMultipleSelection: YES];
 
         for (int i = 0; i < [self.tableColumns count] ; i++) {
-            [[self.tableColumns objectAtIndex:i] setHeaderCell:[[[NSTableHeaderCell alloc] initTextCell:[headerNameArray objectAtIndex:i]] autorelease]];
+            [(self.tableColumns)[i] setHeaderCell:[[[NSTableHeaderCell alloc] initTextCell:headerNameArray[i]] autorelease]];
         }
     }
     return self;

diff --git a/Localizer/JHSourceCodeParser.m b/Localizer/JHSourceCodeParser.m
@@ -80,7 +80,7 @@ @implementation JHSourceCodeParser
     BOOL isDir = NO;
     // Because we used GTMUILocalizer, so we must maintain key in xib.
     [[NSFileManager defaultManager] fileExistsAtPath:absoluteFilePath isDirectory:&isDir];
-    if ([[NSArray arrayWithObjects:@"h", @"m", @"mm", @"xib", @"swift", nil] containsObject:[absoluteFilePath pathExtension]] || isDir) {
+    if ([@[@"h", @"m", @"mm", @"xib", @"swift"] containsObject:[absoluteFilePath pathExtension]] || isDir) {
         NSString *fileContent = [NSString stringWithContentsOfFile:absoluteFilePath encoding:NSUTF8StringEncoding error:&e];
         if (e) {
             if (error != nil) {
@@ -101,12 +101,11 @@ @implementation JHSourceCodeParser
          (.*?) 這是 Reluctant 的做法
          ,     key 和 comment 之間要有一個分隔符號 ,
          */
-		NSArray *patterns = [NSArray arrayWithObjects:
-							 @"NSLocalizedString\\s*\\(\\s*@\"(.*?)\"\\s*,\\s*@?\"?(.*?)\"?\\s*\\)",
+		NSArray *patterns = @[@"NSLocalizedString\\s*\\(\\s*@\"(.*?)\"\\s*,\\s*@?\"?(.*?)\"?\\s*\\)",
 							 @"NSLocalizedString\\s*\\(\\s*\"(.*?)\"\\s*,\\s*commemt:\\s*@?\"?(.*?)\"?\\s*\\)",
 							 @"LFLSTR\\s*\\(\\s*@\"(.*?)\"\\s*\\)",
 							 @"LFLSTR\\s*\\(\\s*\"(.*?)\"\\s*\\)",
-							 @"\\^(.*?)<",nil];
+							 @"\\^(.*?)<"];
 		for (NSString *pattern in patterns) {
 			[result unionSet:makeMatchInfoSet(pattern, fileContent, extFilePath)];
 		}