Merge pull request #41 from ChristianKienle/feature/refresh

set default integration paths

Author: Christian Kienle

Core Data Editor/Core Data Editor/CDEApplicationDelegate.m

@@ -51,7 +51,8 @@ - (IBAction)showProjectBrowser:(id)sender {
   if(self.projectBrowserWindowController == nil) {
     self.projectBrowserWindowController = [CDEProjectBrowserWindowController new];
   }
-  [self.projectBrowserWindowController showWithProjectDirectoryURL:self.iPhoneSimulatorDirectory];
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  [self.projectBrowserWindowController showWithProjectDirectoryURL:defaults.simulatorDirectory_cde];
 }
 
 #pragma mark NSApplicationDelegate

Core Data Editor/Core Data Editor/CDESetupWindowController.m

@@ -14,71 +14,75 @@ @interface CDESetupWindowController ()
 @implementation CDESetupWindowController
 
 - (instancetype)init {
-    self = [super initWithWindowNibName:@"CDESetupWindowController" owner:self];
-    if(self) { }
-    return self;
+  self = [super initWithWindowNibName:@"CDESetupWindowController" owner:self];
+  if(self) { }
+  return self;
 }
 
 - (void)windowDidLoad {
-    [super windowDidLoad];
-    
-    self.simulatorPathPopupButton.otherItemSelectedHandler = ^(CDEPathPickerPopUpButton *sender) {
-        [self showSimulatorDirectoryPicker:sender];
-    };
-    self.derivedDataPathPopupButton.otherItemSelectedHandler = ^(CDEPathPickerPopUpButton *sender) {
-        [self showDerivdedDataPicker:sender];
-    };
+  [super windowDidLoad];
+  
+  self.simulatorPathPopupButton.otherItemSelectedHandler = ^(CDEPathPickerPopUpButton *sender) {
+    [self showSimulatorDirectoryPicker:sender];
+  };
+  self.derivedDataPathPopupButton.otherItemSelectedHandler = ^(CDEPathPickerPopUpButton *sender) {
+    [self showDerivdedDataPicker:sender];
+  };
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  self.simulatorPathPopupButton.URL = defaults.simulatorDirectory_cde;
+  self.derivedDataPathPopupButton.URL = defaults.buildProductsDirectory_cde;
+  
 }
 
 - (IBAction)showSimulatorDirectoryPicker:(id)sender {
-    NSOpenPanel *panel = [NSOpenPanel openPanel];
-    [panel setCanChooseDirectories:YES];
-    [panel setCanChooseFiles:NO];
-    [panel setShowsHiddenFiles:YES];
-    [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
-        if(result == NSFileHandlingPanelOKButton) {
-            NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-            defaults.simulatorDirectory_cde = panel.URL;
-            self.simulatorPathPopupButton.URL = defaults.simulatorDirectory_cde;
-        }
-    }];
+  NSOpenPanel *panel = [NSOpenPanel openPanel];
+  [panel setCanChooseDirectories:YES];
+  [panel setCanChooseFiles:NO];
+  [panel setShowsHiddenFiles:YES];
+  [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
+    if(result == NSFileHandlingPanelOKButton) {
+      NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+      defaults.simulatorDirectory_cde = panel.URL;
+      self.simulatorPathPopupButton.URL = defaults.simulatorDirectory_cde;
+    }
+  }];
 }
 
 - (IBAction)showDerivdedDataPicker:(id)sender {
-    NSOpenPanel *panel = [NSOpenPanel openPanel];
-    [panel setCanChooseDirectories:YES];
-    [panel setCanChooseFiles:NO];
-    [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
-        if(result == NSFileHandlingPanelOKButton) {
-            NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-            defaults.buildProductsDirectory_cde = panel.URL;
-            self.derivedDataPathPopupButton.URL = defaults.buildProductsDirectory_cde;
-        }
-    }];
+  NSOpenPanel *panel = [NSOpenPanel openPanel];
+  [panel setCanChooseDirectories:YES];
+  [panel setCanChooseFiles:NO];
+  [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
+    if(result == NSFileHandlingPanelOKButton) {
+      NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+      defaults.buildProductsDirectory_cde = panel.URL;
+      self.derivedDataPathPopupButton.URL = defaults.buildProductsDirectory_cde;
+    }
+  }];
 }
 
 #pragma mark - Actions
 - (IBAction)beginSetupProcess:(id)sender {
-    [self.tabView selectNextTabViewItem:sender];
+  [self.tabView selectNextTabViewItem:sender];
 }
 
 - (IBAction)showBuildProductsSetupTab:(id)sender {
-    [self.tabView selectNextTabViewItem:sender];
+  [self.tabView selectNextTabViewItem:sender];
 }
 
 - (IBAction)showSummary:(id)sender {
-    [self.tabView selectNextTabViewItem:sender];
-    [[NSUserDefaults standardUserDefaults] setApplicationNeedsSetup_cde:NO];
+  [self.tabView selectNextTabViewItem:sender];
+  [[NSUserDefaults standardUserDefaults] setApplicationNeedsSetup_cde:NO];
 }
 
 - (IBAction)openProjectBrowser:(id)sender {
-    [self.window orderOut:self];
-    [(CDEApplicationDelegate *)[NSApp delegate] showProjectBrowser:sender];
+  [self.window orderOut:self];
+  [(CDEApplicationDelegate *)[NSApp delegate] showProjectBrowser:sender];
 }
 
 - (IBAction)createNewProject:(id)sender {
-    [self.window orderOut:self];
-    [[NSDocumentController sharedDocumentController] newDocument:self];
+  [self.window orderOut:self];
+  [[NSDocumentController sharedDocumentController] newDocument:self];
 }
 
 @end

Core Data Editor/Core Data Editor/NSUserDefaults+CDEAdditions.m

@@ -24,7 +24,12 @@ @implementation NSUserDefaults (CDEAdditions)
 
 #pragma mark - Register Defaults
 + (void)registerCoreDataEditorDefaults_cde {
-    NSDictionary *defaults = @{ CDEUserDefaultsKeys.showsNameOfEntityInObjectIDColumn : @NO,
+  
+  NSURL *buildProductsDirectory = [NSURL fileURLWithPath:[@"~/Library/Developer/Xcode/DerivedData/" stringByExpandingTildeInPath]];
+  NSURL *simulatorDirectory = [NSURL fileURLWithPath:[@"~/Library/Developer/CoreSimulator/" stringByExpandingTildeInPath]];
+  NSDictionary *defaults = @{   CDEUserDefaultsKeys.buildProductsDirectory : buildProductsDirectory,
+                                CDEUserDefaultsKeys.simulatorDirectory : simulatorDirectory,
+                                CDEUserDefaultsKeys.showsNameOfEntityInObjectIDColumn : @NO,
                                 CDEUserDefaultsKeys.numberOfDecimals : @2,
                                 CDEUserDefaultsKeys.dateFormatterDateStyle : @(NSDateFormatterShortStyle),
                                 CDEUserDefaultsKeys.dateFormatterTimeStyle : @(NSDateFormatterShortStyle),