diff options
author | Eddie Ehlin <eddiex@eddiex.se> | 2013-01-05 12:04:06 +0100 |
---|---|---|
committer | Eddie Ehlin <eddiex@eddiex.se> | 2013-01-05 12:04:06 +0100 |
commit | 52c6a025228838a0e97a3af39f5ef1b90d43f53a (patch) | |
tree | 9b715079731fab6dc3d3c2ee979118b978b4a1ef /iBean/iBean | |
parent | 50004ee7e4c682d1a7bf38004ddb911ddd130f08 (diff) | |
download | iBean-52c6a025228838a0e97a3af39f5ef1b90d43f53a.tar.gz iBean-52c6a025228838a0e97a3af39f5ef1b90d43f53a.zip |
Renamed/refactored iBeanListViewController to BeanCollectionListViewController + changed extractionCounter to extractionCount in BeanCollection entity
Diffstat (limited to 'iBean/iBean')
-rw-r--r-- | iBean/iBean/Bean.h | 2 | ||||
-rw-r--r-- | iBean/iBean/Bean.m | 2 | ||||
-rw-r--r-- | iBean/iBean/BeanCollection.h | 8 | ||||
-rw-r--r-- | iBean/iBean/BeanCollection.m | 8 | ||||
-rw-r--r-- | iBean/iBean/BeanCollectionListViewController.h (renamed from iBean/iBean/iBeanListViewController.h) | 4 | ||||
-rw-r--r-- | iBean/iBean/BeanCollectionListViewController.m (renamed from iBean/iBean/iBeanListViewController.m) | 12 | ||||
-rw-r--r-- | iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents | 6 | ||||
-rw-r--r-- | iBean/iBean/iPhoneStoryboard.storyboard | 7 |
8 files changed, 23 insertions, 26 deletions
diff --git a/iBean/iBean/Bean.h b/iBean/iBean/Bean.h index d42a98f..80094b3 100644 --- a/iBean/iBean/Bean.h +++ b/iBean/iBean/Bean.h @@ -13,9 +13,9 @@ @interface Bean : NSManagedObject -@property (nonatomic, retain) NSString * name; @property (nonatomic, retain) NSNumber * amount; @property (nonatomic, retain) NSNumber * grindSetting; +@property (nonatomic, retain) NSString * name; @property (nonatomic, retain) BeanCollection *beanCollection; @end diff --git a/iBean/iBean/Bean.m b/iBean/iBean/Bean.m index e9b85fa..fbb21b3 100644 --- a/iBean/iBean/Bean.m +++ b/iBean/iBean/Bean.m @@ -12,9 +12,9 @@ @implementation Bean -@dynamic name; @dynamic amount; @dynamic grindSetting; +@dynamic name; @dynamic beanCollection; @end diff --git a/iBean/iBean/BeanCollection.h b/iBean/iBean/BeanCollection.h index 73f935d..801fa4c 100644 --- a/iBean/iBean/BeanCollection.h +++ b/iBean/iBean/BeanCollection.h @@ -13,12 +13,12 @@ @interface BeanCollection : NSManagedObject -@property (nonatomic, retain) NSString * name; -@property (nonatomic, retain) NSNumber * extractionTime; @property (nonatomic, retain) NSDate * created; -@property (nonatomic, retain) NSNumber * extractionCounter; -@property (nonatomic, retain) NSString * note; +@property (nonatomic, retain) NSNumber * extractionCount; +@property (nonatomic, retain) NSNumber * extractionTime; @property (nonatomic, retain) NSDate * modified; +@property (nonatomic, retain) NSString * name; +@property (nonatomic, retain) NSString * note; @property (nonatomic, retain) NSSet *beans; @end diff --git a/iBean/iBean/BeanCollection.m b/iBean/iBean/BeanCollection.m index cfeceda..39107ba 100644 --- a/iBean/iBean/BeanCollection.m +++ b/iBean/iBean/BeanCollection.m @@ -12,12 +12,12 @@ @implementation BeanCollection -@dynamic name; -@dynamic extractionTime; @dynamic created; -@dynamic extractionCounter; -@dynamic note; +@dynamic extractionCount; +@dynamic extractionTime; @dynamic modified; +@dynamic name; +@dynamic note; @dynamic beans; @end diff --git a/iBean/iBean/iBeanListViewController.h b/iBean/iBean/BeanCollectionListViewController.h index f0a76b9..a433417 100644 --- a/iBean/iBean/iBeanListViewController.h +++ b/iBean/iBean/BeanCollectionListViewController.h @@ -1,5 +1,5 @@ // -// iBeanListViewController.h +// BeanCollectionListViewController.h // iBean // // Created by Eddie Ehlin on 2013-01-03. @@ -8,7 +8,7 @@ #import <UIKit/UIKit.h> -@interface iBeanListViewController : UITableViewController +@interface BeanCollectionListViewController : UITableViewController @property (nonatomic, strong) NSArray *beanCollections; diff --git a/iBean/iBean/iBeanListViewController.m b/iBean/iBean/BeanCollectionListViewController.m index ac97a10..3869497 100644 --- a/iBean/iBean/iBeanListViewController.m +++ b/iBean/iBean/BeanCollectionListViewController.m @@ -1,20 +1,20 @@ // -// iBeanListViewController.m +// BeanCollectionListViewController.m // iBean // // Created by Eddie Ehlin on 2013-01-03. // Copyright (c) 2013 Eddie Ehlin. All rights reserved. // -#import "iBeanListViewController.h" +#import "BeanCollectionListViewController.h" #import "BeanCollection.h" #import "AppDelegate+Storage.h" -@interface iBeanListViewController () +@interface BeanCollectionListViewController () @end -@implementation iBeanListViewController +@implementation BeanCollectionListViewController - (id)initWithStyle:(UITableViewStyle)style { @@ -28,7 +28,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - NSLog(@"iBeanListViewController view's loaded!"); + NSLog(@"BeanCollectionListViewController view's loaded!"); // Uncomment the following line to preserve selection between presentations. @@ -157,7 +157,7 @@ *****************************************************/ - (void) initViewController { - NSLog(@"iBeanListViewController - initViewController"); + NSLog(@"BeanCollectionListViewController - initViewController"); //Load bean collections from core data storage self.beanCollections = [(AppDelegate*) [[UIApplication sharedApplication] delegate] getBeanCollections]; diff --git a/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents b/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents index cbceae9..4677f93 100644 --- a/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents +++ b/iBean/iBean/iBean.xcdatamodeld/iBean.xcdatamodel/contents @@ -8,7 +8,7 @@ </entity> <entity name="BeanCollection" representedClassName="BeanCollection" syncable="YES"> <attribute name="created" optional="YES" attributeType="Date" syncable="YES"/> - <attribute name="extractionCounter" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/> + <attribute name="extractionCount" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/> <attribute name="extractionTime" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/> <attribute name="modified" optional="YES" attributeType="Date" syncable="YES"/> <attribute name="name" optional="YES" attributeType="String" syncable="YES"/> @@ -19,8 +19,8 @@ <attribute name="extractionTime" optional="YES" attributeType="Double" defaultValueString="0.0" syncable="YES"/> </entity> <elements> - <element name="InstaBeanConfiguration" positionX="160" positionY="192" width="128" height="60"/> - <element name="BeanCollection" positionX="160" positionY="192" width="128" height="148"/> <element name="Bean" positionX="-369" positionY="111" width="128" height="105"/> + <element name="BeanCollection" positionX="160" positionY="192" width="128" height="150"/> + <element name="InstaBeanConfiguration" positionX="160" positionY="192" width="128" height="60"/> </elements> </model>
\ No newline at end of file diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index aca958d..cfa726d 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -4,10 +4,10 @@ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1930"/> </dependencies> <scenes> - <!--I Bean List View Controller - iBean--> + <!--Bean Collection List View Controller - iBean--> <scene sceneID="SSu-AL-Mw5"> <objects> - <tableViewController id="agK-tm-pZO" customClass="iBeanListViewController" sceneMemberID="viewController"> + <tableViewController id="agK-tm-pZO" customClass="BeanCollectionListViewController" sceneMemberID="viewController"> <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="Mma-e7-grn"> <rect key="frame" x="0.0" y="64" width="320" height="455"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> @@ -436,9 +436,6 @@ <class className="NSLayoutConstraint" superclassName="NSObject"> <source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/> </class> - <class className="iBeanListViewController" superclassName="UITableViewController"> - <source key="sourceIdentifier" type="project" relativePath="./Classes/iBeanListViewController.h"/> - </class> </classes> <simulatedMetricsContainer key="defaultSimulatedMetrics"> <simulatedStatusBarMetrics key="statusBar"/> |