Cleanup, renaming restructuring, etc.

platform-darwin/Source/MPKey.m

@@ -1,19 +1,20 @@
-/**
-* Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
-*
-* See the enclosed file LICENSE for license information (LGPLv3). If you did
-* not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
-*
-* @author   Maarten Billemont <lhunath@lyndir.com>
-* @license  http://www.gnu.org/licenses/lgpl-3.0.txt
-*/
-
+//==============================================================================
+// This file is part of Master Password.
+// Copyright (c) 2011-2017, Maarten Billemont.
 //
-//  MPKey
+// Master Password is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
 //
-//  Created by Maarten Billemont on 16/07/12.
-//  Copyright 2012 lhunath (Maarten Billemont). All rights reserved.
+// Master Password is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
+// You can find a copy of the GNU General Public License in the
+// LICENSE file.  Alternatively, see <http://www.gnu.org/licenses/>.
+//==============================================================================
 
 #import "MPAlgorithm.h"
 
@@ -22,12 +23,11 @@
 @property(nonatomic) MPKeyOrigin origin;
 @property(nonatomic, copy) NSString *fullName;
 @property(nonatomic, copy) NSData *( ^keyResolver )(id<MPAlgorithm>);
+@property(nonatomic, strong) NSCache *keyCache;
 
 @end
 
-@implementation MPKey {
-    NSCache *_keyCache;
-};
+@implementation MPKey;
 
 - (instancetype)initForFullName:(NSString *)fullName withMasterPassword:(NSString *)masterPassword {
 
@@ -42,7 +42,7 @@
     if (!(self = [super init]))
         return nil;
 
-    _keyCache = [NSCache new];
+    self.keyCache = [NSCache new];
 
     self.origin = origin;
     self.fullName = fullName;
@@ -59,13 +59,13 @@
 - (NSData *)keyDataForAlgorithm:(id<MPAlgorithm>)algorithm {
 
     @synchronized (self) {
-        NSData *keyData = [_keyCache objectForKey:algorithm];
+        NSData *keyData = [self.keyCache objectForKey:algorithm];
         if (keyData)
             return keyData;
 
         keyData = self.keyResolver( algorithm );
         if (keyData)
-            [_keyCache setObject:keyData forKey:algorithm];
+            [self.keyCache setObject:keyData forKey:algorithm];
 
         return keyData;
     }