Changeset 73 for trunk

Timestamp:

06/30/08 11:57:38 (6 months ago)

Author:

mgorbach

Message:

Fix a bug with trying to delete multiple filesystems

Files:

• trunk/Settings/MFSettingsController.m (modified) (6 diffs)

trunk/Settings/MFSettingsController.m

@@ -296 +296 @@
 {
         MFClientFS* clickedFS = [filesystemTableView clickedFilesystem];
+        NSArray* selectedFilesystems = [[filesystemArrayController arrangedObjects] objectsAtIndexes:
+                                                   [filesystemTableView selectedRowIndexes]];
         if (clickedFS)
         {
-                return [NSArray arrayWithObject: clickedFS];
+                if ([selectedFilesystems containsObject: clickedFS])
+                        return selectedFilesystems;
+                else
+                        return [NSArray arrayWithObject: clickedFS];
         }
         else
@@ -330 +335 @@
 }
 
-- (void)deleteFilesystem:(MFClientFS*)fs
-{
-        if ([fs isUnmounted] || [fs isFailedToMount])
-        {
-                NSString* messageText = [NSString stringWithFormat: @"Are you sure you want to delete the filesystem %@?", fs.name];
+
+- (void)deleteFilesystems:(NSArray*)filesystems
+{
+        NSMutableArray* filesystemsToDelete = [filesystems mutableCopy];
+        for(MFClientFS* fs in filesystems)
+        {
+                if( ! ([fs isUnmounted] || [fs isFailedToMount]) )
+                {
+                        [filesystemsToDelete removeObject: fs];
+                        MFLogS(self, @"Can't delete filesystem %@", fs);
+                }
+        }
+
+        if ([filesystemsToDelete count] > 0)
+        {
+                NSString* fsWord = [filesystemsToDelete count] == 1 ? @"filesystem" : @"filesystems";
+                NSString* messageText = [NSString stringWithFormat: @"Are you sure you want to delete the %@ %@?", fsWord,
+                                                                 [[filesystemsToDelete valueForKey: kMFFSNameParameter] componentsJoinedByString: @", "]];
                 NSAlert* deleteConfirmation = [NSAlert new];
                 [deleteConfirmation setMessageText: messageText];
@@ -344 +362 @@
                                                                            modalDelegate:self
                                                                           didEndSelector:@selector(deleteConfirmationAlertDidEnd:returnCode:contextInfo:)
-                                                                                 contextInfo:fs];
-        }
-        else
-        {
-                MFLogSO(self, fs, @"Can't delete FS %@", fs);
-        }
-}
-
-
+                                                                                 contextInfo:filesystemsToDelete];
+        }
+}
+
+- (void)deleteFilesystem:(MFClientFS*)fs
+{
+        [self deleteFilesystems: [NSArray arrayWithObject: fs]];
+}
+        
 
 # pragma mark Selected Action Methods
@@ -412 +430 @@
 - (IBAction)deleteSelectedFS:(id)sender
 {
-        for(MFClientFS* fs in [self selectedFilesystems])
-                [self deleteFilesystem: fs];
+        NSLog(@"DSFS %@", [self selectedFilesystems]);
+        [self deleteFilesystems: [self selectedFilesystems]];
 }
 
@@ -419 +437 @@
 - (void)deleteConfirmationAlertDidEnd:(NSAlert*)alert returnCode:(NSInteger)code contextInfo:(void*)context
 {
-        MFClientFS* fs = (MFClientFS*)context;
+        NSArray* filesystemsToDelete = (NSArray*)context;
         if (code == NSAlertSecondButtonReturn)
         {
@@ -426 +444 @@
         else if (code == NSAlertFirstButtonReturn)
         {
-                [client deleteFilesystem: fs];
+                for(MFClientFS* fs in filesystemsToDelete)
+                        [client deleteFilesystem: fs];
         }
 }