projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generalize and share mapping menu (main, status, dock) behavior.
[enjoyable.git]
/
Classes
/
NJMapping.h
diff --git
a/Classes/NJMapping.h
b/Classes/NJMapping.h
index
5653745
..
8b80012
100644
(file)
--- a/
Classes/NJMapping.h
+++ b/
Classes/NJMapping.h
@@
-12,14
+12,21
@@
@interface NJMapping : NSObject
@property (nonatomic, copy) NSString *name;
@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)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;
- (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 **)erro
r;
+- (BOOL)hasConflictWith:(NJMapping *)other;
+
- (void)mergeEntriesFrom:(NJMapping *)othe
r;
@end
@end