From 9261a9b7f0cbd1c4224e2cfdb7d94cc186c7449b Mon Sep 17 00:00:00 2001 From: Michael Starke Date: Tue, 15 Jan 2019 23:54:03 +0100 Subject: [PATCH] using properties --- MacPass/MPAttachmentTableViewDelegate.m | 2 +- MacPass/MPEntryInspectorViewController.m | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MacPass/MPAttachmentTableViewDelegate.m b/MacPass/MPAttachmentTableViewDelegate.m index 0dbdd426..90feef08 100644 --- a/MacPass/MPAttachmentTableViewDelegate.m +++ b/MacPass/MPAttachmentTableViewDelegate.m @@ -45,7 +45,7 @@ NSTableCellView *view; if([selectedIndexes containsIndex:row]) { MPSelectedAttachmentTableCellView *cellView = [tableView makeViewWithIdentifier:@"SelectedCell" owner:tableView]; - [cellView.actionButton setMenu:[self allocateActionMenu]]; + cellView.actionButton.menu = [self allocateActionMenu]; view = cellView; } else { diff --git a/MacPass/MPEntryInspectorViewController.m b/MacPass/MPEntryInspectorViewController.m index 64a4cdd8..47a6ac74 100644 --- a/MacPass/MPEntryInspectorViewController.m +++ b/MacPass/MPEntryInspectorViewController.m @@ -200,17 +200,16 @@ typedef NS_ENUM(NSUInteger, MPEntryTab) { [self.observer didChangeModelProperty]; } - (void)removeCustomField:(id)sender { - NSUInteger index = [sender tag]; - NSUInteger viewIndex = [self.customFieldsTableView rowForView:sender]; - NSLog(@"index:%ld viewIndex:%ld", index, viewIndex); - KPKAttribute *attribute = self.representedEntry.customAttributes[index]; + NSInteger rowIndex = [self.customFieldsTableView rowForView:sender]; + NSAssert(rowIndex > 0 && rowIndex < self.representedEntry.customAttributes.count, @"Invalid custom attribute index."); + KPKAttribute *attribute = self.representedEntry.customAttributes[rowIndex]; [self.observer willChangeModelProperty]; [self.representedEntry removeCustomAttribute:attribute]; [self.observer didChangeModelProperty]; } - (void)saveAttachment:(id)sender { - NSInteger row = [self.attachmentTableView selectedRow]; + NSInteger row = self.attachmentTableView.selectedRow; if(row < 0) { return; // No selection }