projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change two-pass behavior for loading mappings. Allow lazy binding of mappings by...
[enjoyable.git]
/
Classes
/
EnjoyableApplicationDelegate.m
diff --git
a/Classes/EnjoyableApplicationDelegate.m
b/Classes/EnjoyableApplicationDelegate.m
index
fe781ef
..
26ea09c
100644
(file)
--- a/
Classes/EnjoyableApplicationDelegate.m
+++ b/
Classes/EnjoyableApplicationDelegate.m
@@
-138,7
+138,6
@@
NSError *error;
NSURL *URL = [NSURL fileURLWithPath:filename];
NJMapping *mapping = [NJMapping mappingWithContentsOfURL:URL
NSError *error;
NSURL *URL = [NSURL fileURLWithPath:filename];
NJMapping *mapping = [NJMapping mappingWithContentsOfURL:URL
- mappings:self.mappingsController
error:&error];
if (mapping) {
[self.mappingsController addOrMergeMapping:mapping];
error:&error];
if (mapping) {
[self.mappingsController addOrMergeMapping:mapping];
@@
-213,7
+212,6
@@
[panel close];
NSError *error;
NJMapping *mapping = [NJMapping mappingWithContentsOfURL:panel.URL
[panel close];
NSError *error;
NJMapping *mapping = [NJMapping mappingWithContentsOfURL:panel.URL
- mappings:self.mappingsController
error:&error];
if (mapping) {
[self.mappingsController addOrMergeMapping:mapping];
error:&error];
if (mapping) {
[self.mappingsController addOrMergeMapping:mapping];