X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMapping.h;h=be3aa7689c3c44eef4780e7083e696491d833d64;hp=5653745a0562fd7532c5f82949ddb3e40978f1b2;hb=HEAD;hpb=0064c1fbff36795885a9724081af2a17d83c20a3

diff --git a/Classes/NJMapping.h b/Classes/NJMapping.h
index 5653745..be3aa76 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
+                         error:(NSError **)error;
 
 - (id)initWithName:(NSString *)name;
+- (id)initWithSerialization:(NSDictionary *)serialization;
+
 - (NJOutput *)objectForKeyedSubscript:(NJInput *)input;
 - (void)setObject:(NJOutput *)output forKeyedSubscript:(NJInput *)input;
 - (NSDictionary *)serialize;
 - (BOOL)writeToURL:(NSURL *)url error:(NSError **)error;
+- (BOOL)hasConflictWith:(NJMapping *)other;
+- (void)mergeEntriesFrom:(NJMapping *)other;
 
-+ (id)mappingWithContentsOfURL:(NSURL *)url mappings:(NSArray *)mappings error:(NSError **)error;
+- (void)postLoadProcess:(id <NSFastEnumeration>)allMappings;
 
 @end