Merge pull request #150 from Kyriakis/master

New Features and Bugfixes

Author: laullon

ApplicationController.h

@@ -7,7 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "PBGitRepository.h"
 
 @class PBCloneRepositoryPanel;
 
@@ -21,6 +20,7 @@
 
 	PBCloneRepositoryPanel *cloneRepositoryPanel;
 
+    NSDictionary *notificationUserInfo;
 }
 
 - (NSPersistentStoreCoordinator *)persistentStoreCoordinator;

ApplicationController.m

@@ -18,6 +18,12 @@
 #import "PBCloneRepositoryPanel.h"
 #import "Sparkle/SUUpdater.h"
 #import "AIURLAdditions.h"
+#import "PBGitRepository.h"
+
+@interface ApplicationController ()
+- (void) cleanUpRemotesOnError;
+@end
+
 
 @implementation ApplicationController
 
@@ -72,7 +78,10 @@ - (void)applicationWillFinishLaunching:(NSNotification*)notification
 
 - (void)applicationDidFinishLaunching:(NSNotification*)notification
 {
-	[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getArguments:) name:@"GitCommandSent" object:Nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(cleanGitAfterErrorMessage:) name:@"ErrorMessageDidEnd" object:Nil];
+     
+    [[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
     [[SUUpdater sharedUpdater] setDelegate:self];
 
     if ([PBGitDefaults useAskPasswd]) {
@@ -245,7 +254,7 @@ - (NSManagedObjectModel *)managedObjectModel {
         return managedObjectModel;
     }
 
-    managedObjectModel = [[NSManagedObjectModel mergedModelFromBundles:nil] retain];    
+    managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil];    
     return managedObjectModel;
 }
 
@@ -392,6 +401,8 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 			[PBGitDefaults setPreviousDocumentPaths:paths];
 		}
 	}
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 /**
@@ -400,10 +411,9 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification
 
 - (void) dealloc {
 
-    [managedObjectContext release], managedObjectContext = nil;
-    [persistentStoreCoordinator release], persistentStoreCoordinator = nil;
-    [managedObjectModel release], managedObjectModel = nil;
-    [super dealloc];
+    managedObjectContext = nil;
+    persistentStoreCoordinator = nil;
+    managedObjectModel = nil;
 }
 
 
@@ -444,5 +454,35 @@ - (IBAction)reportAProblem:(id)sender
 }
 
 
+#pragma mark - Observer methods
+
+- (void)getArguments:(NSNotification*)notification
+{
+    notificationUserInfo = [notification userInfo];
+}
+
+
+- (void)cleanGitAfterErrorMessage:(NSNotification*)notification
+{
+    // When adding a remote occurs an error the remote
+    // will be set on git and has to be removed to clean the remotes list
+    [self cleanUpRemotesOnError];
+    
+    
+    
+}
+
+#pragma mark - Extensions
+- (void) cleanUpRemotesOnError
+{    
+    // check, if arguments was to add a remote
+    if ( ([(NSString*)[notificationUserInfo valueForKey:@"Arg0"] compare:@"remote"] == NSOrderedSame) &&
+        ([(NSString*)[notificationUserInfo valueForKey:@"Arg1"] compare:@"add"] == NSOrderedSame)
+        )
+    {
+        PBGitRef *remoteRef = [PBGitRef refFromString:[NSString stringWithFormat:@"%@%@", kGitXRemoteRefPrefix,[notificationUserInfo valueForKey:@"Arg3"]]];
+        [[notificationUserInfo valueForKey:@"Repository"] deleteRemote:remoteRef];
+    }
+}
 
 @end

Commands/PBCommand.h

@@ -7,30 +7,25 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "PBGitRepository.h"
+
+@class PBGitRepository;
 
 @interface PBCommand : NSObject {
 	PBGitRepository *repository;
-	
-	// for the user to see what it triggers
 	NSString *displayName;
-	// shown during command execution
-	NSString *commandTitle;
-	NSString *commandDescription;
-	
 	NSMutableArray *parameters;
 	BOOL canBeFired;
 }
-@property (nonatomic) BOOL canBeFired;
-@property (nonatomic, retain, readonly) PBGitRepository *repository;
-@property (nonatomic, retain) NSString *commandTitle;
-@property (nonatomic, retain) NSString *commandDescription;
-@property (nonatomic, copy) NSString *displayName;
 
-- (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo;
+@property BOOL canBeFired;
+@property (readonly) PBGitRepository *repository;
+@property (strong) NSString *commandTitle;
+@property (strong) NSString *commandDescription;
+@property (readonly) NSString *displayName;
 
+- (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo;
 - (void) invoke;
-
 - (NSArray *) allParameters;
 - (void) appendParameters:(NSArray *) params;
+
 @end

Commands/PBCommand.m

@@ -9,10 +9,6 @@
 #import "PBCommand.h"
 #import "PBRemoteProgressSheet.h"
 
-@interface PBCommand()
-@property (nonatomic, retain) PBGitRepository *repository;
-@end
-
 @implementation PBCommand
 @synthesize displayName;
 @synthesize commandDescription;
@@ -27,28 +23,16 @@ - (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) para
 - (id) initWithDisplayName:(NSString *) aDisplayName parameters:(NSArray *) params repository:(PBGitRepository *) repo {
 	self = [super init];
 	if (self != nil) {
-		self.displayName = aDisplayName;
+		displayName = aDisplayName;
 		parameters = [[NSMutableArray alloc] initWithArray:params];
-		
-		// default values
-		self.commandTitle = @"";
-		self.commandDescription = @"";
-		self.repository = repo;
-		self.canBeFired = YES;
+		commandTitle = @"";
+		commandDescription = @"";
+		repository = repo;
+		canBeFired = YES;
 	}
 	return self;
 }
 
-
-- (void) dealloc {
-	[repository release];
-	[commandDescription release];
-	[commandTitle release];
-	[parameters release];
-	[displayName release];
-	[super dealloc];
-}
-
 - (NSArray *) allParameters {
 	return parameters;
 }

Commands/PBCommandWithParameter.h

@@ -15,9 +15,9 @@
 	NSString *parameterName;
 	NSString *parameterDisplayName;
 }
-@property (nonatomic, retain, readonly) PBCommand *command;
-@property (nonatomic, retain, readonly) NSString *parameterName;
-@property (nonatomic, retain, readonly) NSString *parameterDisplayName;
+@property (nonatomic, strong, readonly) PBCommand *command;
+@property (nonatomic, strong, readonly) NSString *parameterName;
+@property (nonatomic, strong, readonly) NSString *parameterDisplayName;
 
 - initWithCommand:(PBCommand *) command parameterName:(NSString *) param parameterDisplayName:(NSString *) paramDisplayName;
 @end

Commands/PBCommandWithParameter.m

@@ -8,7 +8,8 @@
 
 #import "PBCommandWithParameter.h"
 #import "PBArgumentPickerController.h"
-
+#import "PBGitRepository.h"
+#import "PBGitWindowController.h"
 
 @implementation PBCommandWithParameter
 @synthesize command;
@@ -17,24 +18,17 @@ @implementation PBCommandWithParameter
 
 - initWithCommand:(PBCommand *) aCommand parameterName:(NSString *) param parameterDisplayName:(NSString *) paramDisplayName {
 	if ((self = [super initWithDisplayName:[aCommand displayName] parameters:nil repository:[aCommand repository]])) {
-		command = [aCommand retain];
-		parameterName = [param retain];
-		parameterDisplayName = [paramDisplayName retain];
+		command = aCommand;
+		parameterName = param;
+		parameterDisplayName = paramDisplayName;
 	}
 	return self;
 }
 
-- (void) dealloc {
-	[command release];
-	[parameterName release];
-	[parameterDisplayName release];
-	[super dealloc];
-}
 
 
 - (void) invoke {
 	PBArgumentPickerController *controller = [[PBArgumentPickerController alloc] initWithCommandWithParameter:self];
 	[NSApp beginSheet:[controller window] modalForWindow:[command.repository.windowController window] modalDelegate:controller didEndSelector:nil contextInfo:NULL];
-	[controller release];
 }
 @end

Commands/PBRevealWithFinderCommand.m

@@ -13,7 +13,6 @@ @implementation PBRevealWithFinderCommand
 
 - (id) initWithDocumentAbsolutePath:(NSString *) path {
 	if (!path) {
-		[self autorelease];
 		return nil;
 	}
 

Commands/PBStashCommandFactory.m

@@ -47,18 +47,15 @@ + (NSArray *) commandsForRef:(PBGitRef *) ref repository:(PBGitRepository *) rep
 		command.commandDescription = @"Stashing local changes";
 
 		PBCommandWithParameter *cmd = [[PBCommandWithParameter alloc] initWithCommand:command parameterName:@"save" parameterDisplayName:@"Stash message (optional)"];
-		[command release];
 		[commands addObject:cmd];
-		[cmd release];
 
 		command = [[PBCommand alloc] initWithDisplayName:@"Clear stashes" parameters:[NSArray arrayWithObjects:@"stash", @"clear", nil] repository:repository];
 		command.commandTitle = command.displayName;
 		command.commandDescription = @"Clearing stashes";
 		[commands addObject:command];
-		[command release];
 	}
 
-	return [commands autorelease];
+	return commands;
 }
 
 + (NSArray *) commandsForStash:(PBGitStash *) stash repository:(PBGitRepository *) repository {
@@ -82,7 +79,7 @@ + (NSArray *) commandsForStash:(PBGitStash *) stash repository:(PBGitRepository
 	command.commandDescription = [NSString stringWithFormat:@"Dropping stash: '%@'", stash];
 	[commands addObject:command];
 
-	return [commands autorelease];
+	return commands;
 }
 
 @end

Controller/GlobalProtocols.h

@@ -0,0 +1,15 @@
+//
+//  GlobalProtocols.h
+//  GitX
+//
+//  Created by Robert Kyriakis on 08.01.12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol Messages
+@required
+- (void)showMessageSheet:(NSString *)messageText infoText:(NSString *)infoText;
+- (void)showErrorSheet:(NSError *)error;
+@end

Controller/PBArgumentPickerController.m

@@ -14,16 +14,11 @@ @implementation PBArgumentPickerController
 
 - initWithCommandWithParameter:(PBCommandWithParameter *) aCommand {
 	if ((self = [super initWithWindowNibName:@"PBArgumentPicker" owner:self])) {
-		cmdWithParameter = [aCommand retain];
+		cmdWithParameter = aCommand;
 	}
 	return self;
 }
 
-- (void) dealloc {
-	[cmdWithParameter release];
-
-	[super dealloc];
-}
 
 - (void) awakeFromNib {
 	NSString *stringToDisplay = [NSString stringWithFormat:@"%@:", [cmdWithParameter parameterDisplayName]];