Permalink
Browse files

removed unneeded synthesize

  • Loading branch information...
Chris Wilson
Chris Wilson committed Oct 11, 2012
1 parent 7d34f2b commit 12d56c71c372ba68f830073c8b7c6413c81103ce
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+ <true/>
+ <key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+ <false/>
+</dict>
+</plist>
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0450"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C1CEFE501463779C00466EB3"
+ BuildableName = "CoreDataPro.app"
+ BlueprintName = "CoreDataUtil"
+ ReferencedContainer = "container:CoreDataUtil.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C1CEFE741463779D00466EB3"
+ BuildableName = "CoreDataUtilTests.octest"
+ BlueprintName = "CoreDataUtilTests"
+ ReferencedContainer = "container:CoreDataUtil.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C1CEFE501463779C00466EB3"
+ BuildableName = "CoreDataPro.app"
+ BlueprintName = "CoreDataUtil"
+ ReferencedContainer = "container:CoreDataUtil.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C1CEFE501463779C00466EB3"
+ BuildableName = "CoreDataPro.app"
+ BlueprintName = "CoreDataUtil"
+ ReferencedContainer = "container:CoreDataUtil.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C1CEFE501463779C00466EB3"
+ BuildableName = "CoreDataPro.app"
+ BlueprintName = "CoreDataUtil"
+ ReferencedContainer = "container:CoreDataUtil.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0450"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "C1CEFE871463779D00466EB3"
+ BuildableName = "CoreDataUtilImporter.mdimporter"
+ BlueprintName = "CoreDataUtilImporter"
+ ReferencedContainer = "container:CoreDataUtil.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Debug"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>SchemeUserState</key>
+ <dict>
+ <key>CoreDataUtil.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>0</integer>
+ </dict>
+ <key>CoreDataUtilImporter.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>1</integer>
+ </dict>
+ </dict>
+ <key>SuppressBuildableAutocreation</key>
+ <dict>
+ <key>C1CEFE501463779C00466EB3</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ <key>C1CEFE741463779D00466EB3</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ <key>C1CEFE871463779D00466EB3</key>
+ <dict>
+ <key>primary</key>
+ <true/>
+ </dict>
+ </dict>
+</dict>
+</plist>
@@ -9,10 +9,6 @@
#import "MFLCoreDataCommon.h"
@implementation MFLCoreDataCommon
-@synthesize managedObjectModel = _managedObjectModel;
-@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
-@synthesize context = _context;
-@synthesize managedObjectContext = _managedObjectContext;
/**
Creates if necessary and returns the managed object model for the application.
@@ -50,7 +46,7 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator
NSURL *applicationFilesDirectory = [self applicationFilesDirectory];
NSError *error = nil;
- NSDictionary *properties = [applicationFilesDirectory resourceValuesForKeys:[NSArray arrayWithObject:NSURLIsDirectoryKey] error:&error];
+ NSDictionary *properties = [applicationFilesDirectory resourceValuesForKeys:@[NSURLIsDirectoryKey] error:&error];
if (!properties)
{
BOOL ok = NO;
@@ -66,7 +62,7 @@ - (NSPersistentStoreCoordinator *) persistentStoreCoordinator
}
else
{
- if ([[properties objectForKey:NSURLIsDirectoryKey] boolValue] != YES)
+ if ([properties[NSURLIsDirectoryKey] boolValue] != YES)
{
// Customize and localize this error.
NSString *failureDescription = [NSString stringWithFormat:@"Expected a folder to store application data, found a file (%@).", [applicationFilesDirectory path]];
@@ -22,19 +22,6 @@ - (NSError *)errnoErrorWithReason:(NSString *)reason;
@implementation MFLCoreDataIntrospection
-@synthesize delegate = _delegate;
-
-@synthesize storeType = _storeType;
-@synthesize objModel = _objModel;
-@synthesize momFileUrl = _momFileUrl;
-@synthesize dbFileUrl = _dbFileUrl;
-
-@synthesize entities = _entities;
-@synthesize entityData = _entityData;
-
-@synthesize dateStyle = _dateStyle;
-@synthesize coreDataHistory = _coreDataHistory;
-
- (id)init
{
self = [super init];
@@ -146,7 +133,7 @@ - (void) reloadObjectModel {
}
- (NSEntityDescription*) entityDescription:(NSUInteger) index {
- NSEntityDescription* entityDescription = [[self.objModel entities] objectAtIndex:index];
+ NSEntityDescription* entityDescription = [self.objModel entities][index];
return entityDescription;
}
@@ -237,7 +224,7 @@ - (void)sortEntityData:(NSString *)fieldName
comparisonSelector = @selector(caseInsensitiveCompare:);
}
- [columnObjs setObject:valueObj forKey:[NSString stringWithFormat:@"%ld", rowNum]];
+ columnObjs[[NSString stringWithFormat:@"%ld", rowNum]] = valueObj;
rowNum++;
}
@@ -252,7 +239,7 @@ - (void)sortEntityData:(NSString *)fieldName
NSMutableArray *temp = [[NSMutableArray alloc] init];
for (NSString *oldRowNum in sortedColumns)
{
- [temp addObject:[self.entityData objectAtIndex:[oldRowNum integerValue]]];
+ [temp addObject:(self.entityData)[[oldRowNum integerValue]]];
}
self.entityData = temp;
}
@@ -348,9 +335,9 @@ - (NSArray*) keyPathsForEntity:(NSEntityDescription*) entityDescription {
}
- (NSError *)errnoErrorWithReason:(NSString *)reason {
- NSString *errMsg = [NSString stringWithUTF8String:strerror(errno)];
- NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:errMsg, NSLocalizedDescriptionKey,
- reason, NSLocalizedFailureReasonErrorKey, nil];
+ NSString *errMsg = @(strerror(errno));
+ NSDictionary *userInfo = @{NSLocalizedDescriptionKey: errMsg,
+ NSLocalizedFailureReasonErrorKey: reason};
return [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:userInfo];
}
@@ -376,7 +363,7 @@ - (void) loadEntityDataAtIndex: (NSUInteger) index {
}
- (NSString*) entityAtIndex:(NSUInteger) index {
- return [self.entities objectAtIndex:index];
+ return (self.entities)[index];
}
- (NSUInteger) entityDataCountAtIndex: (NSUInteger) index
@@ -394,7 +381,7 @@ - (NSUInteger) entityDataCount {
}
- (NSArray*) getDataAtRow: (NSUInteger) row {
- return [self.entityData objectAtIndex:row];
+ return (self.entityData)[row];
}
- (NSInteger)getCurrentHistoryIndex
@@ -433,8 +420,8 @@ - (void)updateCoreDataHistory:(NSString *)name :(NSPredicate *)predicate
// handle any duplicate objects that are side-by-side
if (([self.coreDataHistory count] >= 2) && (currentHistoryIndex <= [self.coreDataHistory count] - 2))
{
- CoreDataHistoryObject *currentObj = [self.coreDataHistory objectAtIndex:currentHistoryIndex];
- CoreDataHistoryObject *nextObj = [self.coreDataHistory objectAtIndex:currentHistoryIndex + 1];
+ CoreDataHistoryObject *currentObj = (self.coreDataHistory)[currentHistoryIndex];
+ CoreDataHistoryObject *nextObj = (self.coreDataHistory)[currentHistoryIndex + 1];
if ([currentObj isEqualTo:nextObj] ||
[[self fetchObjectsByEntityName:currentObj.entityName :currentObj.predicate] isEqualTo:[self fetchObjectsByEntityName:nextObj.entityName :nextObj.predicate]])
{
@@ -10,9 +10,6 @@
@implementation CoreDataHistoryObject
-@synthesize entityName;
-@synthesize predicate;
-
- (BOOL)isEqualTo:(id)object
{
if ([object isKindOfClass:[CoreDataHistoryObject class]])
@@ -121,7 +121,7 @@ - (void) copySelectedRow: (BOOL) escapeSpecialChars {
// Next Index
currentIndex = [indexSet indexGreaterThanIndex: currentIndex];
}
- [pb declareTypes:[NSArray arrayWithObjects:NSStringPboardType, nil] owner:nil];
+ [pb declareTypes:@[NSStringPboardType] owner:nil];
[pb setString:[NSString stringWithString:textBuf] forType:NSStringPboardType];
}
}
@@ -22,7 +22,6 @@ - (NSMutableArray *)splitStringIntoCharArray:(NSString *)string;
@implementation EntityDataTableViewCell
-@synthesize cellText = _cellText;
- (CellType)getCellType
{
@@ -131,9 +130,8 @@ - (void)drawText:(NSRect)cellFrame
}
textOrigin.y = cellFrame.origin.y;
- NSDictionary *textAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSColor blackColor], NSForegroundColorAttributeName,
- textFont, NSFontAttributeName, nil];
+ NSDictionary *textAttributes = @{NSForegroundColorAttributeName: [NSColor blackColor],
+ NSFontAttributeName: textFont};
NSString *text = self.cellText;
if ([self widthOfString:text withFont:textFont] >= maxWidth)
@@ -160,7 +158,7 @@ - (void)drawText:(NSRect)cellFrame
- (CGFloat)widthOfString:(NSString *)string withFont:(NSFont *)font
{
- NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:font, NSFontAttributeName, nil];
+ NSDictionary *attributes = @{NSFontAttributeName: font};
return [[[NSAttributedString alloc] initWithString:string attributes:attributes] size].width;
}
Oops, something went wrong.

0 comments on commit 12d56c7

Please sign in to comment.