simplify

Pixen · Feb 24, 2013 · 71b6dbd · 71b6dbd
1 parent ffb14a5
commit 71b6dbd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 29 deletions.
diff --git a/Pixen Application/Tools/Patterns/PXPatternEditorController.h b/Pixen Application/Tools/Patterns/PXPatternEditorController.h
@@ -16,11 +16,6 @@
 @property (nonatomic, weak) IBOutlet PXPatternEditorView *editorView;
 @property (nonatomic, weak) IBOutlet NSTextField *promptField;
 
-@property (nonatomic, copy) NSString *toolName;
-@property (nonatomic, copy) NSString *patternFileName;
-
-@property (nonatomic, unsafe_unretained) id delegate;
-
 - (void)setPattern:(PXPattern *)pattern;
 
 - (IBAction)newPattern:(id)sender;
@@ -31,10 +26,3 @@
 - (void)removePattern:(PXPattern *)pattern;
 
 @end
-
-
-@interface NSObject(PXPatternEditorControllerDelegate)
-
-- (void)patternEditor:(PXPatternEditorController *)ed finishedWithPattern:(PXPattern *)pattern;
-
-@end
diff --git a/Pixen Application/Tools/Patterns/PXPatternEditorController.m b/Pixen Application/Tools/Patterns/PXPatternEditorController.m
@@ -15,7 +15,6 @@
 @implementation PXPatternEditorController
 
 @synthesize patternsController, scrollView, editorView, promptField;
-@synthesize toolName, patternFileName, delegate;
 
 - (void)awakeFromNib
 {
@@ -30,8 +29,6 @@ - (void)awakeFromNib
 
 	[scrollView setDocumentView:editorView];
 
-	[[self window] setTitle:[NSLocalizedString(@"Pattern Editor: ", @"Pattern Editor:") stringByAppendingString:toolName]];
-
 	[self reloadPatterns];
 }
 
@@ -65,9 +62,6 @@ - (IBAction)newPattern:(id)sender
 {
 	PXPattern *pattern = [_pattern copy];
 	[self addPattern:pattern];
-
-	if ([delegate respondsToSelector:@selector(patternEditor:finishedWithPattern:)])
-		[delegate patternEditor:self finishedWithPattern:pattern];
 }
 
 - (void)deleteSheetDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:contextInfo
@@ -87,24 +81,21 @@ - (id)init
 												 selector:@selector(patternsChanged:)
 													 name:PXPatternsChangedNotificationName
 												   object:nil];
-
-		[self setPatternFileName:GetPixenPatternFile()];
 	}
 	return self;
 }
 
 - (void)patternView:(PXPatternEditorView *)pv changedPattern:(PXPattern *)pattern
 {
 	[self setPattern:pattern];
-
-	if ([delegate respondsToSelector:@selector(patternEditor:finishedWithPattern:)])
-		[delegate patternEditor:self finishedWithPattern:pattern];
 }
 
 - (void)reloadPatterns
 {
-	BOOL isDirectory;
+	BOOL isDirectory = NO;
+
 	NSFileManager *fileManager = [NSFileManager defaultManager];
+	NSString *patternFileName = GetPixenPatternFile();
 
 	if (![fileManager fileExistsAtPath:patternFileName isDirectory:&isDirectory] || isDirectory)
 		return;
@@ -146,9 +137,6 @@ - (void)patternItemWasDoubleClicked:(PXPatternItem *)item
 {
 	PXPattern *pattern = [item representedObject];
 	[self setPattern:pattern];
-
-	if ([delegate respondsToSelector:@selector(patternEditor:finishedWithPattern:)])
-		[delegate patternEditor:self finishedWithPattern:pattern];
 }
 
 - (void)addPattern:(PXPattern *)pattern
@@ -160,7 +148,7 @@ - (void)addPattern:(PXPattern *)pattern
 													  userInfo:nil];
 
 	[NSKeyedArchiver archiveRootObject:[patternsController arrangedObjects]
-								toFile:patternFileName];
+								toFile:GetPixenPatternFile()];
 }
 
 - (void)removePattern:(PXPattern *)pattern
@@ -172,7 +160,7 @@ - (void)removePattern:(PXPattern *)pattern
 													  userInfo:nil];
 
 	[NSKeyedArchiver archiveRootObject:[patternsController arrangedObjects]
-								toFile:patternFileName];
+								toFile:GetPixenPatternFile()];
 }
 
 - (void)dealloc