projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak some animations, clean up for preparation to move to app delegate.
[enjoyable.git]
/
Classes
/
NJMapping.h
diff --git
a/Classes/NJMapping.h
b/Classes/NJMapping.h
index
8b80012
..
be3aa76
100644
(file)
--- a/
Classes/NJMapping.h
+++ b/
Classes/NJMapping.h
@@
-15,12
+15,10
@@
@property (nonatomic, readonly) NSUInteger count;
+ (id)mappingWithContentsOfURL:(NSURL *)url
@property (nonatomic, readonly) NSUInteger count;
+ (id)mappingWithContentsOfURL:(NSURL *)url
- mappings:(NSArray *)mappings
error:(NSError **)error;
- (id)initWithName:(NSString *)name;
error:(NSError **)error;
- (id)initWithName:(NSString *)name;
-- (id)initWithSerialization:(NSDictionary *)serialization
- mappings:(NSArray *)mappings;
+- (id)initWithSerialization:(NSDictionary *)serialization;
- (NJOutput *)objectForKeyedSubscript:(NJInput *)input;
- (void)setObject:(NJOutput *)output forKeyedSubscript:(NJInput *)input;
- (NJOutput *)objectForKeyedSubscript:(NJInput *)input;
- (void)setObject:(NJOutput *)output forKeyedSubscript:(NJInput *)input;
@@
-29,4
+27,6
@@
- (BOOL)hasConflictWith:(NJMapping *)other;
- (void)mergeEntriesFrom:(NJMapping *)other;
- (BOOL)hasConflictWith:(NJMapping *)other;
- (void)mergeEntriesFrom:(NJMapping *)other;
+- (void)postLoadProcess:(id <NSFastEnumeration>)allMappings;
+
@end
@end