commit b6392e3e8a8cd44f29af7b06e5c023c04c3666c4
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon May 12 23:43:50 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue May 13 00:09:47 2014 -0700
tree 5b2067572b47ad75760f3a91e5327016b49289e4
parent 1dddc3f042884cf057bca4288bff77e67a734495

src: Initial reorganization for NFD Control Center

Change-Id: Ic8bc4b9168df83bd706f780187a5993292565f95

osx/preference-delegate.mm

diff --git a/osx/preference-delegate.mm b/osx/preference-delegate.mm
index dd0bfaf..f164c10 100644
--- a/osx/preference-delegate.mm
+++ b/osx/preference-delegate.mm
@@ -1,12 +1,26 @@
 /* -*- Mode: objc; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
-/*
- * @copyright See LICENCE for copyright and license information.
+/**
+ * Copyright (c) 2013-2014, Regents of the University of California,
  *
- * @author Alexander Afanasyev <alexander.afanasyev@ucla.edu>
- * @author Ilya Moiseenko <iliamo@ucla.edu>
+ * This file is part of NFD Control Center.  See AUTHORS.md for complete list of NFD
+ * authors and contributors.
+ *
+ * NFD Control Center is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD Control Center is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with NFD
+ * Control Center, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * \author Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
+ * \author Ilya Moiseenko <http://ilyamoiseenko.com/>
  */
 
-#include "config.h"
+#include "config.hpp"
 #import "preference-delegate.h"
 #import "menu-delegate.h"
 
@@ -17,7 +31,7 @@
   [preferencesPanel setContentView:generalSettingsView];
   [preferencesPanel makeKeyAndOrderFront:sender];
   [preferencesPanel setLevel: NSStatusWindowLevel];
-  
+
   tableController.m_tableView = fibTableView;
 }
 
@@ -46,29 +60,29 @@
 {
   [NSApp endSheet:prefixRegistrationSheet];
   [prefixRegistrationSheet orderOut:sender];
-  
+
   NSString *prefixName = [namePrefixText stringValue];
   NSString *tunnelType = [tunnelCombobox itemObjectValueAtIndex:[tunnelCombobox indexOfSelectedItem]];
   NSString *endpoint = [endpointText stringValue];
 
-  NSOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
-      NSTask *task = [[NSTask alloc] init];
-      [task setLaunchPath: @NDND_FIB_COMMAND];
-      [task setArguments: [NSArray arrayWithObjects: @"add", prefixName, tunnelType, endpoint, nil]];
-      [task launch];
-      [task waitUntilExit];
-    }];
+  // NSOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
+  //     NSTask *task = [[NSTask alloc] init];
+  //     [task setLaunchPath: @NDND_FIB_COMMAND];
+  //     [task setArguments: [NSArray arrayWithObjects: @"add", prefixName, tunnelType, endpoint, nil]];
+  //     [task launch];
+  //     [task waitUntilExit];
+  //   }];
 
-  [(MenuDelegate*)[[NSApplication sharedApplication] delegate] updateStatusWithDependency:operation];
+  // [(MenuDelegate*)[[NSApplication sharedApplication] delegate] updateStatusWithDependency:operation];
 }
 
 -(IBAction)removeFibEntry:(id)sender
 {
   NSInteger selectedRow = [fibTableView selectedRow];
-  
+
   if(selectedRow == -1)
     return;
-  
+
   NSString *faceID = [tableController getFaceByRowIndex:selectedRow];
   if (faceID == nil)
     return;
@@ -77,15 +91,15 @@
   if (prefix == nil)
     return;
 
-  NSOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
-      NSTask *task = [[NSTask alloc] init];
-      [task setLaunchPath: @NDND_FIB_COMMAND];
-      [task setArguments: [NSArray arrayWithObjects: @"del", prefix, @"face", faceID, nil]];
-      [task launch];
-      [task waitUntilExit];
-    }];
+  // NSOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
+  //     NSTask *task = [[NSTask alloc] init];
+  //     [task setLaunchPath: @NDND_FIB_COMMAND];
+  //     [task setArguments: [NSArray arrayWithObjects: @"del", prefix, @"face", faceID, nil]];
+  //     [task launch];
+  //     [task waitUntilExit];
+  //   }];
 
-  [(MenuDelegate*)[[NSApplication sharedApplication] delegate] updateStatusWithDependency:operation];
+  // [(MenuDelegate*)[[NSApplication sharedApplication] delegate] updateStatusWithDependency:operation];
 }
 
 - (IBAction) showFibEntrySheet:(id)sender
@@ -95,7 +109,7 @@
     modalDelegate:self
     didEndSelector:nil
     contextInfo:nil];
-  
+
   [tunnelCombobox selectItemAtIndex:0];
 }