X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMapping.h;h=8b800123f49a22fb4344a01cc67aa744c12e5de8;hp=5653745a0562fd7532c5f82949ddb3e40978f1b2;hb=93c9d4bc39c6addbab6dbc7878d3684e42bbdc01;hpb=1d9578185de7fb08cf1f4b1e42812e87d8e18040

diff --git a/Classes/NJMapping.h b/Classes/NJMapping.h
index 5653745..8b80012 100644
--- a/Classes/NJMapping.h
+++ b/Classes/NJMapping.h
@@ -12,14 +12,21 @@
 @interface NJMapping : NSObject
 
 @property (nonatomic, copy) NSString *name;
-@property (nonatomic, readonly) NSMutableDictionary *entries;
+@property (nonatomic, readonly) NSUInteger count;
+
++ (id)mappingWithContentsOfURL:(NSURL *)url
+                      mappings:(NSArray *)mappings
+                         error:(NSError **)error;
 
 - (id)initWithName:(NSString *)name;
+- (id)initWithSerialization:(NSDictionary *)serialization
+                   mappings:(NSArray *)mappings;
+
 - (NJOutput *)objectForKeyedSubscript:(NJInput *)input;
 - (void)setObject:(NJOutput *)output forKeyedSubscript:(NJInput *)input;
 - (NSDictionary *)serialize;
 - (BOOL)writeToURL:(NSURL *)url error:(NSError **)error;
-
-+ (id)mappingWithContentsOfURL:(NSURL *)url mappings:(NSArray *)mappings error:(NSError **)error;
+- (BOOL)hasConflictWith:(NJMapping *)other;
+- (void)mergeEntriesFrom:(NJMapping *)other;
 
 @end