Improve UUID translation in nodes

[pithos-macos] / pithos-macos / PithosNode.h

diff --git a/pithos-macos/PithosNode.h b/pithos-macos/PithosNode.h
index 22c97b0..0708bb9 100644 (file)
--- a/pithos-macos/PithosNode.h
+++ b/pithos-macos/PithosNode.h
@@ -41,6 +41,7 @@
 #define PithosNodeStateRefreshFinished 3
 
 @class PithosNodeInfoController;
+@class PithosAccount;
 @class ASIPithos;
 @class ASIPithosAccount;
 @class ASIPithosContainer;
@@ -53,7 +54,8 @@
     
     NSString *url;    
     
-    PithosNode *parent;
+    PithosAccount *__unsafe_unretained pithosAccountManager;
+    PithosNode *__unsafe_unretained parent;
     BOOL shared;
     NSString *sharingAccount;
     NSMutableArray *children;
@@ -71,31 +73,34 @@
 
 @property(nonatomic, assign) BOOL forcedRefresh;
 
-@property(nonatomic, readonly) NSString *url;
+@property(unsafe_unretained, nonatomic, readonly) NSString *url;
 
-@property(nonatomic, assign) PithosNode *parent;
+@property(nonatomic, unsafe_unretained) PithosAccount *pithosAccountManager;
+@property(nonatomic, unsafe_unretained) PithosNode *parent;
 @property(nonatomic, assign) BOOL shared;
-@property(nonatomic, retain) NSString *sharingAccount;
-@property(nonatomic, readonly) NSArray *children;
-@property(nonatomic, retain) NSString *childrenUpdatedNotificationName;
+@property(nonatomic, strong) NSString *sharingAccount;
+@property(unsafe_unretained, nonatomic, readonly) NSArray *children;
+@property(nonatomic, strong) NSString *childrenUpdatedNotificationName;
 @property(nonatomic, assign) BOOL inheritChildrenUpdatedNotificationName;
 
-@property(nonatomic, retain) NSString *displayName;
+@property(nonatomic, strong) NSString *displayName;
 @property(nonatomic, readonly) BOOL isLeafItem;
 
-@property(nonatomic, retain) NSImage *icon;
+@property(nonatomic, strong) NSImage *icon;
 
-@property(nonatomic, retain) ASIPithos *pithos;
-@property(nonatomic, retain) ASIPithosAccount *pithosAccount;
-@property(nonatomic, retain) ASIPithosContainer *pithosContainer;
-@property(nonatomic, retain) ASIPithosObject *pithosObject;
+@property(nonatomic, strong) ASIPithos *pithos;
+@property(nonatomic, strong) ASIPithosAccount *pithosAccount;
+@property(nonatomic, strong) ASIPithosContainer *pithosContainer;
+@property(nonatomic, strong) ASIPithosObject *pithosObject;
+
+- (id)initWithPithosAccountManager:(PithosAccount *)aPithosAccountManager;
 
 - (void)invalidateChildren;
 - (void)invalidateChildrenRecursive;
 - (void)refresh;
 - (void)forceRefresh;
 
-- (void) postChildrenUpdatedNotificationName;
+- (void)postChildrenUpdatedNotificationName;
 
 - (void)showPithosNodeInfo:(id)sender;
 - (void)pithosNodeInfoWillClose:(id)sender;