Modernize PBSourceViewItem

This also renames its subclasses for consistency, and remove 2 unused ones.

Author: tiennou

Classes/Controllers/PBGitSidebarController.m

@@ -16,7 +16,7 @@
 #import "PBGitDefaults.h"
 #import "PBHistorySearchController.h"
 #import "PBGitStash.h"
-#import "PBGitSVStashItem.h"
+#import "PBSourceViewGitStashItem.h"
 #import "PBSidebarTableViewCell.h"
 #import "PBGitRef.h"
 
@@ -117,11 +117,11 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 
 	if ([@"stashesModified" isEqualToString:(__bridge NSString*)context]) {
 
-        for (PBGitSVStashItem *stashItem in stashes.sortedChildren)
+        for (PBSourceViewGitStashItem *stashItem in stashes.sortedChildren)
             [stashes removeChild:stashItem];
 
         for (PBGitStash *stash in repository.stashes)
-            [stashes addChild: [PBGitSVStashItem itemWithStash:stash]];
+            [stashes addChild: [PBSourceViewGitStashItem itemWithStash:stash]];
 
         [sourceView expandItem:stashes];
         [sourceView reloadItem:stashes reloadChildren:YES];
@@ -255,12 +255,12 @@ - (void)doubleClicked:(id)object {
 	NSInteger rowNumber = [sourceView selectedRow];
 
 	id item = [sourceView itemAtRow:rowNumber];
-	if ([item isKindOfClass:[PBGitSVSubmoduleItem class]]) {
-		PBGitSVSubmoduleItem *subModule = item;
+	if ([item isKindOfClass:[PBSourceViewGitSubmoduleItem class]]) {
+		PBSourceViewGitSubmoduleItem *subModule = item;
 
 		[self openSubmoduleAtURL:[subModule path]];
-	} else if ([item isKindOfClass:[PBGitSVBranchItem class]]) {
-		PBGitSVBranchItem *branch = item;
+	} else if ([item isKindOfClass:[PBSourceViewGitBranchItem class]]) {
+		PBSourceViewGitBranchItem *branch = item;
 
 		NSError *error = nil;
 		BOOL success = [repository checkoutRefish:[branch ref] error:&error];
@@ -272,7 +272,7 @@ - (void)doubleClicked:(id)object {
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item
 {
-    if ([item isKindOfClass:[PBGitSVSubmoduleItem class]]) {
+    if ([item isKindOfClass:[PBSourceViewGitSubmoduleItem class]]) {
         NSLog(@"hi");
     }
     return NO;
@@ -320,9 +320,9 @@ - (BOOL) outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(
 - (void)populateList
 {
 	PBSourceViewItem *project = [PBSourceViewItem groupItemWithTitle:[repository projectName]];
-	project.isUncollapsible = YES;
+	project.uncollapsible = YES;
 
-	stage = [PBGitSVStageItem stageItem];
+	stage = [PBSourceViewStageItem stageItem];
 	[project addChild:stage];
 
 	branches = [PBSourceViewItem groupItemWithTitle:@"Branches"];
@@ -333,14 +333,14 @@ - (void)populateList
 	others = [PBSourceViewItem groupItemWithTitle:@"Other"];
 
 	for (PBGitStash *stash in repository.stashes)
-		[stashes addChild: [PBGitSVStashItem itemWithStash:stash]];
+		[stashes addChild: [PBSourceViewGitStashItem itemWithStash:stash]];
 
 	for (PBGitRevSpecifier *rev in repository.branches) {
 		[self addRevSpec:rev];
 	}
 
     for (GTSubmodule *sub in repository.submodules) {
-        [submodules addChild: [PBGitSVSubmoduleItem itemWithSubmodule:sub]];
+        [submodules addChild: [PBSourceViewGitSubmoduleItem itemWithSubmodule:sub]];
 	}
 
 	[items addObject:project];
@@ -365,7 +365,7 @@ - (void)expandCollapseItem:(NSNotification*)aNotification
 {
     NSObject* child = [[aNotification userInfo] valueForKey:@"NSObject"];
     if ([child isKindOfClass:[PBSourceViewItem class]]) {
-        ((PBSourceViewItem*)child).isExpanded = [aNotification.name isEqualToString:NSOutlineViewItemWillExpandNotification];
+        ((PBSourceViewItem *)child).expanded = [aNotification.name isEqualToString:NSOutlineViewItemWillExpandNotification];
     }
 }
 
@@ -402,7 +402,7 @@ - (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTabl
 
 - (void) updateActionMenu
 {
-	[actionButton setEnabled:([[self selectedItem] ref] != nil || [[self selectedItem] isKindOfClass:[PBGitSVSubmoduleItem class]])];
+	[actionButton setEnabled:([[self selectedItem] ref] != nil || [[self selectedItem] isKindOfClass:[PBSourceViewGitSubmoduleItem class]])];
 }
 
 - (void) addMenuItemsForRef:(PBGitRef *)ref toMenu:(NSMenu *)menu
@@ -414,7 +414,7 @@ - (void) addMenuItemsForRef:(PBGitRef *)ref toMenu:(NSMenu *)menu
 		[menu addItem:menuItem];
 }
 
-- (void) addMenuItemsForSubmodule:(PBGitSVSubmoduleItem *)submodule toMenu:(NSMenu *)menu
+- (void) addMenuItemsForSubmodule:(PBSourceViewGitSubmoduleItem *)submodule toMenu:(NSMenu *)menu
 {
     if (!submodule)
         return;
@@ -447,8 +447,8 @@ - (NSMenu *) menuForRow:(NSInteger)row
 		[self addMenuItemsForRef:ref toMenu:menu];
 	}
 
-	if ([viewItem isKindOfClass:[PBGitSVSubmoduleItem class]]) {
-		[self addMenuItemsForSubmodule:(PBGitSVSubmoduleItem *)viewItem toMenu:menu];
+	if ([viewItem isKindOfClass:[PBSourceViewGitSubmoduleItem class]]) {
+		[self addMenuItemsForSubmodule:(PBSourceViewGitSubmoduleItem *)viewItem toMenu:menu];
 	}
 
 	return menu;
@@ -463,8 +463,8 @@ - (void) menuNeedsUpdate:(NSMenu *)menu
 	PBGitRef *ref = [[self selectedItem] ref];
 	[self addMenuItemsForRef:ref toMenu:menu];
 
-    if ([[self selectedItem] isKindOfClass:[PBGitSVSubmoduleItem class]]) {
-        [self addMenuItemsForSubmodule:(PBGitSVSubmoduleItem *)[self selectedItem] toMenu:menu];
+    if ([[self selectedItem] isKindOfClass:[PBSourceViewGitSubmoduleItem class]]) {
+        [self addMenuItemsForSubmodule:(PBSourceViewGitSubmoduleItem *)[self selectedItem] toMenu:menu];
     }
 }
 

Classes/Views/PBSourceViewAction.h

@@ -11,38 +11,39 @@
 @class PBGitRevSpecifier;
 @class PBGitRef;
 
-@interface PBSourceViewItem : NSObject {
-    NSMutableOrderedSet *childrenSet;
+NS_ASSUME_NONNULL_BEGIN
 
-	NSString *title;
-	PBGitRevSpecifier *revSpecifier;
+@interface PBSourceViewItem : NSObject
 
-	BOOL isGroupItem;
-	BOOL isUncollapsible;
-}
++ (instancetype)groupItemWithTitle:(NSString *)title;
++ (instancetype)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier;
++ (instancetype)itemWithTitle:(NSString *)title;
 
-+ (id)groupItemWithTitle:(NSString *)title;
-+ (id)itemWithRevSpec:(PBGitRevSpecifier *)revSpecifier;
-+ (id)itemWithTitle:(NSString *)title;
+- (instancetype)initWithTitle:(NSString *)title revSpecifier:(nullable PBGitRevSpecifier *)spec NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)init NS_UNAVAILABLE;
 
 - (void)addChild:(PBSourceViewItem *)child;
 - (void)removeChild:(PBSourceViewItem *)child;
-- (NSImage*)iconNamed:(NSString*)name;
 
 // This adds the ref to the path, which should match the item's title,
 // so "refs/heads/pu/pb/sidebar" would have the path [@"pu", @"pb", @"sidebare"]
 // to the 'local' branch thing
 - (void)addRev:(PBGitRevSpecifier *)revSpecifier toPath:(NSArray *)path;
-- (PBSourceViewItem *)findRev:(PBGitRevSpecifier *)rev;
+- (nullable PBSourceViewItem *)findRev:(PBGitRevSpecifier *)rev;
 
-- (PBGitRef *) ref;
+- (nullable PBGitRef *)ref;
 
-@property NSString *title;
-@property(nonatomic, readonly) NSArray *sortedChildren;
-@property(assign) BOOL isGroupItem, isUncollapsible, isExpanded;
+@property (readonly) NSString *title;
+@property (readonly) NSArray *sortedChildren;
+@property (getter=isGroupItem) BOOL groupItem;
+@property (getter=isUncollapsible) BOOL uncollapsible;
+@property (getter=isExpanded) BOOL expanded;
 @property PBGitRevSpecifier *revSpecifier;
-@property (assign)PBSourceViewItem *parent;
-@property(readonly) NSString *iconName;
-@property(readonly) NSImage *icon;
+@property PBSourceViewItem *parent;
+@property (readonly) NSString *iconName;
+@property (nullable, readonly) NSImage *icon;
 
 @end
+
+NS_ASSUME_NONNULL_END