/ - Diff - Pithos MacOS Client - Greek Research and Technology Network's projects

Revision e8dc9335

     @class PithosSyncDaemon;
     @class ASIPithos;
     @class PithosAccountNode;
     @class PithosSharingAccountsNode;
     @interface PithosAccount : NSObject <NSCoding> {
         NSString *uniqueName;
-...
         BOOL syncActive;
         NSString *syncDirectoryPath;
         NSMutableDictionary *syncContainersDictionary;
         NSMutableDictionary *syncAccountsDictionary;
         NSDate *syncLastCompleted;
         PithosSyncDaemon *syncDaemon;
-...
         ASIPithos *pithos;
         PithosAccountNode *accountNode;
         PithosSharingAccountsNode *sharingAccountsNode;
         BOOL updatePithos;
         BOOL resetSyncDaemonLocalState;
-...
     @property (nonatomic, assign) BOOL syncActive;
     @property (nonatomic, retain) NSString *syncDirectoryPath;
     @property (nonatomic, retain) NSMutableDictionary *syncContainersDictionary;
     @property (nonatomic, retain) NSMutableDictionary *syncAccountsDictionary;
     @property (nonatomic, retain) NSDate *syncLastCompleted;
     @property (nonatomic, retain) PithosSyncDaemon *syncDaemon;
-...
     @property (readonly) ASIPithos *pithos;
     @property (readonly) PithosAccountNode *accountNode;
     @property (readonly) PithosSharingAccountsNode *sharingAccountsNode;
     + (id)pithosAccount;
-...
     - (void)loginWithServerURL:(NSString *)aServerURL;
     - (void)updateSyncWithSyncActive:(BOOL)aSyncActive
                    syncDirectoryPath:(NSString *)aSyncDirectoryPath
             syncContainersDictionary:(NSMutableDictionary *)aSyncContainersDictionary;
               syncAccountsDictionary:(NSMutableDictionary *)aSyncAccountsDictionary;
     @end

     #import "PithosSyncDaemon.h"
     #import "ASIPithos.h"
     #import "PithosAccountNode.h"
     #import "PithosSharingAccountsNode.h"
     #import "pithos_macosAppDelegate.h"
     @interface PithosAccount (Internal)
-...
     @implementation PithosAccount
     @synthesize uniqueName, active, name;
     @synthesize syncActive, syncDirectoryPath, syncContainersDictionary, syncLastCompleted, syncDaemon;
     @synthesize syncActive, syncDirectoryPath, syncAccountsDictionary, syncLastCompleted, syncDaemon;
     @synthesize serverURL, versionResource, loginResource, publicResource;
     @synthesize authUser, authToken, storageURLPrefix, authURL, loginURLPrefix, publicURLPrefix;
     @synthesize pithos, accountNode;
     @synthesize pithos, accountNode, sharingAccountsNode;
     #pragma mark -
     #pragma mark Object Lifecycle
-...
+    }
     - (void)dealloc {
         [sharingAccountsNode release];
         [accountNode release];
         [pithos release];
         [publicURLPrefix release];
-...
         [serverURL release];
         [syncDaemon release];
         [syncLastCompleted release];
         [syncContainersDictionary release];
         [syncAccountsDictionary release];
         [syncDirectoryPath release];
         [name release];
         [uniqueName release];
-...
+    }
     - (NSString *)description {
         return [NSString stringWithFormat:@"uniqueName: %@, active: %d, name: %@, syncActive: %d, syncDirectoryPath: %@, syncContainersDictionary: %@, syncLastCompleted: %@, serverURL: %@, versionResource: %@, loginResource: %@, publicResource: %@, authUser: %@, authToken: %@, storageURLPrefix: %@, authURL: %@, loginURLPrefix: %@, publicURLPrefix: %@",
                 uniqueName, active, name, syncActive, syncDirectoryPath, syncContainersDictionary, syncLastCompleted, serverURL, versionResource, loginResource, publicResource, authUser, authToken, storageURLPrefix, authURL, loginURLPrefix, publicURLPrefix];
         return [NSString stringWithFormat:@"uniqueName: %@, active: %d, name: %@, syncActive: %d, syncDirectoryPath: %@, syncAccountsDictionary: %@, syncLastCompleted: %@, serverURL: %@, versionResource: %@, loginResource: %@, publicResource: %@, authUser: %@, authToken: %@, storageURLPrefix: %@, authURL: %@, loginURLPrefix: %@, publicURLPrefix: %@",
                 uniqueName, active, name, syncActive, syncDirectoryPath, syncAccountsDictionary, syncLastCompleted, serverURL, versionResource, loginResource, publicResource, authUser, authToken, storageURLPrefix, authURL, loginURLPrefix, publicURLPrefix];
+    }
     #pragma mark -
-...
+        }
+    }
     - (NSMutableDictionary *)syncContainersDictionary {
         if (!syncContainersDictionary) {
             syncContainersDictionary = [[NSMutableDictionary dictionaryWithObject:[NSMutableArray array]
                                                                            forKey:@"pithos"] retain];
     - (NSMutableDictionary *)syncAccountsDictionary {
         if (!syncAccountsDictionary) {
             syncAccountsDictionary = [[NSMutableDictionary dictionaryWithObject:[NSMutableDictionary dictionaryWithObject:[NSMutableArray array]
                                                                                                                    forKey:@"pithos"]
                                                                          forKey:@""] retain];
+        }
         return syncContainersDictionary;
         return syncAccountsDictionary;
+    }
     - (void)setSyncContainersDictionary:(NSMutableDictionary *)aSyncContainersDictionary {
         if (aSyncContainersDictionary && ![self.syncContainersDictionary isEqualToDictionary:aSyncContainersDictionary]) {
             [syncContainersDictionary release];
             syncContainersDictionary = [aSyncContainersDictionary retain];
     - (void)setSyncAccountsDictionary:(NSMutableDictionary *)aSyncAccountsDictionary {
         if (aSyncAccountsDictionary && ![self.syncAccountsDictionary isEqualToDictionary:aSyncAccountsDictionary]) {
             [syncAccountsDictionary release];
             syncAccountsDictionary = [aSyncAccountsDictionary retain];
             // XXX maybe check also here the validity of the dictionary?
             @synchronized(self) {
-...
             if (self.syncActive && !syncDaemon)
                 syncDaemon = [[PithosSyncDaemon alloc] initWithDirectoryPath:self.syncDirectoryPath
                                                                pithosAccount:self
                                                         containersDictionary:self.syncContainersDictionary
                                                           accountsDictionary:self.syncAccountsDictionary
                                                              resetLocalState:resetSyncDaemonLocalState];
             resetSyncDaemonLocalState = NO;
+        }
-...
                     if (active)
                         [accountNode refreshInfo];
+                }
                 if (sharingAccountsNode && ![sharingAccountsNode.pithos isEqualTo:pithos])
                     sharingAccountsNode.pithos = pithos;
                 updatePithos = NO;
+            }
-...
         return accountNode;
+    }
     - (PithosSharingAccountsNode *)sharingAccountsNode {
         if (!sharingAccountsNode) {
             sharingAccountsNode = [[PithosSharingAccountsNode alloc] initWithPithos:self.pithos];
             sharingAccountsNode.childrenUpdatedNotificationName = nil;
             sharingAccountsNode.inheritChildrenUpdatedNotificationName = YES;
+        }
         return sharingAccountsNode;
+    }
     #pragma mark -
     #pragma mark Actions
-...
     - (void)updateSyncWithSyncActive:(BOOL)aSyncActive
                    syncDirectoryPath:(NSString *)aSyncDirectoryPath
             syncContainersDictionary:(NSMutableDictionary *)aSyncContainersDictionary {
         self.syncContainersDictionary = aSyncContainersDictionary;
               syncAccountsDictionary:(NSMutableDictionary *)aSyncAccountsDictionary {
         self.syncAccountsDictionary = aSyncAccountsDictionary;
         self.syncDirectoryPath = aSyncDirectoryPath;
         self.syncActive = aSyncActive;
         if (syncDaemon) {
             self.syncDaemon.containersDictionary = self.syncContainersDictionary;
             self.syncDaemon.accountsDictionary = self.syncAccountsDictionary;
             self.syncDaemon.directoryPath = self.syncDirectoryPath;
             if (self.syncActive)
                 [self.syncDaemon startDaemon];
-...
             self.syncActive = [decoder decodeBoolForKey:@"syncActive"];
             self.syncDirectoryPath = [decoder decodeObjectForKey:@"syncDirectoryPath"];
             NSDictionary *immutableContainersDictionary = [decoder decodeObjectForKey:@"syncContainersDictionary"];
             syncContainersDictionary = [[NSMutableDictionary alloc] initWithCapacity:[immutableContainersDictionary count]];
             for (NSString *containerName in immutableContainersDictionary) {
                 [syncContainersDictionary setObject:[NSMutableArray arrayWithArray:[immutableContainersDictionary objectForKey:containerName]]
                                              forKey:containerName];
             NSDictionary *immutableAccountsDictionary = [decoder decodeObjectForKey:@"syncAccountsDictionary"];
             syncAccountsDictionary = [[NSMutableDictionary alloc] initWithCapacity:[immutableAccountsDictionary count]];
             for (NSString *accountName in immutableAccountsDictionary) {
                 NSDictionary *immutableContainersDictionary = [immutableAccountsDictionary objectForKey:accountName];
                 NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
                 for (NSString *containerName in [immutableAccountsDictionary objectForKey:accountName]) {
                     [syncContainersDictionary setObject:[NSMutableArray arrayWithArray:[immutableContainersDictionary objectForKey:containerName]]
                                                  forKey:containerName];
+                }
                 if ([syncContainersDictionary count])
                     [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
+            }
             self.syncLastCompleted = [decoder decodeObjectForKey:@"syncLastCompleted"];
-...
         [encoder encodeBool:syncActive forKey:@"syncActive"];
         [encoder encodeObject:syncDirectoryPath forKey:@"syncDirectoryPath"];
         [encoder encodeObject:syncContainersDictionary forKey:@"syncContainersDictionary"];
         [encoder encodeObject:syncAccountsDictionary forKey:@"syncAccountsDictionary"];
         [encoder encodeObject:self.syncLastCompleted forKey:@"syncLastCompleted"];
         [encoder encodeObject:serverURL forKey:@"serverURL"];

     #import <Cocoa/Cocoa.h>
     @class PithosAccount;
     @class PithosEmptyNode;
     @interface PithosPreferencesController : NSWindowController <NSWindowDelegate, NSOutlineViewDataSource> {
         PithosAccount *selectedPithosAccount;
-...
         BOOL syncActive;
         NSString *syncDirectoryPath;
         NSMutableDictionary *syncContainersDictionary;
         NSMutableDictionary *syncAccountsDictionary;
         BOOL syncApplyEnable;
         BOOL syncCancelEnable;
         NSOutlineView *syncContainersOutlineView;
         NSMutableDictionary *syncContainersRootFilesNodes;
         NSOutlineView *syncAccountsOutlineView;
         PithosEmptyNode *syncAccountsMyAccountNode;
         NSMutableDictionary *syncAccountsRootFilesNodes;
         NSDictionaryController *groupsDictionaryController;
         NSDictionaryController *selectedGroupMembersDictionaryController;
-...
     @property (nonatomic, assign) BOOL syncActive;
     @property (nonatomic, copy) NSString *syncDirectoryPath;
     @property (nonatomic, copy) NSMutableDictionary *syncContainersDictionary;
     @property (nonatomic, copy) NSMutableDictionary *syncAccountsDictionary;
     @property (nonatomic, assign) BOOL syncApplyEnable;
     @property (nonatomic, assign) BOOL syncCancelEnable;
     @property (nonatomic, assign) IBOutlet NSOutlineView *syncContainersOutlineView;
     @property (nonatomic, retain) NSMutableDictionary *syncContainersRootFilesNodes;
     @property (nonatomic, assign) IBOutlet NSOutlineView *syncAccountsOutlineView;
     @property (nonatomic, retain) NSMutableDictionary *syncAccountsRootFilesNodes;
     @property (nonatomic, assign) IBOutlet NSDictionaryController *groupsDictionaryController;
     @property (nonatomic, assign) IBOutlet NSDictionaryController *selectedGroupMembersDictionaryController;

     #import "PithosPreferencesController.h"
     #import "PithosBrowserController.h"
     #import "PithosAccountNode.h"
     #import "PithosSharingAccountsNode.h"
     #import "PithosContainerNode.h"
     #import "PithosSubdirNode.h"
     #import "PithosObjectNode.h"
-...
     @synthesize accountsArrayController;
     @synthesize accountRemoveEnable;
     @synthesize serverURL, authUser, authToken, manual, loginEnable, loginCancelEnable;
     @synthesize syncActive, syncDirectoryPath, syncContainersDictionary, syncApplyEnable, syncCancelEnable,
                 syncContainersOutlineView, syncContainersRootFilesNodes;
     @synthesize syncActive, syncDirectoryPath, syncAccountsDictionary, syncApplyEnable, syncCancelEnable,
                 syncAccountsOutlineView, syncAccountsRootFilesNodes;
     @synthesize groupsDictionaryController, selectedGroupMembersDictionaryController;
     #pragma mark -
-...
     //	// Select the first tab when the window is loaded for the first time.
     //	[[window valueForKeyPath:@"toolbar"] setSelectedItemIdentifier:@"0"];
         [[[syncContainersOutlineView tableColumns] objectAtIndex:1] setDataCell:[[[PithosPreferencesSyncOutlineViewCell alloc] init] autorelease]];
         [[[syncAccountsOutlineView tableColumns] objectAtIndex:1] setDataCell:[[[PithosPreferencesSyncOutlineViewCell alloc] init] autorelease]];
         syncAccountsMyAccountNode = [[PithosEmptyNode alloc] initWithDisplayName:@"<my account>"
                                                                             icon:[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kUserIcon)]];
         [groupsDictionaryController setInitialKey:@"group"];
         [groupsDictionaryController setInitialValue:@"user"];
-...
+    }
     - (void)selectedPithosAccountNodeChildrenUpdated:(NSNotification *)notification {
         [syncContainersOutlineView reloadData];
         [syncContainersOutlineView expandItem:nil expandChildren:YES];
         [syncAccountsOutlineView reloadData];
         [syncAccountsOutlineView expandItem:nil expandChildren:YES];
+    }
     #pragma mark -
-...
                                  (![selectedPithosAccount.syncDirectoryPath isEqualToString:syncDirectoryPath] &&
                                   (![[NSFileManager defaultManager] fileExistsAtPath:syncDirectoryPath isDirectory:&isDirectory] ||
                                    isDirectory)) ||
                                  ![selectedPithosAccount.syncContainersDictionary isEqualToDictionary:syncContainersDictionary]));
                                  ![selectedPithosAccount.syncAccountsDictionary isEqualToDictionary:syncAccountsDictionary]));
         self.syncCancelEnable = (selectedPithosAccount.active &&
                                  ((selectedPithosAccount.syncActive != syncActive) ||
                                   ![selectedPithosAccount.syncDirectoryPath isEqualToString:syncDirectoryPath] ||
                                   ![selectedPithosAccount.syncContainersDictionary isEqualToDictionary:syncContainersDictionary]));
                                   ![selectedPithosAccount.syncAccountsDictionary isEqualToDictionary:syncAccountsDictionary]));
+    }
     #pragma mark -
-...
     - (void)setSelectedPithosAccount:(PithosAccount *)aSelectedPithosAccount {
         if (aSelectedPithosAccount && ![aSelectedPithosAccount isEqualTo:selectedPithosAccount]) {
             selectedPithosAccount.accountNode.childrenUpdatedNotificationName = nil;
             selectedPithosAccount.sharingAccountsNode.childrenUpdatedNotificationName = nil;
             [selectedPithosAccount release];
             selectedPithosAccount = [aSelectedPithosAccount retain];
             selectedPithosAccount.accountNode.childrenUpdatedNotificationName = [NSString stringWithString:@"SelectedPithosAccountNodeChildrenUpdated"];
             selectedPithosAccount.accountNode.childrenUpdatedNotificationName = @"SelectedPithosAccountNodeChildrenUpdated";
             selectedPithosAccount.sharingAccountsNode.childrenUpdatedNotificationName = @"SelectedPithosAccountNodeChildrenUpdated";
             [self updateAccounts];
             [self loginCancel:self];
-...
         [self updateSync];
+    }
     - (void)setSyncContainersDictionary:(NSMutableDictionary *)aSyncContainersDictionary {
         [syncContainersDictionary release];
         syncContainersDictionary = [[NSMutableDictionary alloc] initWithCapacity:[aSyncContainersDictionary count]];
         for (NSString *containerName in aSyncContainersDictionary) {
             [syncContainersDictionary setObject:[NSMutableArray arrayWithArray:[aSyncContainersDictionary objectForKey:containerName]]
                                                                         forKey:containerName];
     - (void)setSyncAccountsDictionary:(NSMutableDictionary *)aSyncAccountsDictionary {
         [syncAccountsDictionary release];
         syncAccountsDictionary = [[NSMutableDictionary alloc] initWithCapacity:[aSyncAccountsDictionary count]];
         for (NSString *accountName in aSyncAccountsDictionary) {
             NSDictionary *aSyncContainersDictionary = [aSyncAccountsDictionary objectForKey:accountName];
             NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
             for (NSString *containerName in aSyncContainersDictionary) {
                 [syncContainersDictionary setObject:[NSMutableArray arrayWithArray:[aSyncContainersDictionary objectForKey:containerName]]
                                              forKey:containerName];
+            }
             if ([syncContainersDictionary count])
                 [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
+        }
         [self updateSync];
+    }
-...
     - (IBAction)syncApply:(id)sender {
         [selectedPithosAccount updateSyncWithSyncActive:syncActive
                                       syncDirectoryPath:syncDirectoryPath
                                syncContainersDictionary:syncContainersDictionary];
                                syncAccountsDictionary:syncAccountsDictionary];
         [self updateSync];
         pithos_macosAppDelegate *delegate = (pithos_macosAppDelegate *)[[NSApplication sharedApplication] delegate];
         [delegate savePithosAccounts:self];
-...
     - (IBAction)syncCancel:(id)sender {
         self.syncActive = selectedPithosAccount.syncActive;
         self.syncDirectoryPath = selectedPithosAccount.syncDirectoryPath;
         self.syncContainersDictionary = selectedPithosAccount.syncContainersDictionary;
         self.syncContainersRootFilesNodes = [NSMutableDictionary dictionary];
         self.syncAccountsDictionary = selectedPithosAccount.syncAccountsDictionary;
         self.syncAccountsRootFilesNodes = [NSMutableDictionary dictionary];
         [self selectedPithosAccountNodeChildrenUpdated:nil];
+    }
     - (IBAction)syncRefresh:(id)sender {
         selectedPithosAccount.accountNode.forcedRefresh = YES;
         [selectedPithosAccount.accountNode invalidateChildrenRecursive];
         if (selectedPithosAccount.accountNode.children) {
         selectedPithosAccount.sharingAccountsNode.forcedRefresh = YES;
         [selectedPithosAccount.sharingAccountsNode invalidateChildrenRecursive];
         if (selectedPithosAccount.accountNode.children && selectedPithosAccount.sharingAccountsNode.children) {
+        }
+    }
-...
     #pragma mark -
     #pragma mark NSOutlineViewDataSource
     // <my account> [PithosEmptyNode]
     // - <container>+ [PithosContainerNode]
     // -- <subdir>+ [PithosSubdirNode]
     // -- <root files> [PithosEmptyNode]
     // <sharing account>+ [PithosSharingAccountNode]
     // - <container>+ [PithosContainerNode]
     // -- <subdir>+ [PithosSubdirNode]
     // -- <root files> [PithosEmptyNode]
     - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
         if (!selectedPithosAccount.active)
             return 0;
         if (outlineView == syncContainersOutlineView) {
         if (outlineView == syncAccountsOutlineView) {
             if (item == nil) {
                 // root: <my account> + #<sharing account>
                 if (selectedPithosAccount.sharingAccountsNode.children)
                     return (selectedPithosAccount.sharingAccountsNode.children.count + 1);
                 else
                     return 1;
             } else if (item == syncAccountsMyAccountNode) {
                 // root/<my account>: #<container>
                 if (selectedPithosAccount.accountNode.children)
                     return selectedPithosAccount.accountNode.children.count;
             } else if ([item class] == [PithosAccountNode class]) {
                 // root/<sharing account>: #<container>
                 PithosAccountNode *accountNode = (PithosAccountNode *)item;
                 if (accountNode.children)
                     return accountNode.children.count;
             } else if ([item class] == [PithosContainerNode class]) {
                 // We add 1 for the root files node
                 NSInteger subdirCount = 1;
                 for (PithosNode *node in [(PithosContainerNode *)item children]) {
                     if ([node class] == [PithosSubdirNode class])
                         subdirCount++;
                 // root/{<my account>, <sharing account>}/<container>: #<subdir> + <root files>
                 PithosContainerNode *containerNode = (PithosContainerNode *)item;
                 if (containerNode.children) {
                     // We add 1 for the root files node
                     NSInteger subdirCount = 1;
                     for (PithosNode *node in containerNode.children) {
                         if ([node class] == [PithosSubdirNode class])
                             subdirCount++;
+                    }
                     return subdirCount;
+                }
                 return subdirCount;
+            }
+        }
         return 0;
+    }
     - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
         if (outlineView == syncContainersOutlineView) {
             if (item == nil)
         if (outlineView == syncAccountsOutlineView) {
             if (item == nil) {
                 // root: [ <my account>, <sharing account>+ ]
                 if (index == 0)
                     return syncAccountsMyAccountNode;
                 else
                     return [selectedPithosAccount.sharingAccountsNode.children objectAtIndex:(index - 1)];
             } else if (item == syncAccountsMyAccountNode) {
                 // root/<my account>: [ <container>+ ]
                 return [selectedPithosAccount.accountNode.children objectAtIndex:index];
             if ([item class] == [PithosContainerNode class]) {
             } else if ([item class] == [PithosAccountNode class]) {
                 // root/<sharing account>: [ <container>+ ]
                 return [((PithosAccountNode *)item).children objectAtIndex:index];
             } else if ([item class] == [PithosContainerNode class]) {
                 // root/{<my account>, <sharing account>}/<container>: [ <subdir>+, <root files> ]
                 PithosContainerNode *containerNode = (PithosContainerNode *)item;
                 NSInteger currentSubdirIndex = -1;
                 for (PithosNode *node in containerNode.children) {
-...
+                    }
+                }
                 if (++currentSubdirIndex == index) {
                     PithosEmptyNode *rootFilesNode = [syncContainersRootFilesNodes objectForKey:containerNode.displayName];
                     NSString *accountName = containerNode.sharingAccount;
                     if (!accountName)
                         accountName = @"";
                     PithosEmptyNode *rootFilesNode = [[syncAccountsRootFilesNodes objectForKey:accountName]
                                                       objectForKey:containerNode.displayName];
                     if (!rootFilesNode) {
                         if (![syncAccountsRootFilesNodes objectForKey:accountName])
                             [syncAccountsRootFilesNodes setObject:[NSMutableDictionary dictionary] forKey:accountName];
                         rootFilesNode = [[[PithosEmptyNode alloc] initWithDisplayName:@"<root files>"
                                                                                  icon:[[NSWorkspace sharedWorkspace] iconForFileType:@""]]
                                          autorelease];
                         rootFilesNode.parent = containerNode;
                         [syncContainersRootFilesNodes setObject:rootFilesNode forKey:containerNode.displayName];
                         [[syncAccountsRootFilesNodes objectForKey:accountName] setObject:rootFilesNode forKey:containerNode.displayName];
+                    }
                     return rootFilesNode;
+                }
-...
+    }
     - (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
         if (outlineView == syncContainersOutlineView) {
             if ([item class] == [PithosContainerNode class])
         if (outlineView == syncAccountsOutlineView) {
             if ((item == syncAccountsMyAccountNode) ||
                 ([item class] == [PithosAccountNode class]) ||
                 ([item class] == [PithosContainerNode class]))
                 return YES;
+        }
         return NO;
+    }
     - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
         if (outlineView == syncContainersOutlineView) {
         if (outlineView == syncAccountsOutlineView) {
             if ([[tableColumn identifier] isEqualToString:@"sync"]) {
                 if ([item class] == [PithosContainerNode class]) {
                 if (item == syncAccountsMyAccountNode) {
                     // root/<my account>
                     // My account is
                     // off if not in dictionary
                     // mixed if in dictionary with exclusions
                     // on if in dictionary without exclusions
                     NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:@""];
                     if (syncContainersDictionary) {
                         for (PithosContainerNode *node in selectedPithosAccount.accountNode.children) {
                             NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
                             if (!containerExcludedDirectories || [containerExcludedDirectories count])
                                 return [NSNumber numberWithUnsignedInteger:NSMixedState];
+                        }
                         return [NSNumber numberWithUnsignedInteger:NSOnState];
+                    }
                     return [NSNumber numberWithUnsignedInteger:NSOffState];
                 } else if ([item class] == [PithosAccountNode class]) {
                     // root/<sharing account>
                     // A sharing account is
                     // off if not in dictionary
                     // mixed if in dictionary with exclusions
                     // on if in dictionary without exclusions
                     PithosAccountNode *accountNode = (PithosAccountNode *)item;
                     NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountNode.displayName];
                     if (syncContainersDictionary) {
                         for (PithosContainerNode *node in accountNode.children) {
                             NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
                             if (!containerExcludedDirectories || [containerExcludedDirectories count])
                                 return [NSNumber numberWithUnsignedInteger:NSMixedState];
+                        }
                         return [NSNumber numberWithUnsignedInteger:NSOnState];
+                    }
                     return [NSNumber numberWithUnsignedInteger:NSOffState];
                 } else if ([item class] == [PithosContainerNode class]) {
                     // root/{<my account>, <sharing account>}/<container>
                     // A container is
                     // off if not in dictionary
                     // mixed if in dictionary with exclusions
                     // on if in dictionary without exclusions
                     PithosContainerNode *node = (PithosContainerNode *)item;
                     NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.displayName];
                     NSString *accountName = node.sharingAccount;
                     if (!accountName)
                         accountName = @"";
                     NSMutableArray *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName]
                                                                     objectForKey:node.displayName];
                     if (containerExcludedDirectories) {
                         if ([containerExcludedDirectories count])
                             return [NSNumber numberWithUnsignedInteger:NSMixedState];
-...
+                    }
                     return [NSNumber numberWithUnsignedInteger:NSOffState];
                 } else if ([item class] == [PithosSubdirNode class]) {
                     // Root files are off if parent container not in dictionary or if excluded
                     // root/{<my account>, <sharing account>}/<container>/<subdir>
                     // Directory is off if parent container not in dictionary or if excluded
                     // displayName should be localized and lowercased
                     PithosSubdirNode *node = (PithosSubdirNode *)item;
                     NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
                     NSString *directoryName = [[node.displayName lowercaseString] stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                     if (!containerExcludedDirectories || [containerExcludedDirectories containsObject:directoryName])
                     NSString *accountName = node.sharingAccount;
                     if (!accountName)
                         accountName = @"";
                     NSMutableArray *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName]
                                                                     objectForKey:node.parent.displayName];
                     if (!containerExcludedDirectories ||
                         [containerExcludedDirectories
                          containsObject:[[node.displayName lowercaseString] stringByReplacingOccurrencesOfString:@"/" withString:@":"]])
                         return [NSNumber numberWithUnsignedInteger:NSOffState];
                     else
                         return [NSNumber numberWithUnsignedInteger:NSOnState];
                 } else if ([item class] == [PithosEmptyNode class]) {
                     // Root files are off if parent container not in dictionary or if excluded
                     // root/{<my account>, <sharing account>}/<container>/<root files>
                     // Root files is off if parent container not in dictionary or if excluded
                     PithosEmptyNode *node = (PithosEmptyNode *)item;
                     NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
                     NSString *accountName = node.parent.sharingAccount;
                     if (!accountName)
                         accountName = @"";
                     NSMutableArray *containerExcludedDirectories = [[syncAccountsDictionary objectForKey:accountName]
                                                                     objectForKey:node.parent.displayName];
                     if (!containerExcludedDirectories || [containerExcludedDirectories containsObject:@""])
                         return [NSNumber numberWithUnsignedInteger:NSOffState];
                     else
-...
+    }
     - (void)outlineView:(NSOutlineView *)outlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
         if (outlineView == syncContainersOutlineView) {
         if (outlineView == syncAccountsOutlineView) {
             if ([[tableColumn identifier] isEqualToString:@"sync"]) {
                 NSCellStateValue newState = [object unsignedIntegerValue];
                 if ([item class] == [PithosContainerNode class]) {
                 if (item == syncAccountsMyAccountNode) {
                     // root/<my account>
                     // If new state is
                     // mixed/on include my account with no exclusions
                     // off exclude my account
                     if ((newState == NSOnState) || (newState == NSMixedState)) {
                         NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
                         for (PithosContainerNode *node in selectedPithosAccount.accountNode.children) {
                             [syncContainersDictionary setObject:[NSMutableArray array] forKey:node.displayName];
+                        }
                         [syncAccountsDictionary setObject:syncContainersDictionary forKey:@""];
                     } else {
                         [syncAccountsDictionary removeObjectForKey:@""];
+                    }
                     [outlineView reloadItem:item reloadChildren:YES];
                 } else if ([item class] == [PithosAccountNode class]) {
                     // root/<sharing account>
                     // If new state is
                     // mixed/on include sharing account with no exclusions
                     // off exclude sharing account
                     PithosAccountNode *accountNode = (PithosAccountNode *)item;
                     if ((newState == NSOnState) || (newState == NSMixedState)) {
                         NSMutableDictionary *syncContainersDictionary = [NSMutableDictionary dictionary];
                         for (PithosContainerNode *node in accountNode.children) {
                             [syncContainersDictionary setObject:[NSMutableArray array] forKey:node.displayName];
+                        }
                         [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountNode.displayName];
                     } else {
                         [syncAccountsDictionary removeObjectForKey:accountNode.displayName];
+                    }
                     [outlineView reloadItem:item reloadChildren:YES];
                 } else if ([item class] == [PithosContainerNode class]) {
                     // root/{<my account>, <sharing account>}/<container>
                     // If new state is
                     // mixed/on include container with no excluded directories
                     // off exclude container
                     PithosContainerNode *node = (PithosContainerNode *)item;
                     NSString *accountName = node.sharingAccount;
                     PithosNode *accountNode = node.parent;
                     if (!accountName) {
                         accountName = @"";
                         accountNode = syncAccountsMyAccountNode;
+                    }
                     NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountName];
                     if ((newState == NSOnState) || (newState == NSMixedState)) {
                         if (!syncContainersDictionary) {
                             syncContainersDictionary = [NSMutableDictionary dictionary];
                             [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
+                        }
                         [syncContainersDictionary setObject:[NSMutableArray array] forKey:node.displayName];
                     } else {
                     } else if (syncContainersDictionary) {
                         [syncContainersDictionary removeObjectForKey:node.displayName];
                         if (![syncContainersDictionary count])
                             [syncAccountsDictionary removeObjectForKey:accountName];
+                    }
                     [outlineView reloadItem:item reloadChildren:YES];
                     [outlineView reloadItem:accountNode reloadChildren:YES];
                 } else if ([item class] == [PithosSubdirNode class]) {
                     // root/{<my account>, <sharing account>}/<container>/<subdir>
                     // If new state is
                     // mixed/on include directory (if container not included, include and exclude all others)
                     // off exclude directory
                     PithosSubdirNode *node = (PithosSubdirNode *)item;
                     NSString *accountName = node.sharingAccount;
                     PithosNode *accountNode = node.parent.parent;
                     if (!accountName) {
                         accountName = @"";
                         accountNode = syncAccountsMyAccountNode;
+                    }
                     NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountName];
                     NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
                     NSString *directoryName = [[node.displayName lowercaseString] stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                     if ((newState == NSOnState) || (newState == NSMixedState)) {
                         if (containerExcludedDirectories) {
                             [containerExcludedDirectories removeObject:directoryName];
                         } else {
                             if (!syncContainersDictionary) {
                                 syncContainersDictionary = [NSMutableDictionary dictionary];
                                 [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
+                            }
                             NSMutableArray *newContainerExcludeDirectories = [NSMutableArray arrayWithObject:@""];
                             for (PithosNode *siblingNode in node.parent.children) {
                                 if ([siblingNode class] == [PithosSubdirNode class]) {
                                     NSString *siblingDirectoryName = [[siblingNode.displayName lowercaseString] stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                                     NSString *siblingDirectoryName = [[siblingNode.displayName lowercaseString]
                                                                       stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                                     if (![siblingDirectoryName isEqualToString:directoryName] &&
                                         ![newContainerExcludeDirectories containsObject:siblingDirectoryName])
                                         [newContainerExcludeDirectories addObject:siblingDirectoryName];
-...
+                            }
                             [syncContainersDictionary setObject:newContainerExcludeDirectories forKey:node.parent.displayName];
+                        }
                     } else if (![containerExcludedDirectories containsObject:directoryName]) {
                     } else if (syncContainersDictionary &&
                                containerExcludedDirectories &&
                                ![containerExcludedDirectories containsObject:directoryName]) {
                         [containerExcludedDirectories addObject:directoryName];
+                    }
                     [outlineView reloadItem:[outlineView parentForItem:item]];
                     [outlineView reloadItem:accountNode reloadChildren:YES];
                 } else if ([item class] == [PithosEmptyNode class]) {
                     // If new state is
                     // mixed/on include root files (if container not included, include and exclude all others)
                     // off exclude root files
                     PithosEmptyNode *node = (PithosEmptyNode *)item;
                     NSString *accountName = node.parent.sharingAccount;
                     PithosNode *accountNode = node.parent.parent;
                     if (!accountName) {
                         accountName = @"";
                         accountNode = syncAccountsMyAccountNode;
+                    }
                     NSMutableDictionary *syncContainersDictionary = [syncAccountsDictionary objectForKey:accountName];
                     NSMutableArray *containerExcludedDirectories = [syncContainersDictionary objectForKey:node.parent.displayName];
                     if ((newState == NSOnState) || (newState == NSMixedState)) {
                         if (containerExcludedDirectories) {
                             [containerExcludedDirectories removeObject:@""];
                         } else {
                             if (!syncContainersDictionary) {
                                 syncContainersDictionary = [NSMutableDictionary dictionary];
                                 [syncAccountsDictionary setObject:syncContainersDictionary forKey:accountName];
+                            }
                             NSMutableArray *newContainerExcludeDirectories = [NSMutableArray array];
                             for (PithosNode *siblingNode in node.parent.children) {
                                 if ([siblingNode class] == [PithosSubdirNode class]) {
                                     NSString *siblingDirectoryName = [[siblingNode.displayName lowercaseString] stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                                     NSString *siblingDirectoryName = [[siblingNode.displayName lowercaseString]
                                                                       stringByReplacingOccurrencesOfString:@"/" withString:@":"];
                                     if (![newContainerExcludeDirectories containsObject:siblingDirectoryName])
                                         [newContainerExcludeDirectories addObject:siblingDirectoryName];
+                                }
+                            }
                             [syncContainersDictionary setObject:newContainerExcludeDirectories forKey:node.parent.displayName];
+                        }
                     } else if (![containerExcludedDirectories containsObject:@""]) {
                     } else if (syncContainersDictionary &&
                                containerExcludedDirectories &&
                                ![containerExcludedDirectories containsObject:@""]) {
                         [containerExcludedDirectories addObject:@""];
+                    }
                     [outlineView reloadItem:[outlineView parentForItem:item]];
                     [outlineView reloadItem:accountNode reloadChildren:YES];
+                }
                 [self updateSync];
+            }

     											<int key="NSvFlags">256</int>
     											<string key="NSFrameSize">{118, 215}</string>
     											<reference key="NSSuperview" ref="475745140"/>
     											<reference key="NSNextKeyView" ref="366650902"/>
     											<reference key="NSWindow"/>
     											<reference key="NSNextKeyView" ref="316124907"/>
     											<string key="NSReuseIdentifierKey">_NS:1828</string>
     											<bool key="NSEnabled">YES</bool>
     											<object class="NSTableHeaderView" key="NSHeaderView" id="152792208">
-...
     												<int key="NSvFlags">256</int>
     												<string key="NSFrameSize">{118, 17}</string>
     												<reference key="NSSuperview" ref="316124907"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="475745140"/>
     												<string key="NSReuseIdentifierKey">_NS:1830</string>
     												<reference key="NSTableView" ref="260212452"/>
-...
     									</object>
     									<string key="NSFrame">{{1, 17}, {118, 215}}</string>
     									<reference key="NSSuperview" ref="419137310"/>
     									<reference key="NSWindow"/>
     									<reference key="NSNextKeyView" ref="260212452"/>
     									<string key="NSReuseIdentifierKey">_NS:1826</string>
     									<reference key="NSDocView" ref="260212452"/>
-...
     									<int key="NSvFlags">-2147483392</int>
     									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
     									<reference key="NSSuperview" ref="419137310"/>
     									<reference key="NSWindow"/>
     									<reference key="NSNextKeyView" ref="287845150"/>
     									<string key="NSReuseIdentifierKey">_NS:1845</string>
     									<reference key="NSTarget" ref="419137310"/>
-...
     									<int key="NSvFlags">-2147483392</int>
     									<string key="NSFrame">{{1, 48.325627356767654}, {82.028970718383789, 15}}</string>
     									<reference key="NSSuperview" ref="419137310"/>
     									<reference key="NSWindow"/>
     									<reference key="NSNextKeyView" ref="310368570"/>
     									<string key="NSReuseIdentifierKey">_NS:1847</string>
     									<int key="NSsFlags">1</int>
-...
     									</object>
     									<string key="NSFrame">{{1, 0}, {118, 17}}</string>
     									<reference key="NSSuperview" ref="419137310"/>
     									<reference key="NSWindow"/>
     									<reference key="NSNextKeyView" ref="152792208"/>
     									<string key="NSReuseIdentifierKey">_NS:1831</string>
     									<reference key="NSDocView" ref="152792208"/>
-...
     							</object>
     							<string key="NSFrame">{{20, 47}, {120, 233}}</string>
     							<reference key="NSSuperview" ref="369507901"/>
     							<reference key="NSNextKeyView" ref="316124907"/>
     							<reference key="NSWindow"/>
     							<reference key="NSNextKeyView" ref="475745140"/>
     							<string key="NSReuseIdentifierKey">_NS:1824</string>
     							<int key="NSsFlags">133682</int>
     							<reference key="NSVScroller" ref="310368570"/>
-...
     							<int key="NSvFlags">18</int>
     							<string key="NSFrame">{{147, 37}, {265, 249}}</string>
     							<reference key="NSSuperview" ref="369507901"/>
     							<reference key="NSWindow"/>
     							<reference key="NSNextKeyView" ref="646624756"/>
     							<string key="NSReuseIdentifierKey">_NS:608</string>
     							<object class="NSMutableArray" key="NSTabViewItems">
-...
     												<int key="NSvFlags">268</int>
     												<string key="NSFrame">{{14, 183}, {41, 14}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="96425952"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="9695847">
-...
     												<int key="NSvFlags">266</int>
     												<string key="NSFrame">{{60, 181}, {168, 19}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="571994001"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="34677607">
-...
     												<int key="NSvFlags">266</int>
     												<string key="NSFrame">{{60, 123}, {168, 19}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="1017221490"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="1001750419">
-...
     												<int key="NSvFlags">266</int>
     												<string key="NSFrame">{{60, 96}, {168, 19}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="666198740"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="350801514">
-...
     												<int key="NSvFlags">268</int>
     												<string key="NSFrame">{{14, 125}, {41, 14}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="287579732"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="993321662">
-...
     												<int key="NSvFlags">268</int>
     												<string key="NSFrame">{{14, 98}, {41, 14}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="773004803"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="1037784646">
-...
     												<int key="NSvFlags">268</int>
     												<string key="NSFrame">{{14, 150}, {86, 14}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="507142965"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSTextFieldCell" key="NSCell" id="784421446">
-...
     												<int key="NSvFlags">-2147483634</int>
     												<string key="NSFrame">{{-3, 170}, {251, 5}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="992895966"/>
     												<string key="NSOffsets">{0, 0}</string>
     												<object class="NSTextFieldCell" key="NSTitleCell">
-...
     												<int key="NSvFlags">268</int>
     												<string key="NSFrame">{{57, 72}, {63, 18}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="764785507"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSButtonCell" key="NSCell" id="269907300">
-...
     												<int key="NSvFlags">289</int>
     												<string key="NSFrame">{{161, 4}, {72, 28}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSNextKeyView"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="247568729"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSButtonCell" key="NSCell" id="950873176">
     													<int key="NSCellFlags">-2080244224</int>
-...
     												<int key="NSvFlags">289</int>
     												<string key="NSFrame">{{91, 4}, {72, 28}}</string>
     												<reference key="NSSuperview" ref="646624756"/>
     												<reference key="NSWindow"/>
     												<reference key="NSNextKeyView" ref="750494034"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSButtonCell" key="NSCell" id="327493266">
-...
     										</object>
     										<string key="NSFrame">{{10, 33}, {245, 203}}</string>
     										<reference key="NSSuperview" ref="247568729"/>
     										<reference key="NSWindow"/>
     										<reference key="NSNextKeyView" ref="1055886655"/>
     										<string key="NSReuseIdentifierKey">_NS:610</string>
     									</object>
-...
     												<int key="NSvFlags">289</int>
     												<string key="NSFrame">{{161, 4}, {72, 28}}</string>
     												<reference key="NSSuperview" ref="689284120"/>
     												<reference key="NSNextKeyView"/>
     												<reference key="NSNextKeyView" ref="247568729"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSButtonCell" key="NSCell" id="592322209">
     													<int key="NSCellFlags">-2080244224</int>
-...
     																<int key="NSvFlags">4352</int>
     																<string key="NSFrameSize">{103, 116}</string>
     																<reference key="NSSuperview" ref="748581994"/>
     																<reference key="NSNextKeyView" ref="613407224"/>
     																<reference key="NSNextKeyView" ref="881351662"/>
     																<bool key="NSEnabled">YES</bool>
     																<object class="NSTableHeaderView" key="NSHeaderView" id="94922151">
     																	<reference key="NSNextResponder" ref="5455797"/>
-...
     												</object>
     												<string key="NSFrame">{{17, 66}, {105, 134}}</string>
     												<reference key="NSSuperview" ref="635100516"/>
     												<reference key="NSNextKeyView" ref="881351662"/>
     												<reference key="NSNextKeyView" ref="748581994"/>
     												<int key="NSsFlags">133682</int>
     												<reference key="NSVScroller" ref="881351662"/>
     												<reference key="NSHScroller" ref="613407224"/>
-...
     																<int key="NSvFlags">4352</int>
     																<string key="NSFrameSize">{103, 116}</string>
     																<reference key="NSSuperview" ref="441382477"/>
     																<reference key="NSNextKeyView" ref="79495429"/>
     																<reference key="NSNextKeyView" ref="176697034"/>
     																<bool key="NSEnabled">YES</bool>
     																<object class="NSTableHeaderView" key="NSHeaderView" id="459733499">
     																	<reference key="NSNextResponder" ref="302523439"/>
-...
     												</object>
     												<string key="NSFrame">{{123, 66}, {105, 134}}</string>
     												<reference key="NSSuperview" ref="635100516"/>
     												<reference key="NSNextKeyView" ref="176697034"/>
     												<reference key="NSNextKeyView" ref="441382477"/>
     												<int key="NSsFlags">133682</int>
     												<reference key="NSVScroller" ref="176697034"/>
     												<reference key="NSHScroller" ref="79495429"/>
-...
     												<int key="NSvFlags">289</int>
     												<string key="NSFrame">{{161, 4}, {72, 28}}</string>
     												<reference key="NSSuperview" ref="635100516"/>
     												<reference key="NSNextKeyView"/>
     												<bool key="NSEnabled">YES</bool>
     												<object class="NSButtonCell" key="NSCell" id="683879656">
     													<int key="NSCellFlags">-2080244224</int>
-...
     							<int key="NSvFlags">292</int>
     							<string key="NSFrame">{{20, 19}, {20, 20}}</string>
     							<reference key="NSSuperview" ref="369507901"/>
     							<reference key="NSWindow"/>
     							<reference key="NSNextKeyView" ref="862152318"/>
     							<string key="NSReuseIdentifierKey">_NS:2510</string>
     							<bool key="NSEnabled">YES</bool>
-...
     							<int key="NSvFlags">292</int>
     							<string key="NSFrame">{{39, 19}, {20, 20}}</string>
     							<reference key="NSSuperview" ref="369507901"/>
     							<reference key="NSWindow"/>
     							<reference key="NSNextKeyView" ref="247568729"/>
     							<string key="NSReuseIdentifierKey">_NS:2510</string>
     							<bool key="NSEnabled">YES</bool>
-...
     					</object>
     					<string key="NSFrameSize">{425, 300}</string>
     					<reference key="NSSuperview"/>
     					<reference key="NSWindow"/>
     					<reference key="NSNextKeyView" ref="419137310"/>
     				</object>
     				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-...
     					<int key="connectionID">865</int>
     				</object>
     				<object class="IBConnectionRecord">
     					<object class="IBOutletConnection" key="connection">
     						<string key="label">syncContainersOutlineView</string>
     						<reference key="source" ref="1001"/>
     						<reference key="destination" ref="352868425"/>
     					</object>
     					<int key="connectionID">876</int>
     				</object>
     				<object class="IBConnectionRecord">
     					<object class="IBActionConnection" key="connection">
     						<string key="label">syncRefresh:</string>
     						<reference key="source" ref="1001"/>
-...
     					<int key="connectionID">886</int>
     				</object>
     				<object class="IBConnectionRecord">
     					<object class="IBOutletConnection" key="connection">
     						<string key="label">syncAccountsOutlineView</string>
     						<reference key="source" ref="1001"/>
     						<reference key="destination" ref="352868425"/>
     					</object>
     					<int key="connectionID">887</int>
     				</object>
     				<object class="IBConnectionRecord">
     					<object class="IBActionConnection" key="connection">
     						<string key="label">add:</string>
     						<reference key="source" ref="980977849"/>
-...
     				<reference key="dict.values" ref="0"/>
     			</object>
     			<nil key="sourceID"/>
     			<int key="maxID">886</int>
     			<int key="maxID">887</int>
     		</object>
     		<object class="IBClassDescriber" key="IBDocument.Classes">
     			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
     				<bool key="EncodedWithXMLCoder">YES</bool>
     				<object class="IBPartialClassDescription">
     					<string key="className">GroupAndGroupMemberFormatter</string>
     					<string key="superclassName">NSFormatter</string>
     					<object class="IBClassDescriptionSource" key="sourceIdentifier">
     						<string key="majorKey">IBProjectSource</string>
     						<string key="minorKey">./Classes/GroupAndGroupMemberFormatter.h</string>
     					</object>
     				</object>
     				<object class="IBPartialClassDescription">
     					<string key="className">NonEmptyStringFormatter</string>
     					<string key="superclassName">NSFormatter</string>
     					<object class="IBClassDescriptionSource" key="sourceIdentifier">
     						<string key="majorKey">IBProjectSource</string>
     						<string key="minorKey">./Classes/NonEmptyStringFormatter.h</string>
     					</object>
     				</object>
     				<object class="IBPartialClassDescription">
     					<string key="className">PithosPreferencesController</string>
     					<string key="superclassName">NSWindowController</string>
     					<object class="NSMutableDictionary" key="actions">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>addAccount:</string>
     							<string>groupsApply:</string>
     							<string>groupsRevert:</string>
     							<string>login:</string>
     							<string>loginCancel:</string>
     							<string>removeAccount:</string>
     							<string>syncApply:</string>
     							<string>syncCancel:</string>
     							<string>syncRefresh:</string>
     						</object>
     						<object class="NSArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     							<string>id</string>
     						</object>
     					</object>
     					<object class="NSMutableDictionary" key="actionInfosByName">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>addAccount:</string>
     							<string>groupsApply:</string>
     							<string>groupsRevert:</string>
     							<string>login:</string>
     							<string>loginCancel:</string>
     							<string>removeAccount:</string>
     							<string>syncApply:</string>
     							<string>syncCancel:</string>
     							<string>syncRefresh:</string>
     						</object>
     						<object class="NSArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<object class="IBActionInfo">
     								<string key="name">addAccount:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">groupsApply:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">groupsRevert:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">login:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">loginCancel:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">removeAccount:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">syncApply:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">syncCancel:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">syncRefresh:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     						</object>
     					</object>
     					<object class="NSMutableDictionary" key="outlets">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>accountsArrayController</string>
     							<string>groupsDictionaryController</string>
     							<string>selectedGroupMembersDictionaryController</string>
     							<string>syncAccountsOutlineView</string>
     						</object>
     						<object class="NSArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>NSArrayController</string>
     							<string>NSDictionaryController</string>
     							<string>NSDictionaryController</string>
     							<string>NSOutlineView</string>
     						</object>
     					</object>
     					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>accountsArrayController</string>
     							<string>groupsDictionaryController</string>
     							<string>selectedGroupMembersDictionaryController</string>
     							<string>syncAccountsOutlineView</string>
     						</object>
     						<object class="NSArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<object class="IBToOneOutletInfo">
     								<string key="name">accountsArrayController</string>
     								<string key="candidateClassName">NSArrayController</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">groupsDictionaryController</string>
     								<string key="candidateClassName">NSDictionaryController</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">selectedGroupMembersDictionaryController</string>
     								<string key="candidateClassName">NSDictionaryController</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">syncAccountsOutlineView</string>
     								<string key="candidateClassName">NSOutlineView</string>
     							</object>
     						</object>
     					</object>
     					<object class="IBClassDescriptionSource" key="sourceIdentifier">
     						<string key="majorKey">IBProjectSource</string>
     						<string key="minorKey">./Classes/PithosPreferencesController.h</string>
     					</object>
     				</object>
     			</object>
     		</object>
     		<object class="IBClassDescriber" key="IBDocument.Classes"/>
     		<int key="IBDocument.localizationMode">0</int>
     		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
     		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">

     @interface PithosSyncDaemon : NSObject {
         NSString *directoryPath;
         PithosAccount *pithosAccount;
         NSDictionary *containersDictionary;
         NSDictionary *accountsDictionary;
         ASIPithos *pithos;
         NSDictionary *containersDictionary;
         NSUInteger containersCount;
         NSMutableArray *pithosContainers;
         NSUInteger containersIndex;
-...
+    }
     @property (nonatomic, retain) NSString *directoryPath;
     @property (nonatomic, retain) NSDictionary *containersDictionary;
     @property (nonatomic, retain) NSDictionary *accountsDictionary;
     @property (nonatomic, retain) ASIPithos *pithos;
     @property (nonatomic, retain) NSDictionary *containersDictionary;
     @property (nonatomic, retain) NSMutableArray *pithosContainers;
     @property (nonatomic, retain) NSMutableDictionary *remoteObjects;
-...
     @property (nonatomic, retain) NSDate *lastCompletedSync;
     // containersDictionary contains entries with keys the container names that should be included
     // and values NSArrays that contain the directory names that should be excluded
     // (also container root file objects with these names)
     // An empty string denotes that all file objects in the container root should be excluded
     // accountsDictionary contains entries of the form
     // { <included sharing account name> : { <included container name> : [ <excluded directory names> ] } }
     // <included sharing account name> :
     //     the empty string "" denotes the user's own account
     // <excluded directory names> :
     //     the empty string "" denotes all file objects in the container root
     //     non-empty strings denote also container root file objects with these names
     // Case insensitive filesystem is assumed, so directory names should be in lowercase
     // and any trailing '/' should be replaced by ':'
     - (id)initWithDirectoryPath:(NSString *)aDirectoryPath
                   pithosAccount:(PithosAccount *)aPithosAccount
            containersDictionary:(NSDictionary *)aContainersDictionary
              accountsDictionary:(NSDictionary *)anAccountsDictionary
                 resetLocalState:(BOOL)resetLocalState;
     - (void)resetDaemon;

     @end
     @implementation PithosSyncDaemon
     @synthesize directoryPath, containersDictionary, pithos;
     @synthesize pithosContainers;
     @synthesize directoryPath, accountsDictionary, pithos;
     @synthesize containersDictionary, pithosContainers;
     @synthesize lastCompletedSync, remoteObjects, previousRemoteObjects, storedLocalObjectStates, currentLocalObjectStates;
     @synthesize pithosStateFilePath, tempDownloadsDirPath, tempTrashDirPath;
-...
     - (id)initWithDirectoryPath:(NSString *)aDirectoryPath
                   pithosAccount:(PithosAccount *)aPithosAccount
            containersDictionary:(NSDictionary *)aContainersDictionary
              accountsDictionary:(NSDictionary *)anAccountsDictionary
                 resetLocalState:(BOOL)resetLocalState {
         if ((self = [super init])) {
             directoryPath = [aDirectoryPath copy];
             pithosAccount = [aPithosAccount retain];
             containersDictionary = [aContainersDictionary copy];
             accountsDictionary = [anAccountsDictionary copy];
             self.pithos = pithosAccount.pithos;
             self.containersDictionary = [accountsDictionary objectForKey:@""];
             if (!containersDictionary)
                 self.containersDictionary = [NSDictionary dictionary];
             containersCount = [containersDictionary count];
             self.pithosContainers = [NSMutableArray arrayWithCapacity:containersCount];
             for (NSString *containerName in containersDictionary) {
-...
         [objects release];
         [lastCompletedSync release];
         [pithosContainers release];
         [pithos release];
         [containersDictionary release];
         [pithos release];
         [accountsDictionary release];
         [pithosAccount release];
         [directoryPath release];
         [super dealloc];
-...
+        }
+    }
     - (void)setContainersDictionary:(NSDictionary *)aContainersDictionary {
         if (aContainersDictionary && ![aContainersDictionary isEqualToDictionary:containersDictionary]) {
     - (void)setAccountsDictionary:(NSDictionary *)anAccountsDictionary {
         if (anAccountsDictionary && ![anAccountsDictionary isEqualToDictionary:accountsDictionary]) {
             [self resetDaemon];
             [containersDictionary release];
             containersDictionary = [aContainersDictionary copy];
             [accountsDictionary release];
             accountsDictionary = [anAccountsDictionary copy];
             self.containersDictionary = [accountsDictionary objectForKey:@""];
             if (!containersDictionary)
                 self.containersDictionary = [NSDictionary dictionary];
             containersCount = [containersDictionary count];
             self.pithosContainers = [NSMutableArray arrayWithCapacity:containersCount];
             for (NSString *containerName in aContainersDictionary) {
             for (NSString *containerName in containersDictionary) {
                 ASIPithosContainer *pithosContainer = [ASIPithosContainer container];
                 pithosContainer.name = containerName;
                 [pithosContainers addObject:pithosContainer];

Also available in: Unified diff

Synnefo » Pithos MacOS Client

Revision e8dc9335