nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 12:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

using property syntax

Browse Source 
Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
This commit is contained in:
michael starke
2015-10-07 15:54:17 +02:00
parent 1f18b2c03d
commit cd925a81f3
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MacPass/MPDocument.m
View File

@@ -494,11 +494,11 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
} }
- (void)deleteNode:(KPKNode *)node { - (void)deleteNode:(KPKNode *)node {
if([node asGroup]) { if(node.asGroup) {
[self deleteGroup:[node asGroup]]; [self deleteGroup:node.asGroup];
} }
else if([node asEntry]) { else if(node.asEntry) {
[self deleteEntry:[node asEntry]]; [self deleteEntry:node.asEntry];
} }
} }
@@ -554,7 +554,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
} }
- (void)_presentTrashAlertForItem:(KPKNode *)node { - (void)_presentTrashAlertForItem:(KPKNode *)node {
KPKEntry *entry = [node asEntry]; KPKEntry *entry = node.asEntry;
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
[alert setAlertStyle:NSWarningAlertStyle]; [alert setAlertStyle:NSWarningAlertStyle];
@@ -574,10 +574,10 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
if(returnCode == NSAlertFirstButtonReturn) { if(returnCode == NSAlertFirstButtonReturn) {
KPKNode *node = (__bridge KPKNode *)(contextInfo); KPKNode *node = (__bridge KPKNode *)(contextInfo);
/* No undo on this operation */ /* No undo on this operation */
for( KPKEntry *entry in [[node asGroup] childEntries]) { for( KPKEntry *entry in node.asGroup.childEntries) {
[node.undoManager removeAllActionsWithTarget:entry]; [node.undoManager removeAllActionsWithTarget:entry];
} }
for(KPKGroup *group in [[node asGroup] childGroups]) { for(KPKGroup *group in node.asGroup.childGroups) {
[node.undoManager removeAllActionsWithTarget:group]; [node.undoManager removeAllActionsWithTarget:group];
} }
[node remove]; [node remove];
@@ -640,10 +640,10 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey
KPKGroup *targetGroup = [groupResolver currentTargetGroup]; KPKGroup *targetGroup = [groupResolver currentTargetGroup];
/* /*
if([targetNode asGroup]) { if(targetNode.asGroup) {
NSLog(@"targetNode:%@", ((KPKGroup *)targetNode).name); NSLog(@"targetNode:%@", ((KPKGroup *)targetNode).name);
} }
else if([targetNode asEntry]) { else if(targetNode.asEntry) {
NSLog(@"targetNode:%@", ((KPKEntry *)targetNode).title); NSLog(@"targetNode:%@", ((KPKEntry *)targetNode).title);
} }

12
MacPass/MPEntryViewController.m
View File

@@ -650,21 +650,21 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
#pragma mark Actions #pragma mark Actions
- (void)copyPassword:(id)sender { - (void)copyPassword:(id)sender {
KPKEntry *selectedEntry = [[self currentTargetNode] asEntry]; KPKEntry *selectedEntry = [self currentTargetNode].asEntry;
if(selectedEntry) { if(selectedEntry) {
[self _copyToPasteboard:[selectedEntry.password finalValueForEntry:selectedEntry] overlayInfo:MPOverlayInfoPassword name:nil]; [self _copyToPasteboard:[selectedEntry.password finalValueForEntry:selectedEntry] overlayInfo:MPOverlayInfoPassword name:nil];
} }
} }
- (void)copyUsername:(id)sender { - (void)copyUsername:(id)sender {
KPKEntry *selectedEntry = [[self currentTargetNode] asEntry]; KPKEntry *selectedEntry = [self currentTargetNode].asEntry;
if(selectedEntry) { if(selectedEntry) {
[self _copyToPasteboard:[selectedEntry.username finalValueForEntry:selectedEntry] overlayInfo:MPOverlayInfoUsername name:nil]; [self _copyToPasteboard:[selectedEntry.username finalValueForEntry:selectedEntry] overlayInfo:MPOverlayInfoUsername name:nil];
} }
} }
- (void)copyCustomAttribute:(id)sender { - (void)copyCustomAttribute:(id)sender {
KPKEntry *selectedEntry = [[self currentTargetNode] asEntry]; KPKEntry *selectedEntry = [self currentTargetNode].asEntry;
if(selectedEntry && [selectedEntry isKindOfClass:[KPKEntry class]]) { if(selectedEntry && [selectedEntry isKindOfClass:[KPKEntry class]]) {
NSUInteger index = [sender tag]; NSUInteger index = [sender tag];
NSAssert((index >= 0) && (index < [selectedEntry.customAttributes count]), @"Index for custom field needs to be valid"); NSAssert((index >= 0) && (index < [selectedEntry.customAttributes count]), @"Index for custom field needs to be valid");
@@ -674,14 +674,14 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
} }
- (void)copyURL:(id)sender { - (void)copyURL:(id)sender {
KPKEntry *selectedEntry = [[self currentTargetNode] asEntry]; KPKEntry *selectedEntry = [self currentTargetNode].asEntry;
if(selectedEntry) { if(selectedEntry) {
[self _copyToPasteboard:[selectedEntry.url finalValueForEntry:selectedEntry] overlayInfo:MPOverlayInfoURL name:nil]; [self _copyToPasteboard:[selectedEntry.url finalValueForEntry:selectedEntry] overlayInfo:MPOverlayInfoURL name:nil];
} }
} }
- (void)openURL:(id)sender { - (void)openURL:(id)sender {
KPKEntry *selectedEntry = [[self currentTargetNode] asEntry]; KPKEntry *selectedEntry = [self currentTargetNode].asEntry;
NSString *expandedURL = [selectedEntry.url finalValueForEntry:selectedEntry]; NSString *expandedURL = [selectedEntry.url finalValueForEntry:selectedEntry];
if(expandedURL.length > 0) { if(expandedURL.length > 0) {
NSURL *webURL = [NSURL URLWithString:[expandedURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; NSURL *webURL = [NSURL URLWithString:[expandedURL stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
@@ -707,7 +707,7 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
} }
- (void)delete:(id)sender { - (void)delete:(id)sender {
KPKEntry *entry = [[self currentTargetNode] asEntry]; KPKEntry *entry = [self currentTargetNode].asEntry;
if(!entry) { if(!entry) {
return; return;
} }