projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6044e47
)
Avoid repeating serialization codes.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Tue, 5 Mar 2013 00:56:13 +0000
(
01:56
+0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Tue, 5 Mar 2013 00:56:13 +0000
(
01:56
+0100)
NJOutputKeyPress.m
patch
|
blob
|
history
NJOutputMapping.m
patch
|
blob
|
history
NJOutputMouseButton.m
patch
|
blob
|
history
NJOutputMouseMove.m
patch
|
blob
|
history
NJOutputMouseScroll.m
patch
|
blob
|
history
NJOutputSwitchMouseMode.m
patch
|
blob
|
history
diff --git
a/NJOutputKeyPress.m
b/NJOutputKeyPress.m
index
5371475
..
622cf41
100644
(file)
--- a/
NJOutputKeyPress.m
+++ b/
NJOutputKeyPress.m
@@
-16,7
+16,9
@@
}
- (NSDictionary *)serialize {
}
- (NSDictionary *)serialize {
- return @{ @"type": @"key press", @"key": @(_vk) };
+ return _vk != NJKeyInputFieldEmpty
+ ? @{ @"type": self.class.serializationCode, @"key": @(_vk) }
+ : nil;
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
diff --git
a/NJOutputMapping.m
b/NJOutputMapping.m
index
5cd5d9f
..
6c1ba95
100644
(file)
--- a/
NJOutputMapping.m
+++ b/
NJOutputMapping.m
@@
-19,7
+19,7
@@
- (NSDictionary *)serialize {
return _mapping
- (NSDictionary *)serialize {
return _mapping
- ? @{ @"type":
@"mapping"
, @"name": _mapping.name }
+ ? @{ @"type":
self.class.serializationCode
, @"name": _mapping.name }
: nil;
}
: nil;
}
diff --git
a/NJOutputMouseButton.m
b/NJOutputMouseButton.m
index
0cc403f
..
ad44b39
100644
(file)
--- a/
NJOutputMouseButton.m
+++ b/
NJOutputMouseButton.m
@@
-14,7
+14,7
@@
}
- (NSDictionary *)serialize {
}
- (NSDictionary *)serialize {
- return @{ @"type":
@"mouse button"
, @"button": @(_button) };
+ return @{ @"type":
self.class.serializationCode
, @"button": @(_button) };
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
diff --git
a/NJOutputMouseMove.m
b/NJOutputMouseMove.m
index
3346fb2
..
8efb8cb
100644
(file)
--- a/
NJOutputMouseMove.m
+++ b/
NJOutputMouseMove.m
@@
-22,7
+22,7
@@
}
- (NSDictionary *)serialize {
}
- (NSDictionary *)serialize {
- return @{ @"type":
@"mouse move"
, @"axis": @(_axis) };
+ return @{ @"type":
self.class.serializationCode
, @"axis": @(_axis) };
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
diff --git
a/NJOutputMouseScroll.m
b/NJOutputMouseScroll.m
index
2f6d2d6
..
4aa614d
100644
(file)
--- a/
NJOutputMouseScroll.m
+++ b/
NJOutputMouseScroll.m
@@
-16,7
+16,7
@@
}
- (NSDictionary *)serialize {
}
- (NSDictionary *)serialize {
- return @{ @"type":
@"mouse scroll"
, @"amount": @(_amount) };
+ return @{ @"type":
self.class.serializationCode
, @"amount": @(_amount) };
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
diff --git
a/NJOutputSwitchMouseMode.m
b/NJOutputSwitchMouseMode.m
index
1750869
..
130a2a0
100644
(file)
--- a/
NJOutputSwitchMouseMode.m
+++ b/
NJOutputSwitchMouseMode.m
@@
-17,7
+17,7
@@
}
- (NSDictionary *)serialize {
}
- (NSDictionary *)serialize {
- return @{ @"type":
@"switch mouse mode"
};
+ return @{ @"type":
self.class.serializationCode
};
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization
}
+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization