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

 DD30613E6BB2000ED982F /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 610DD30413E6BB2000ED982F /* Credits.rtf */; };
 DD30913E6BB2000ED982F /* pithos_macosAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD30813E6BB2000ED982F /* pithos_macosAppDelegate.m */; };
 DD30C13E6BB2000ED982F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 610DD30A13E6BB2000ED982F /* MainMenu.xib */; };
 DD33E13E6BD8B00ED982F /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32013E6BD8B00ED982F /* ASIDataCompressor.m */; };
 DD33F13E6BD8B00ED982F /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32213E6BD8B00ED982F /* ASIDataDecompressor.m */; };
 DD34013E6BD8B00ED982F /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32413E6BD8B00ED982F /* ASIDownloadCache.m */; };
 DD34113E6BD8B00ED982F /* ASIFormDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32613E6BD8B00ED982F /* ASIFormDataRequest.m */; };
 DD34213E6BD8B00ED982F /* ASIHTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32813E6BD8B00ED982F /* ASIHTTPRequest.m */; };
 DD34313E6BD8B00ED982F /* ASIInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32C13E6BD8B00ED982F /* ASIInputStream.m */; };
 DD34413E6BD8B00ED982F /* ASINetworkQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32E13E6BD8B00ED982F /* ASINetworkQueue.m */; };
 DD34513E6BD8B00ED982F /* ASIPithosAccountRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33213E6BD8B00ED982F /* ASIPithosAccountRequest.m */; };
 DD34613E6BD8B00ED982F /* ASIPithosContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33413E6BD8B00ED982F /* ASIPithosContainer.m */; };
 DD34713E6BD8B00ED982F /* ASIPithosContainerRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33613E6BD8B00ED982F /* ASIPithosContainerRequest.m */; };
 DD34813E6BD8B00ED982F /* ASIPithosObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33813E6BD8B00ED982F /* ASIPithosObject.m */; };
 DD34913E6BD8B00ED982F /* ASIPithosObjectRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33A13E6BD8B00ED982F /* ASIPithosObjectRequest.m */; };
 DD34A13E6BD8B00ED982F /* ASIPithosRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33C13E6BD8B00ED982F /* ASIPithosRequest.m */; };
 DD33E13E6BD8B00ED982F /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32013E6BD8B00ED982F /* ASIDataCompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD33F13E6BD8B00ED982F /* ASIDataDecompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32213E6BD8B00ED982F /* ASIDataDecompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34013E6BD8B00ED982F /* ASIDownloadCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32413E6BD8B00ED982F /* ASIDownloadCache.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34113E6BD8B00ED982F /* ASIFormDataRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32613E6BD8B00ED982F /* ASIFormDataRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34213E6BD8B00ED982F /* ASIHTTPRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32813E6BD8B00ED982F /* ASIHTTPRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34313E6BD8B00ED982F /* ASIInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32C13E6BD8B00ED982F /* ASIInputStream.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34413E6BD8B00ED982F /* ASINetworkQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD32E13E6BD8B00ED982F /* ASINetworkQueue.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34513E6BD8B00ED982F /* ASIPithosAccountRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33213E6BD8B00ED982F /* ASIPithosAccountRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34613E6BD8B00ED982F /* ASIPithosContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33413E6BD8B00ED982F /* ASIPithosContainer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34713E6BD8B00ED982F /* ASIPithosContainerRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33613E6BD8B00ED982F /* ASIPithosContainerRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34813E6BD8B00ED982F /* ASIPithosObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33813E6BD8B00ED982F /* ASIPithosObject.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34913E6BD8B00ED982F /* ASIPithosObjectRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33A13E6BD8B00ED982F /* ASIPithosObjectRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34A13E6BD8B00ED982F /* ASIPithosRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD33C13E6BD8B00ED982F /* ASIPithosRequest.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 DD34E13E6BEF400ED982F /* PithosBrowserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD34D13E6BEF400ED982F /* PithosBrowserController.m */; };
 DD35013E6C00E00ED982F /* PithosBrowserController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 610DD34F13E6C00E00ED982F /* PithosBrowserController.xib */; };
 DD35413E6C09100ED982F /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 610DD35313E6C09100ED982F /* CoreServices.framework */; };
-...
 B9143E51E000363787 /* GroupAndGroupMemberFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 613629B8143E51E000363787 /* GroupAndGroupMemberFormatter.m */; };
     		6139837113EFEECC004CE444 /* FileSystemBrowserCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6139837013EFEECC004CE444 /* FileSystemBrowserCell.m */; };
 BA8631461520E00FACAA5 /* NonEmptyStringFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 613BA8621461520E00FACAA5 /* NonEmptyStringFormatter.m */; };
 A914CEF0E7008D973A /* ASIPithos.m in Sources */ = {isa = PBXBuildFile; fileRef = 614299A814CEF0E7008D973A /* ASIPithos.m */; };
 A914CEF0E7008D973A /* ASIPithos.m in Sources */ = {isa = PBXBuildFile; fileRef = 614299A814CEF0E7008D973A /* ASIPithos.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 BC9141BA1CE00CD978D /* HashMapHash.m in Sources */ = {isa = PBXBuildFile; fileRef = 61433BC8141BA1CE00CD978D /* HashMapHash.m */; };
 BC1417CE70002E7A8C /* ASIPithosAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 614592BB1417CE70002E7A8C /* ASIPithosAccount.m */; };
 BC1417CE70002E7A8C /* ASIPithosAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 614592BB1417CE70002E7A8C /* ASIPithosAccount.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 EEC8414E16EB5009DEFCC /* PithosAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 614EEC8314E16EB5009DEFCC /* PithosAccount.m */; };
 D08C143200CC00803874 /* PithosSharingAccountsNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6152D08B143200CC00803874 /* PithosSharingAccountsNode.m */; };
 D092143334CC00803874 /* AllowedToBoolTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6152D091143334CC00803874 /* AllowedToBoolTransformer.m */; };
-...
 F040F31448547000A0C788 /* FileMD5Hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 61F040F11448547000A0C788 /* FileMD5Hash.c */; };
 F04132144DB97200A0C788 /* PithosLocalObjectState.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F040EE144757B500A0C788 /* PithosLocalObjectState.m */; };
 F04133144DB97600A0C788 /* PithosSyncDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F040EA144724F500A0C788 /* PithosSyncDaemon.m */; };
     		E26038A7150009E400DAC6EB /* InspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = E260389C150009E400DAC6EB /* InspectorPane.m */; };
     		E26038A8150009E400DAC6EB /* InspectorPaneBody.m in Sources */ = {isa = PBXBuildFile; fileRef = E260389E150009E400DAC6EB /* InspectorPaneBody.m */; };
     		E26038A9150009E400DAC6EB /* InspectorPaneContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A0150009E400DAC6EB /* InspectorPaneContainer.m */; };
     		E26038AA150009E400DAC6EB /* InspectorPaneHead.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A2150009E400DAC6EB /* InspectorPaneHead.m */; };
     		E26038AB150009E400DAC6EB /* NSBezierPath+StrokeExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A4150009E400DAC6EB /* NSBezierPath+StrokeExtensions.m */; };
     		E26038AC150009E400DAC6EB /* NSWindow+Geometry.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A6150009E400DAC6EB /* NSWindow+Geometry.m */; };
     		E26038A7150009E400DAC6EB /* InspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = E260389C150009E400DAC6EB /* InspectorPane.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
     		E26038A8150009E400DAC6EB /* InspectorPaneBody.m in Sources */ = {isa = PBXBuildFile; fileRef = E260389E150009E400DAC6EB /* InspectorPaneBody.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
     		E26038A9150009E400DAC6EB /* InspectorPaneContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A0150009E400DAC6EB /* InspectorPaneContainer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
     		E26038AA150009E400DAC6EB /* InspectorPaneHead.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A2150009E400DAC6EB /* InspectorPaneHead.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
     		E26038AB150009E400DAC6EB /* NSBezierPath+StrokeExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A4150009E400DAC6EB /* NSBezierPath+StrokeExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
     		E26038AC150009E400DAC6EB /* NSWindow+Geometry.m in Sources */ = {isa = PBXBuildFile; fileRef = E26038A6150009E400DAC6EB /* NSWindow+Geometry.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
     		E26038B215000C4B00DAC6EB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E26038B115000C4B00DAC6EB /* QuartzCore.framework */; };
     /* End PBXBuildFile section */
-...
     			isa = XCBuildConfiguration;
     			buildSettings = {
     				ALWAYS_SEARCH_USER_PATHS = NO;
     				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
     				CLANG_ENABLE_OBJC_ARC = YES;
     				COMBINE_HIDPI_IMAGES = YES;
     				COPY_PHASE_STRIP = NO;
     				GCC_DYNAMIC_NO_PIC = NO;
-...
     				GCC_PRECOMPILE_PREFIX_HEADER = YES;
     				GCC_PREFIX_HEADER = "pithos-macos/pithos-macos-Prefix.pch";
     				INFOPLIST_FILE = "pithos-macos/pithos-macos-Info.plist";
     				MACOSX_DEPLOYMENT_TARGET = 10.6.8;
     				PRODUCT_NAME = "$(TARGET_NAME)";
     				WRAPPER_EXTENSION = app;
     			};
-...
     			isa = XCBuildConfiguration;
     			buildSettings = {
     				ALWAYS_SEARCH_USER_PATHS = NO;
     				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
     				CLANG_ENABLE_OBJC_ARC = YES;
     				COMBINE_HIDPI_IMAGES = YES;
     				COPY_PHASE_STRIP = YES;
     				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-...
     				GCC_PRECOMPILE_PREFIX_HEADER = YES;
     				GCC_PREFIX_HEADER = "pithos-macos/pithos-macos-Prefix.pch";
     				INFOPLIST_FILE = "pithos-macos/pithos-macos-Info.plist";
     				MACOSX_DEPLOYMENT_TARGET = 10.6.8;
     				PRODUCT_NAME = "$(TARGET_NAME)";
     				WRAPPER_EXTENSION = app;
     			};

b/pithos-macos/AllowedToBoolTransformer.m
54	54	}
55	55
56	56	+ (void)initialize {
57		[[self class] setValueTransformer:[[self new] autorelease] forName:@"AllowedToBoolTransformer"];
	57	[[self class] setValueTransformer:[self new] forName:@"AllowedToBoolTransformer"];
58	58	}
59	59
60	60	@end

     - (id)transformedValue:(id)value {
         if (value == nil)
     		return nil;
         NSNumberFormatter *numberFormatter = [[[NSNumberFormatter alloc] init] autorelease];
         NSNumberFormatter *numberFormatter = [[NSNumberFormatter alloc] init];
         [numberFormatter setGroupingSeparator:@","];
         [numberFormatter setUsesGroupingSeparator:YES];
         [numberFormatter setGroupingSize:3];
-...
+    }
     + (void)initialize {
         [[self class] setValueTransformer:[[self new] autorelease] forName:@"BytesExtendedSizeTransformer"];
         [[self class] setValueTransformer:[self new] forName:@"BytesExtendedSizeTransformer"];
+    }
     @end

b/pithos-macos/BytesSizeTransformer.m
83	83	}
84	84
85	85	+ (void)initialize {
86		[[self class] setValueTransformer:[[self new] autorelease] forName:@"BytesSizeTransformer"];
	86	[[self class] setValueTransformer:[self new] forName:@"BytesSizeTransformer"];
87	87	}
88	88
89	89	@end

b/pithos-macos/CountTransformer.m
54	54	}
55	55
56	56	+ (void)initialize {
57		[[self class] setValueTransformer:[[self new] autorelease] forName:@"CountTransformer"];
	57	[[self class] setValueTransformer:[self new] forName:@"CountTransformer"];
58	58	}
59	59
60	60	@end

b/pithos-macos/DirPathFileURLTransformer.m
60	60	}
61	61
62	62	+ (void)initialize {
63		[[self class] setValueTransformer:[[self new] autorelease] forName:@"DirPathFileURLTransformer"];
	63	[[self class] setValueTransformer:[self new] forName:@"DirPathFileURLTransformer"];
64	64	}
65	65
66	66	@end

         NSColor *_labelColor;
+    }
     @property(retain) NSImage *image;
     @property(retain) NSColor *labelColor;
     @property(strong) NSImage *image;
     @property(strong) NSColor *labelColor;
     @end

         return result;
+    }
     - (void)dealloc {
         [_image release];
         [_labelColor release];
         [super dealloc];
+    }
     @synthesize image = _image;
     @synthesize labelColor = _labelColor;
-...
                 [transform scaleXBy:1.0 yBy:-1.0];
                 [transform translateXBy:0 yBy:-cellFrame.origin.y];
                 [transform concat];
                 [transform release];
+            }
             [self.image drawInRect:imageRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
             if (flipped) {

b/pithos-macos/GroupMembersDictionaryTransformer.m
71	71	}
72	72
73	73	+ (void)initialize {
74		[[self class] setValueTransformer:[[self new] autorelease] forName:@"GroupMembersDictionaryTransformer"];
	74	[[self class] setValueTransformer:[self new] forName:@"GroupMembersDictionaryTransformer"];
75	75	}
76	76
77	77	@end

b/pithos-macos/ImageAndTextCell.m
78	78	// -------------------------------------------------------------------------------
79	79	- (void)dealloc
80	80	{
81		[image release];
82	81	image = nil;
83		[super dealloc];
84	82	}
85	83
86	84	// -------------------------------------------------------------------------------
...	...
89	87	- (id)copyWithZone:(NSZone*)zone
90	88	{
91	89	ImageAndTextCell cell = (ImageAndTextCell)[super copyWithZone:zone];
92		cell->image = [image retain];
	90	cell->image = image;
93	91	return cell;
94	92	}
95	93
...	...
100	98	{
101	99	if (anImage != image)
102	100	{
103		[image release];
104		image = [anImage retain];
	101	image = anImage;
105	102	[image setSize:NSMakeSize(kIconImageSize, kIconImageSize)];
106	103	}
107	104	}

b/pithos-macos/LastCompletedSyncTransformer.m
75	75	}
76	76
77	77	+ (void)initialize {
78		[[self class] setValueTransformer:[[self new] autorelease] forName:@"LastCompletedSyncTransformer"];
	78	[[self class] setValueTransformer:[self new] forName:@"LastCompletedSyncTransformer"];
79	79	}
80	80
81	81	@end

b/pithos-macos/LastModifiedDateTransformer.m
76	76	}
77	77
78	78	+ (void)initialize {
79		[[self class] setValueTransformer:[[self new] autorelease] forName:@"LastModifiedDateTransformer"];
	79	[[self class] setValueTransformer:[self new] forName:@"LastModifiedDateTransformer"];
80	80	}
81	81
82	82	@end

b/pithos-macos/MetadataKeyTransformer.m
58	58	}
59	59
60	60	+ (void)initialize {
61		[[self class] setValueTransformer:[[self new] autorelease] forName:@"MetadataKeyTransformer"];
	61	[[self class] setValueTransformer:[self new] forName:@"MetadataKeyTransformer"];
62	62	}
63	63
64	64	@end

         BOOL resetSyncDaemonLocalState;
+    }
     @property (nonatomic, retain) NSString *uniqueName;
     @property (nonatomic, strong) NSString *uniqueName;
     @property (assign) BOOL active;
     @property (nonatomic, retain) NSString *name;
     @property (nonatomic, strong) NSString *name;
     @property (nonatomic, assign) BOOL syncActive;
     @property (nonatomic, retain) NSString *syncDirectoryPath;
     @property (nonatomic, retain) NSMutableDictionary *syncAccountsDictionary;
     @property (nonatomic, strong) NSString *syncDirectoryPath;
     @property (nonatomic, strong) NSMutableDictionary *syncAccountsDictionary;
     @property (nonatomic, assign) BOOL syncSkipHidden;
     @property (nonatomic, retain) NSDate *syncLastCompleted;
     @property (nonatomic, retain) PithosSyncDaemon *syncDaemon;
     @property (nonatomic, strong) NSDate *syncLastCompleted;
     @property (nonatomic, strong) PithosSyncDaemon *syncDaemon;
     @property (nonatomic, retain) NSString *serverURL;
     @property (retain) NSString *versionResource;
     @property (retain) NSString *loginResource;
     @property (retain) NSString *publicResource;
     @property (nonatomic, strong) NSString *serverURL;
     @property (strong) NSString *versionResource;
     @property (strong) NSString *loginResource;
     @property (strong) NSString *publicResource;
     @property (nonatomic, retain) NSString *authUser;
     @property (nonatomic, retain) NSString *authToken;
     @property (nonatomic, retain) NSString *storageURLPrefix;
     @property (nonatomic, retain) NSString *authURL;
     @property (nonatomic, retain) NSString *publicURLPrefix;
     @property (nonatomic, retain) NSString *loginURLPrefix;
     @property (nonatomic, strong) NSString *authUser;
     @property (nonatomic, strong) NSString *authToken;
     @property (nonatomic, strong) NSString *storageURLPrefix;
     @property (nonatomic, strong) NSString *authURL;
     @property (nonatomic, strong) NSString *publicURLPrefix;
     @property (nonatomic, strong) NSString *loginURLPrefix;
     @property (readonly) ASIPithos *pithos;
     @property (readonly) PithosAccountNode *accountNode;

     #pragma mark Object Lifecycle
     + (id)pithosAccount {
         PithosAccount *pithosAccount = [[[self alloc] init] autorelease];
         PithosAccount *pithosAccount = [[self alloc] init];
         pithosAccount.uniqueName = [NSString stringWithFormat:@"pithosAccount-%f", [NSDate timeIntervalSinceReferenceDate]];
         pithosAccount.syncSkipHidden = YES;
         pithosAccount.versionResource = @"v1";
-...
         return pithosAccount;
+    }
     - (void)dealloc {
         [sharingAccountsNode release];
         [accountNode release];
         [pithos release];
         [publicURLPrefix release];
         [loginURLPrefix release];
         [authURL release];
         [storageURLPrefix release];
         [authToken release];
         [authUser release];
         [publicResource release];
         [loginResource release];
         [versionResource release];
         [serverURL release];
         [syncDaemon release];
         [syncLastCompleted release];
         [syncAccountsDictionary release];
         [syncDirectoryPath release];
         [name release];
         [uniqueName release];
         [super dealloc];
+    }
     - (NSString *)description {
         return [NSString stringWithFormat:@"uniqueName: %@, active: %d, name: %@, syncActive: %d, syncDirectoryPath: %@, syncAccountsDictionary: %@, syncSkipHidden: %d, syncLastCompleted: %@, serverURL: %@, versionResource: %@, loginResource: %@, publicResource: %@, authUser: %@, authToken: %@, storageURLPrefix: %@, authURL: %@, loginURLPrefix: %@, publicURLPrefix: %@",
-...
     - (NSString *)name {
         if (![name length]) {
             [name release];
             NSDictionary *pithosAccountsDictionary = [(pithos_macosAppDelegate *)[[NSApplication sharedApplication] delegate] pithosAccountsDictionary];
             NSString *namePrefix = @"okeanos";
             NSUInteger nameSuffix = 1;
-...
                    [fileManager fileExistsAtPath:[documentsDirectoryPath stringByAppendingPathComponent:name]]) {
                 name = [NSString stringWithFormat:@"%@%ld", namePrefix, ++nameSuffix];
+            }
             [name retain];
+        }
         return name;
+    }
-...
         if (![self.name isEqualToString:aName] && [aName length] && ![pithosAccountsDictionary objectForKey:aName]) {
             [pithosAccountsDictionary setObject:self forKey:aName];
             [pithosAccountsDictionary removeObjectForKey:name];
             [name release];
             name = [aName retain];
             name = aName;
+        }
+    }
-...
     - (NSString *)syncDirectoryPath {
         if (![syncDirectoryPath length]) {
             [syncDirectoryPath release];
             syncDirectoryPath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]
                                   stringByAppendingPathComponent:self.name] retain];
             syncDirectoryPath = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]
                                   stringByAppendingPathComponent:self.name];
+        }
         return syncDirectoryPath;
+    }
-...
         if (![self.syncDirectoryPath isEqualToString:aSyncDirectoryPath] && [aSyncDirectoryPath length]) {
             BOOL isDirectory;
             if (![[NSFileManager defaultManager] fileExistsAtPath:aSyncDirectoryPath isDirectory:&isDirectory] || isDirectory) {
                 [syncDirectoryPath release];
                 syncDirectoryPath = [aSyncDirectoryPath retain];
                 syncDirectoryPath = aSyncDirectoryPath;
             } else {
                 return;
+            }
             @synchronized(self) {
                 resetSyncDaemonLocalState = YES;
                 [syncLastCompleted release];
                 syncLastCompleted = nil;
+            }
+        }
-...
     - (NSMutableDictionary *)syncAccountsDictionary {
         if (!syncAccountsDictionary) {
             syncAccountsDictionary = [[NSMutableDictionary dictionaryWithObject:[NSMutableDictionary dictionaryWithObject:[NSMutableSet set]
             syncAccountsDictionary = [NSMutableDictionary dictionaryWithObject:[NSMutableDictionary dictionaryWithObject:[NSMutableSet set]
                                                                                                                    forKey:@"pithos"]
                                                                          forKey:@""] retain];
                                                                          forKey:@""];
+        }
         return syncAccountsDictionary;
+    }
     - (void)setSyncAccountsDictionary:(NSMutableDictionary *)aSyncAccountsDictionary {
         if (aSyncAccountsDictionary && ![self.syncAccountsDictionary isEqualToDictionary:aSyncAccountsDictionary]) {
             [syncAccountsDictionary release];
             syncAccountsDictionary = [[NSMutableDictionary alloc] initWithCapacity:[aSyncAccountsDictionary count]];
             for (NSString *accountName in aSyncAccountsDictionary) {
                 NSDictionary *aSyncContainersDictionary = [aSyncAccountsDictionary objectForKey:accountName];
-...
             @synchronized(self) {
                 resetSyncDaemonLocalState = YES;
                 [syncLastCompleted release];
                 syncLastCompleted = nil;
+            }
+        }
-...
     - (NSDate *)syncLastCompleted {
         if (self.syncDaemon.lastCompletedSync && ![self.syncDaemon.lastCompletedSync isEqualToDate:syncLastCompleted]) {
             [syncLastCompleted release];
             syncLastCompleted = [self.syncDaemon.lastCompletedSync copy];
+        }
         return syncLastCompleted;
-...
     - (NSString *)serverURL {
         if (![self urlIsValid:serverURL]) {
             [serverURL release];
             serverURL = [@"https://pithos.okeanos.grnet.gr" retain];
             serverURL = @"https://pithos.okeanos.grnet.gr";
+        }
         return serverURL;
+    }
     - (void)setServerURL:(NSString *)aServerURL {
         if (![self.serverURL isEqualToString:aServerURL] && [self urlIsValid:aServerURL]) {
             [serverURL release];
             serverURL = [aServerURL retain];
             [storageURLPrefix release];
             serverURL = aServerURL;
             storageURLPrefix = nil;
             [authURL release];
             authURL = nil;
             [publicURLPrefix release];
             publicURLPrefix = nil;
             [loginURLPrefix release];
             loginURLPrefix = nil;
             @synchronized(self) {
                 updatePithos = YES;
                 resetSyncDaemonLocalState = YES;
                 [syncLastCompleted release];
                 syncLastCompleted = nil;
+            }
+        }
-...
     - (void)setAuthUser:(NSString *)anAuthUser {
         if ([anAuthUser length] && ![anAuthUser isEqualToString:authUser]) {
             [authUser release];
             authUser = [anAuthUser retain];
             authUser = anAuthUser;
             @synchronized(self) {
                 updatePithos = YES;
                 resetSyncDaemonLocalState = YES;
                 [syncLastCompleted release];
                 syncLastCompleted = nil;
+            }
-...
     - (void)setAuthToken:(NSString *)anAuthToken {
         if ([anAuthToken length] && ![anAuthToken isEqualToString:authToken]) {
             [authToken release];
             authToken = [anAuthToken retain];
             authToken = anAuthToken;
             @synchronized(self) {
                 updatePithos = YES;
-...
     - (NSString *)storageURLPrefix {
         if (![self urlIsValid:storageURLPrefix]) {
             [storageURLPrefix release];
             if (versionResource)
                 storageURLPrefix = [[self.serverURL stringByAppendingFormat:@"/%@", versionResource] retain];
                 storageURLPrefix = [self.serverURL stringByAppendingFormat:@"/%@", versionResource];
             else
                 storageURLPrefix = [self.serverURL copy];
+        }
-...
     - (void)setStorageURLPrefix:(NSString *)aStorageURLPrefix {
         if (![self.storageURLPrefix isEqualToString:aStorageURLPrefix] && [self urlIsValid:aStorageURLPrefix]) {
             [storageURLPrefix release];
             storageURLPrefix = [aStorageURLPrefix retain];
             storageURLPrefix = aStorageURLPrefix;
+        }
+    }
     - (NSString *)authURL {
         if (![self urlIsValid:authURL]) {
             [authURL release];
             if (versionResource)
                 authURL = [[self.serverURL stringByAppendingFormat:@"/%@", versionResource] retain];
                 authURL = [self.serverURL stringByAppendingFormat:@"/%@", versionResource];
             else
                 authURL = [self.serverURL copy];
+        }
-...
     - (void)setAuthURL:(NSString *)anAuthURL {
         if (![self.authURL isEqualToString:anAuthURL] && [self urlIsValid:anAuthURL]) {
             [authURL release];
             authURL = [anAuthURL retain];
             authURL = anAuthURL;
+        }
+    }
     - (NSString *)publicURLPrefix {
         if (![self urlIsValid:publicURLPrefix]) {
             [publicURLPrefix release];
             if (publicResource)
                 publicURLPrefix = [[self.serverURL stringByAppendingFormat:@"/%@", publicResource] retain];
                 publicURLPrefix = [self.serverURL stringByAppendingFormat:@"/%@", publicResource];
             else
                 publicURLPrefix = [self.serverURL copy];
+        }
-...
     - (void)setPublicURLPrefix:(NSString *)aPublicURLPrefix {
         if (![self.publicURLPrefix isEqualToString:aPublicURLPrefix] && [self urlIsValid:aPublicURLPrefix]) {
             [publicURLPrefix release];
             publicURLPrefix = [aPublicURLPrefix retain];
             publicURLPrefix = aPublicURLPrefix;
+        }
+    }
     - (NSString *)loginURLPrefix {
         if (![self urlIsValid:loginURLPrefix]) {
             [loginURLPrefix release];
             if (loginResource)
                 loginURLPrefix = [[self.serverURL stringByAppendingFormat:@"/%@", loginResource] retain];
                 loginURLPrefix = [self.serverURL stringByAppendingFormat:@"/%@", loginResource];
             else
                 loginURLPrefix = [self.serverURL copy];
+        }
-...
     - (void)setLoginURLPrefix:(NSString *)aLoginURLPrefix {
         if (![self.loginURLPrefix isEqualToString:aLoginURLPrefix] && [self urlIsValid:aLoginURLPrefix]) {
             [loginURLPrefix release];
             loginURLPrefix = [aLoginURLPrefix retain];
             loginURLPrefix = aLoginURLPrefix;
+        }
+    }
     - (ASIPithos *)pithos {
         @synchronized(self) {
             if (!pithos || updatePithos) {
                 [pithos release];
                 pithos = [[ASIPithos pithos] retain];
                 pithos = [ASIPithos pithos];
                 pithos.authUser = authUser;
                 pithos.authToken = authToken;
                 pithos.storageURLPrefix = self.storageURLPrefix;
-...
         if ((self = [super init])) {
             self.uniqueName = [decoder decodeObjectForKey:@"uniqueName"];
             self.active = [decoder decodeBoolForKey:@"active"];
             name = [[decoder decodeObjectForKey:@"name"] retain];
             name = [decoder decodeObjectForKey:@"name"];
             self.syncActive = [decoder decodeBoolForKey:@"syncActive"];
             self.syncDirectoryPath = [decoder decodeObjectForKey:@"syncDirectoryPath"];

         BOOL reset;
+    }
     @property(nonatomic, retain) ASIPithos *pithos;
     @property(nonatomic, retain) ASIPithosAccount *pithosAccount;
     @property(nonatomic, strong) ASIPithos *pithos;
     @property(nonatomic, strong) ASIPithosAccount *pithosAccount;
     - (id)initWithPithos:(ASIPithos *)aPithos;

     + (void)initialize {
     	if (self == [PithosAccountNode class])
             sharedIcon = [[[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kUserIcon)] retain];
             sharedIcon = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kUserIcon)];
+    }
     #pragma mark -
-...
     - (id)initWithPithos:(ASIPithos *)aPithos {
         if ((self = [super init])) {
             pithos = [aPithos retain];
             pithos = aPithos;
+        }
         return self;
+    }
     - (void)dealloc {
         [accountRequest clearDelegatesAndCancel];
         [accountRequest release];
         [refreshMetadataAccountRequest clearDelegatesAndCancel];
         [refreshMetadataAccountRequest release];
         [applyMetadataAccountRequest clearDelegatesAndCancel];
         [applyMetadataAccountRequest release];
         [containers release];
         [pithosAccount release];
         [pithos release];
         [super dealloc];
+    }
     #pragma mark -
-...
     - (void)setPithos:(ASIPithos *)aPithos {
         if (aPithos && ![aPithos isEqualTo:pithos]) {
             [pithos release];
             pithos = [aPithos retain];
             [url release];
             pithos = aPithos;
             url = nil;
             [accountRequest clearDelegatesAndCancel];
             [accountRequest release];
             accountRequest = nil;
             [refreshMetadataAccountRequest clearDelegatesAndCancel];
             [refreshMetadataAccountRequest release];
             refreshMetadataAccountRequest = nil;
             [applyMetadataAccountRequest clearDelegatesAndCancel];
             [applyMetadataAccountRequest release];
             applyMetadataAccountRequest = nil;
             reset = YES;
+        }
-...
         @synchronized(self) {
             if (reset) {
                 [accountRequest clearDelegatesAndCancel];
                 [accountRequest release];
                 accountRequest = nil;
                 [refreshMetadataAccountRequest clearDelegatesAndCancel];
                 [refreshMetadataAccountRequest release];
                 refreshMetadataAccountRequest = nil;
                 [applyMetadataAccountRequest clearDelegatesAndCancel];
                 [applyMetadataAccountRequest release];
                 applyMetadataAccountRequest = nil;
                 [children release];
                 children = nil;
                 [newChildren release];
                 newChildren = nil;
                 self.pithosAccount = nil;
                 freshness = PithosNodeStateRefreshNeeded;
-...
                     break;
                 case PithosNodeStateRefreshNeeded:
                     freshness = PithosNodeStateRefreshing;
                     accountRequest = [[ASIPithosAccountRequest listContainersRequestWithPithos:pithos
                     accountRequest = [ASIPithosAccountRequest listContainersRequestWithPithos:pithos
                                                                                          limit:0
                                                                                         marker:nil
                                                                                         shared:shared
                                                                                          until:nil] retain];
                                                                                          until:nil];
                     if (sharingAccount)
                         [accountRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
                     else if (!forcedRefresh)
-...
                     break;
                 case PithosNodeStateRefreshFinished:
                     if (newChildren) {
                         [children release];
                         children = newChildren;
                         newChildren = nil;
+                    }
-...
     - (NSString *)displayName {
         if (displayName == nil)
             return [NSString stringWithString:(sharingAccount ? sharingAccount : @"account")];
         return [[displayName copy] autorelease];
         return [displayName copy];
+    }
     - (NSImage *)icon {
         if (icon == nil)
             icon = [sharedIcon retain];
             icon = sharedIcon;
         return icon;
+    }
-...
             if (retries > 0) {
                 ASIPithosAccountRequest *newAccountRequest = (ASIPithosAccountRequest *)[PithosUtilities copyRequest:accountRequest];
                 [(NSMutableDictionary *)(newAccountRequest.userInfo)setObject:[NSNumber numberWithUnsignedInteger:(--retries)] forKey:@"retries"];
                 [accountRequest release];
                 accountRequest = newAccountRequest;
                 [[PithosUtilities prepareRequest:accountRequest priority:[[accountRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
             } else {
                 [newChildren release];
                 newChildren = nil;
                 [accountRequest release];
                 accountRequest = nil;
                 [containers release];
                 containers = nil;
                 forcedRefresh = NO;
                 @synchronized(self) {
-...
                         newChildren = [[NSMutableArray alloc] init];
                         NSMutableIndexSet *keptNodes = [NSMutableIndexSet indexSet];
                         for (ASIPithosContainer *container in containers) {
                             PithosContainerNode *node = [[[PithosContainerNode alloc] initWithPithos:pithos pithosContainer:container] autorelease];
                             PithosContainerNode *node = [[PithosContainerNode alloc] initWithPithos:pithos pithosContainer:container];
                             node.parent = self;
                             node.shared = shared;
                             node.sharingAccount = sharingAccount;
-...
                         }]] makeObjectsPerformSelector:@selector(pithosNodeWillBeRemoved)];
+                    }
                     // Else cache was used and all results were fetched during this request, so existing children can be reused
                     [accountRequest release];
                     accountRequest = nil;
                     [containers release];
                     containers = nil;
                     forcedRefresh = NO;
                     @synchronized(self) {
-...
+                    }
                     [self postChildrenUpdatedNotificationName];
                 } else {
                     [accountRequest release];
                     // Do an additional request to fetch more objects
                     accountRequest = [[ASIPithosAccountRequest listContainersRequestWithPithos:pithos
                     accountRequest = [ASIPithosAccountRequest listContainersRequestWithPithos:pithos
                                                                                          limit:0
                                                                                         marker:[[someContainers lastObject] name]
                                                                                         shared:shared
                                                                                          until:nil] retain];
                                                                                          until:nil];
                     if (sharingAccount)
                         [accountRequest setRequestUserFromDefaultTo:sharingAccount withPithos:pithos];
                     else if (!forcedRefresh)
-...
+                }
             } else if (accountRequest.responseStatusCode == 304) {
                 // Account is not modified, so existing children can be reused
                 [accountRequest release];
                 accountRequest = nil;
                 [containers release];
                 containers = nil;
                 forcedRefresh = NO;
                 @synchronized(self) {
-...
             if ([request isEqualTo:applyMetadataAccountRequest]) {
                 @synchronized(self) {
                     [applyMetadataAccountRequest release];
                     applyMetadataAccountRequest = nil;
+                }
                 [self refreshInfo];
             } else if ([request isEqualTo:refreshMetadataAccountRequest]) {
                 self.pithosAccount = [refreshMetadataAccountRequest account];
                 @synchronized(self) {
                     [refreshMetadataAccountRequest release];
                     refreshMetadataAccountRequest = nil;
+                }
+            }
-...
                 [(NSMutableDictionary *)(newRequest.userInfo)setObject:[NSNumber numberWithUnsignedInteger:(--retries)] forKey:@"retries"];
                 if ([request isEqualTo:applyMetadataAccountRequest]) {
                     @synchronized(self) {
                         [applyMetadataAccountRequest release];
                         applyMetadataAccountRequest = newRequest;
+                    }
                 } else if ([request isEqualTo:refreshMetadataAccountRequest]) {
                     @synchronized(self) {
                         [refreshMetadataAccountRequest release];
                         refreshMetadataAccountRequest = newRequest;
+                    }
+                }
                 [[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]] startAsynchronous];
                 [newRequest release];
             } else {
                 if ([request isEqualTo:applyMetadataAccountRequest]) {
                     [PithosUtilities httpRequestErrorAlertWithRequest:applyMetadataAccountRequest];
                     @synchronized(self) {
                         [applyMetadataAccountRequest release];
                         applyMetadataAccountRequest = nil;
+                    }
                 } else if ([request isEqualTo:refreshMetadataAccountRequest]) {
                     [PithosUtilities httpRequestErrorAlertWithRequest:refreshMetadataAccountRequest];
                     @synchronized(self) {
                         [refreshMetadataAccountRequest release];
                         refreshMetadataAccountRequest = nil;
+                    }
+                }
-...
                 NSMutableDictionary *groups = pithosAccount.groups;
                 if ([groups count] == 0)
                     groups = [NSMutableDictionary dictionaryWithObject:@"" forKey:@"group"];
                 applyMetadataAccountRequest = [[ASIPithosAccountRequest updateAccountMetadataRequestWithPithos:pithos
                 applyMetadataAccountRequest = [ASIPithosAccountRequest updateAccountMetadataRequestWithPithos:pithos
                                                                                                         groups:groups
                                                                                                       metadata:pithosAccount.metadata
                                                                                                         update:NO] retain];
                                                                                                         update:NO];
                 applyMetadataAccountRequest.delegate = self;
                 applyMetadataAccountRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
                 applyMetadataAccountRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);
-...
     - (void)refreshInfo {
         @synchronized(self) {
             if (refreshMetadataAccountRequest == nil) {
                 refreshMetadataAccountRequest = [[ASIPithosAccountRequest accountMetadataRequestWithPithos:pithos] retain];
                 refreshMetadataAccountRequest = [ASIPithosAccountRequest accountMetadataRequestWithPithos:pithos];
                 refreshMetadataAccountRequest.delegate = self;
                 refreshMetadataAccountRequest.didFinishSelector = @selector(performRequestFinishedDelegateInBackground:);
                 refreshMetadataAccountRequest.didFailSelector = @selector(performRequestFailedDelegateInBackground:);

         NSString *message;
         NSUInteger totalBytes;
         NSUInteger currentBytes;
         PithosAccount *pithosAccount;
         PithosAccount *__unsafe_unretained pithosAccount;
+    }
     - (id)initWithType:(PithosActivityType)aType pithosAccount:(PithosAccount *)aPithosAccount;
-...
     @property (nonatomic, copy) NSString *message;
     @property (nonatomic, assign) NSUInteger totalBytes;
     @property (nonatomic, assign) NSUInteger currentBytes;
     @property (nonatomic, assign) PithosAccount *pithosAccount;
     @property (nonatomic, unsafe_unretained) PithosAccount *pithosAccount;
     @end

         return self;
+    }
     - (void)dealloc {
         [message release];
         [super dealloc];
+    }
     - (NSString *)description {
         if (pithosAccount)

         NSTimer *timer;
         BOOL pickedRunning;
         id<PithosActivityFacilityDelegate> delegate;
         id<PithosActivityFacilityDelegate> __unsafe_unretained delegate;
+    }
     @property (nonatomic, assign) id delegate;
     @property (nonatomic, unsafe_unretained) id delegate;
     + (id)defaultPithosActivityFacility;

     #import "PithosAccount.h"
     #import "pithos_macosAppDelegate.h"
     static PithosActivityFacility *defaultPithosActivityFacility = nil;
     //static PithosActivityFacility *defaultPithosActivityFacility = nil;
     @implementation PithosActivityFacility
     @synthesize delegate;
     #pragma mark -
     #pragma mark - Singleton
     + (id)defaultPithosActivityFacility {
     	@synchronized(self) {
     		if (!defaultPithosActivityFacility)
     			[[self alloc] init]; // Assignment not done here
+    	}
     	return defaultPithosActivityFacility;
+    }
     + (id)allocWithZone:(NSZone *)zone {
         @synchronized(self) {
             if (!defaultPithosActivityFacility) {
                 defaultPithosActivityFacility = [super allocWithZone:zone];
                 return defaultPithosActivityFacility;
+            }
+        }
         return nil;
+    }
     - (id)copyWithZone:(NSZone *)zone {
         return self;
+    }
     - (id)retain {
         return self;
         static dispatch_once_t pred = 0;
         __strong static id _sharedObject = nil;
         dispatch_once(&pred, ^{
             _sharedObject = [[self alloc] init];
         });
         return _sharedObject;
+    }
     - (NSUInteger)retainCount {
         return UINT_MAX; // Can not be released
+    }
     - (void)release {
         // Do nothing
+    }
     - (id)autorelease {
         return self;
+    }
     //+ (id)allocWithZone:(NSZone *)zone {
     //    @synchronized(self) {
     //        if (!defaultPithosActivityFacility) {
     //            defaultPithosActivityFacility = [super allocWithZone:zone];
     //            return defaultPithosActivityFacility;
     //        }
     //    }
     //    return nil;
     //}
     //
     //- (id)copyWithZone:(NSZone *)zone {
     //    return self;
     //}
     //
     //- (id)retain {
     //    return self;
     //}
     //
     //- (NSUInteger)retainCount {
     //    return UINT_MAX; // Can not be released
     //}
     //
     //- (void)release {
     //    // Do nothing
     //}
     //
     //- (id)autorelease {
     //    return self;
     //}
     #pragma mark -
     #pragma mark Object Lifecycle
     #pragma mark - Object Lifecycle
     - (id)init {
         if ((self = [super init])) {
-...
     - (void)dealloc {
         [timer invalidate];
         [timer release];
         [runningActivities release];
         [endingActivities release];
         [super dealloc];
+    }
     - (void)reset {
         @synchronized(self) {
             [timer invalidate];
             [timer release];
             [runningActivities release];
             runningActivities = [[NSMutableArray alloc] init];
             [endingActivities release];
             endingActivities = [[NSMutableArray alloc] init];
             totalUploadBytes = 0;
             currentUploadBytes = 0;
-...
             pickedRunning = NO;
             timer = [[NSTimer scheduledTimerWithTimeInterval:[(pithos_macosAppDelegate *)[[NSApplication sharedApplication] delegate] activityFacilityTimeInterval]
             timer = [NSTimer scheduledTimerWithTimeInterval:[(pithos_macosAppDelegate *)[[NSApplication sharedApplication] delegate] activityFacilityTimeInterval]
                                                       target:self
                                                     selector:@selector(update:)
                                                     userInfo:nil
                                                      repeats:YES] retain];
                                                      repeats:YES];
+        }
+    }
-...
                     if (activity.message)
                         break;
+                }
                 [activity retain];
                 [endingActivities removeObjectsInRange:NSMakeRange(0, (index + 1))];
                 pickedRunning = NO;
             } else if (runningActivitiesCount) {
                 NSUInteger count;
                 for (count = 0 ; count < runningActivitiesCount; count++) {
                     activity = [[runningActivities objectAtIndex:0] retain];
                     activity = [runningActivities objectAtIndex:0];
                     [runningActivities removeObjectAtIndex:0];
                     [runningActivities addObject:activity];
                     if (activity.message) {
                         break;
                     } else {
                         [activity release];
                         activity = nil;
+                    }
+                }
-...
             [info setObject:[NSNumber numberWithUnsignedInteger:currentUploadBytes] forKey:@"currentUploadBytes"];
             [info setObject:[NSNumber numberWithUnsignedInteger:totalDownloadBytes] forKey:@"totalDownloadBytes"];
             [info setObject:[NSNumber numberWithUnsignedInteger:currentDownloadBytes] forKey:@"currentDownloadBytes"];
             [activity release];
+        }
         if (delegate) {
             [delegate activityUpdate:info];
-...
                                    totalBytes:(NSUInteger)totalBytes
                                  currentBytes:(NSUInteger)currentBytes
                                 pithosAccount:(PithosAccount *)pithosAccount {
         PithosActivity *activity = [[[PithosActivity alloc] initWithType:type pithosAccount:pithosAccount] autorelease];
         PithosActivity *activity = [[PithosActivity alloc] initWithType:type pithosAccount:pithosAccount];
         activity.message = message;
         activity.totalBytes = totalBytes;
         activity.currentBytes = currentBytes;
-...
     - (PithosActivity *)startAndEndActivityWithType:(PithosActivityType)type
                                             message:(NSString *)message
                                       pithosAccount:(PithosAccount *)pithosAccount {
         PithosActivity *activity = [[[PithosActivity alloc] initWithType:type pithosAccount:pithosAccount] autorelease];
         PithosActivity *activity = [[PithosActivity alloc] initWithType:type pithosAccount:pithosAccount];
         activity.message = message;
         activity.totalBytes = 0;
         activity.currentBytes = 0;

         NSViewController *sharedPreviewController;
         NSSplitView *verticalSplitView;
         NSSplitView *horizontalSplitView;
         NSView *leftTopView;
         NSView *leftBottomView;
         NSOutlineView *outlineView;
         NSBrowser *browser;
         NSMenu *outlineViewMenu;
         NSMenu *browserMenu;
         NSSplitView *__unsafe_unretained verticalSplitView;
         NSSplitView *__unsafe_unretained horizontalSplitView;
         NSView *__unsafe_unretained leftTopView;
         NSView *__unsafe_unretained leftBottomView;
         NSOutlineView *__unsafe_unretained outlineView;
         NSBrowser *__unsafe_unretained browser;
         NSMenu *__unsafe_unretained outlineViewMenu;
         NSMenu *__unsafe_unretained browserMenu;
         BOOL editingItem;
-...
         PithosNode *clipboardParentNode;
         BOOL clipboardCopy;
         NSTextField *activityTextField;
         NSProgressIndicator *activityProgressIndicator;
         NSTextField *__unsafe_unretained activityTextField;
         NSProgressIndicator *__unsafe_unretained activityProgressIndicator;
         PithosActivityFacility *activityFacility;
         NSTimer *refreshTimer;
-...
         NSOperationQueue *downloadCallbackQueue;
+    }
     @property (nonatomic, retain) ASIPithos *pithos;
     @property (nonatomic, strong) ASIPithos *pithos;
     @property (nonatomic, retain) PithosAccountNode *accountNode;
     @property (nonatomic, strong) PithosAccountNode *accountNode;
     @property (nonatomic, assign) IBOutlet NSSplitView *verticalSplitView;
     @property (nonatomic, assign) IBOutlet NSSplitView *horizontalSplitView;
     @property (nonatomic, assign) IBOutlet NSView *leftTopView;
     @property (nonatomic, assign) IBOutlet NSView *leftBottomView;
     @property (nonatomic, assign) IBOutlet NSOutlineView *outlineView;
     @property (nonatomic, assign) IBOutlet NSBrowser *browser;
     @property (nonatomic, assign) IBOutlet NSMenu *outlineViewMenu;
     @property (nonatomic, assign) IBOutlet NSMenu *browserMenu;
     @property (nonatomic, unsafe_unretained) IBOutlet NSSplitView *verticalSplitView;
     @property (nonatomic, unsafe_unretained) IBOutlet NSSplitView *horizontalSplitView;
     @property (nonatomic, unsafe_unretained) IBOutlet NSView *leftTopView;
     @property (nonatomic, unsafe_unretained) IBOutlet NSView *leftBottomView;
     @property (nonatomic, unsafe_unretained) IBOutlet NSOutlineView *outlineView;
     @property (nonatomic, unsafe_unretained) IBOutlet NSBrowser *browser;
     @property (nonatomic, unsafe_unretained) IBOutlet NSMenu *outlineViewMenu;
     @property (nonatomic, unsafe_unretained) IBOutlet NSMenu *browserMenu;
     @property (nonatomic, retain) NSArray *draggedNodes;
     @property (nonatomic, retain) PithosNode *draggedParentNode;
     @property (nonatomic, strong) NSArray *draggedNodes;
     @property (nonatomic, strong) PithosNode *draggedParentNode;
     @property (nonatomic, retain) NSArray *clipboardNodes;
     @property (nonatomic, retain) PithosNode *clipboardParentNode;
     @property (nonatomic, strong) NSArray *clipboardNodes;
     @property (nonatomic, strong) PithosNode *clipboardParentNode;
     @property (nonatomic, assign) BOOL clipboardCopy;
     @property (nonatomic, assign) IBOutlet NSTextField *activityTextField;
     @property (nonatomic, assign) IBOutlet NSProgressIndicator *activityProgressIndicator;
     @property (nonatomic, unsafe_unretained) IBOutlet NSTextField *activityTextField;
     @property (nonatomic, unsafe_unretained) IBOutlet NSProgressIndicator *activityProgressIndicator;
     - (IBAction)forceRefresh:(id)sender;
     - (IBAction)refresh:(id)sender;

         [activityProgressIndicator setMaxValue:1.0];
         activityFacility = [PithosActivityFacility defaultPithosActivityFacility];
         self.accountNode = [[[PithosAccountNode alloc] initWithPithos:pithos] autorelease];
         self.accountNode = [[PithosAccountNode alloc] initWithPithos:pithos];
         containersNode = [[PithosEmptyNode alloc] initWithDisplayName:@"CONTAINERS" icon:nil];
         containersNodeChildren = [[NSMutableArray alloc] init];
         sharedNode = [[PithosEmptyNode alloc] initWithDisplayName:@"SHARED" icon:nil];
-...
         othersSharedNode.displayName = @"shared to me";
         othersSharedNode.icon = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kGroupIcon)];
         [[[outlineView tableColumns] objectAtIndex:0] setDataCell:[[[PithosOutlineViewCell alloc] init] autorelease]];
         [[[outlineView tableColumns] objectAtIndex:0] setDataCell:[[PithosOutlineViewCell alloc] init]];
         // Register for updates
         // PithosAccountNode accountNode updates outlineView container nodes
-...
+        }
         [refreshTimer invalidate];
         [refreshTimer release];
         [moveNetworkQueue reset];
         [copyNetworkQueue reset];
-...
     //    [activityFacility reset];
         activityFacility.delegate = self;
         refreshTimer = [[NSTimer scheduledTimerWithTimeInterval:REFRESH_TIMER_INTERVAL
         refreshTimer = [NSTimer scheduledTimerWithTimeInterval:REFRESH_TIMER_INTERVAL
                                                          target:self
                                                        selector:@selector(forceRefresh:)
                                                        userInfo:self
                                                         repeats:YES] retain];
                                                         repeats:YES];
         @synchronized(self) {
             browserActive = YES;
+        }
-...
     - (void)dealloc {
         [[NSNotificationCenter defaultCenter] removeObserver:self];
         [self resetBrowser];
         [moveQueue release];
         [copyQueue release];
         [deleteQueue release];
         [uploadQueue release];
         [downloadQueue release];
         [moveNetworkQueue release];
         [copyNetworkQueue release];
         [deleteNetworkQueue release];
         [uploadNetworkQueue release];
         [downloadNetworkQueue release];
         [clipboardParentNode release];
         [clipboardNodes release];
         [draggedParentNode release];
         [draggedNodes release];
         [sharedPreviewController release];
         [othersSharedNode release];
         [mySharedNode release];
         [sharedNode release];
         [containersNodeChildren release];
         [containersNode release];
         [accountNode release];
         [rootNode release];
         [pithos release];
         [super dealloc];
+    }
     - (void)setPithos:(ASIPithos *)aPithos {
-...
                 ![aPithos.storageURLPrefix isEqualToString:pithos.storageURLPrefix] ||
                 ![aPithos.publicURLPrefix isEqualToString:pithos.publicURLPrefix]) {
                 [self resetBrowser];
                 [pithos release];
                 pithos = [aPithos retain];
                 pithos = aPithos;
                 [self startBrowser];
             } else {
                 [self startBrowser];
-...
                                                   isDirectory:&isDirectory
                                                sharingAccount:nil]) {
                         dispatch_async(dispatch_get_main_queue(), ^{
                             NSAlert *alert = [[[NSAlert alloc] init] autorelease];
                             NSAlert *alert = [[NSAlert alloc] init];
                             [alert setMessageText:@"Name Taken"];
                             [alert setInformativeText:[NSString stringWithFormat:@"The name '%@' is already taken. Please choose a different name", newName]];
                             [alert addButtonWithTitle:@"OK"];
-...
                                                   isDirectory:&isDirectory
                                                sharingAccount:nil]) {
                         dispatch_async(dispatch_get_main_queue(), ^{
                             NSAlert *alert = [[[NSAlert alloc] init] autorelease];
                             NSAlert *alert = [[NSAlert alloc] init];
                             [alert setMessageText:@"Name Taken"];
                             [alert setInformativeText:[NSString stringWithFormat:@"The name '%@' is already taken. Please choose a different name", newName]];
                             [alert addButtonWithTitle:@"OK"];
-...
             [names addObject:node.displayName];
             // If the node is a subdir ask if the whole tree should be downloaded
             if ([node class] == [PithosSubdirNode class]) {
                 NSAlert *alert = [[[NSAlert alloc] init] autorelease];
                 NSAlert *alert = [[NSAlert alloc] init];
                 [alert setMessageText:@"Download directory"];
                 [alert setInformativeText:[NSString stringWithFormat:@"'%@' is a directory, do you want to download its contents?", node.displayName]];
                 [alert addButtonWithTitle:@"OK"];
-...
         } else {
             [menuNodes addObject:[browser itemAtIndexPath:clickedNodeIndexPath]];
+        }
         NSMenuItem *menuItem = [[[NSMenuItem alloc] init] autorelease];
         NSMenuItem *menuItem = [[NSMenuItem alloc] init];
         menuItem.representedObject = menuNodes;
         [self menuDownload:menuItem];
+    }
-...
                     [uploadQueue addOperation:operation];
                 } else {
                     // Upload directory, confirm first
                     NSAlert *alert = [[[NSAlert alloc] init] autorelease];
                     NSAlert *alert = [[NSAlert alloc] init];
                     [alert setMessageText:@"Upload directory"];
                     [alert setInformativeText:[NSString stringWithFormat:@"'%@' is a directory, do you want to upload it and its contents?", filePath]];
                     [alert addButtonWithTitle:@"OK"];
-...
             return;
+        }
         // Add an operation to the callbackQueue with a completionBlock for the case of cancellation
         NSInvocationOperation *operation = [[[NSInvocationOperation alloc] initWithTarget:self
         NSInvocationOperation *operation = [[NSInvocationOperation alloc] initWithTarget:self
                                                                                  selector:NSSelectorFromString([request.userInfo objectForKey:@"didFinishSelector"])
                                                                                    object:request] autorelease];
                                                                                    object:request];
         operation.completionBlock = ^{
             @autoreleasepool {
                 if ([[request.userInfo objectForKey:@"operation"] isCancelled]) {
-...
                 return;
+            }
             // Add an operation to the callbackQueue with a completionBlock for the case of cancellation
             NSInvocationOperation *operation = [[[NSInvocationOperation alloc] initWithTarget:self
             NSInvocationOperation *operation = [[NSInvocationOperation alloc] initWithTarget:self
                                                                                      selector:NSSelectorFromString([request.userInfo objectForKey:@"didFailSelector"])
                                                                                        object:request] autorelease];
                                                                                        object:request];
             operation.completionBlock = ^{
                 @autoreleasepool {
                     if ([[request.userInfo objectForKey:@"operation"] isCancelled]) {
-...
+            }
             NSUInteger retries = [[request.userInfo objectForKey:@"retries"] unsignedIntegerValue];
             if (retries > 0) {
                 ASIPithosRequest *newRequest = (ASIPithosRequest *)[[PithosUtilities copyRequest:request] autorelease];
                 ASIPithosRequest *newRequest = (ASIPithosRequest *)[PithosUtilities copyRequest:request];
                 [(NSMutableDictionary *)(newRequest.userInfo)setObject:[NSNumber numberWithUnsignedInteger:(--retries)] forKey:@"retries"];
                 [(NSMutableDictionary *)(newRequest.userInfo)setObject:[NSNumber numberWithBool:NO] forKey:@"unexpectedResponseStatus"];
                 [[newRequest.userInfo objectForKey:@"networkQueue"] addOperation:[PithosUtilities prepareRequest:newRequest priority:[[newRequest.userInfo objectForKey:@"priority"] integerValue]]];
-...
                     if (![fileManager fileExistsAtPath:filePath]) {
                         if (![fileManager createFileAtPath:filePath contents:nil attributes:nil]) {
                             dispatch_async(dispatch_get_main_queue(), ^{
                                 NSAlert *alert = [[[NSAlert alloc] init] autorelease];
                                 NSAlert *alert = [[NSAlert alloc] init];
                                 [alert setMessageText:@"Create File Error"];
                                 [alert setInformativeText:[NSString stringWithFormat:@"Cannot create zero length file at %@", filePath]];
                                 [alert addButtonWithTitle:@"OK"];
-...
                     dispatch_async(dispatch_get_main_queue(), ^{
                         [activityFacility endActivity:activity
                                           withMessage:[objectRequest.userInfo objectForKey:@"failedActivityMessage"]];
                         NSAlert *alert = [[[NSAlert alloc] init] autorelease];
                         NSAlert *alert = [[NSAlert alloc] init];
                         [alert setMessageText:@"Upload Timeout"];
                         [alert setInformativeText:[NSString stringWithFormat:@"Upload iteration limit reached for object with path '%@'",
                                                    [objectRequest.userInfo objectForKey:@"objectName"]]];
-...
                 return;
             // New Folder
             if (!menuNode.shared && !menuNode.sharingAccount) {
                 menuItem = [[[NSMenuItem alloc] initWithTitle:@"New Folder" action:@selector(menuNewFolder:) keyEquivalent:@""] autorelease];
                 menuItem = [[NSMenuItem alloc] initWithTitle:@"New Folder" action:@selector(menuNewFolder:) keyEquivalent:@""];
                 [menuItem setRepresentedObject:menuNode];
                 [menu addItem:menuItem];
                 [menu addItem:[NSMenuItem separatorItem]];
+            }
             // Refresh
             menuItem = [[[NSMenuItem alloc] initWithTitle:@"Refresh" action:@selector(refresh:) keyEquivalent:@""] autorelease];
             menuItem = [[NSMenuItem alloc] initWithTitle:@"Refresh" action:@selector(refresh:) keyEquivalent:@""];
             [menu addItem:menuItem];
             [menu addItem:[NSMenuItem separatorItem]];
             // Get Info
             menuItem = [[[NSMenuItem alloc] initWithTitle:(([menuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing")
             menuItem = [[NSMenuItem alloc] initWithTitle:(([menuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing")
                                                    action:@selector(menuGetInfo:)
                                             keyEquivalent:@""] autorelease];
                                             keyEquivalent:@""];
             [menuItem setRepresentedObject:[NSArray arrayWithObject:menuNode]];
             [menu addItem:menuItem];
             // Paste
-...
                     else
                         menuItemTitle = @"Paste Items";
                     [menu addItem:[NSMenuItem separatorItem]];
                     menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""] autorelease];
                     menuItem = [[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""];
                     [menuItem setRepresentedObject:menuNode];
                     [menu addItem:menuItem];
+                }
-...
             PithosNode *firstMenuNode = [menuNodes objectAtIndex:0];
             // Download
             if (([firstMenuNode class] != [PithosContainerNode class]) && ([firstMenuNode class] != [PithosAccountNode class])) {
                 menuItem = [[[NSMenuItem alloc] initWithTitle:@"Download" action:@selector(menuDownload:) keyEquivalent:@""] autorelease];
                 menuItem = [[NSMenuItem alloc] initWithTitle:@"Download" action:@selector(menuDownload:) keyEquivalent:@""];
                 [menuItem setRepresentedObject:menuNodes];
                 [menu addItem:menuItem];
                 [menu addItem:[NSMenuItem separatorItem]];
-...
             // Delete
             if (!firstMenuNode.shared && !firstMenuNode.sharingAccount && ([rootNode class] == [PithosContainerNode class])) {
                 if ([rootNode.pithosContainer.name isEqualToString:@"pithos"]) {
                     menuItem = [[[NSMenuItem alloc] initWithTitle:@"Move to Trash"
                     menuItem = [[NSMenuItem alloc] initWithTitle:@"Move to Trash"
                                                            action:@selector(menuMoveToTrash:)
                                                     keyEquivalent:@""] autorelease];
                                                     keyEquivalent:@""];
                     [menuItem setRepresentedObject:menuNodes];
                     [menu addItem:menuItem];
+                }
                 menuItem = [[[NSMenuItem alloc] initWithTitle:@"Delete" action:@selector(menuDelete:) keyEquivalent:@""] autorelease];
                 menuItem = [[NSMenuItem alloc] initWithTitle:@"Delete" action:@selector(menuDelete:) keyEquivalent:@""];
                 [menuItem setRepresentedObject:menuNodes];
                 [menu addItem:menuItem];
                 [menu addItem:[NSMenuItem separatorItem]];
+            }
             // Refresh
             menuItem = [[[NSMenuItem alloc] initWithTitle:@"Refresh" action:@selector(refresh:) keyEquivalent:@""] autorelease];
             menuItem = [[NSMenuItem alloc] initWithTitle:@"Refresh" action:@selector(refresh:) keyEquivalent:@""];
             [menu addItem:menuItem];
             // Get Info
             if (!firstMenuNode.sharingAccount || ([firstMenuNode class] != [PithosAccountNode class])) {
                 [menu addItem:[NSMenuItem separatorItem]];
                 menuItem = [[[NSMenuItem alloc] initWithTitle:(([firstMenuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing")
                 menuItem = [[NSMenuItem alloc] initWithTitle:(([firstMenuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing")
                                                        action:@selector(menuGetInfo:)
                                                 keyEquivalent:@""] autorelease];
                                                 keyEquivalent:@""];
                 [menuItem setRepresentedObject:menuNodes];
                 [menu addItem:menuItem];
-...
                     menuItemTitle = [NSString stringWithFormat:@"Cut \"%@\"", ((PithosNode *)[menuNodes objectAtIndex:0]).displayName];
                 else
                     menuItemTitle = [NSString stringWithFormat:@"Cut %lu Items", menuNodesCount];
                 menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuCut:) keyEquivalent:@""] autorelease];
                 menuItem = [[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuCut:) keyEquivalent:@""];
                 [menuItem setRepresentedObject:menuNodes];
                 [menu addItem:menuItem];
+            }
-...
                     menuItemTitle = [NSString stringWithFormat:@"Copy \"%@\"", ((PithosNode *)[menuNodes objectAtIndex:0]).displayName];
                 else
                     menuItemTitle = [NSString stringWithFormat:@"Copy %lu Items", menuNodesCount];
                 menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuCopy:) keyEquivalent:@""] autorelease];
                 menuItem = [[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuCopy:) keyEquivalent:@""];
                 [menuItem setRepresentedObject:menuNodes];
                 [menu addItem:menuItem];
+            }
-...
                         menuItemTitle = @"Paste Item";
                     else
                         menuItemTitle = @"Paste Items";
                     menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""] autorelease];
                     menuItem = [[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""];
                     [menuItem setRepresentedObject:firstMenuNode];
                     [menu addItem:menuItem];
+                }
-...
+        }
         if (!message)
             message = [[[[UsingSizeTransformer alloc] init] autorelease] transformedValue:accountNode.pithosAccount];
             message = [[[UsingSizeTransformer alloc] init] transformedValue:accountNode.pithosAccount];
         [activityTextField setStringValue:message];
+    }

Synnefo » Pithos MacOS Client

Revision cb6abe72