Avoid repeating serialization codes.

diff --git a/NJOutputKeyPress.m b/NJOutputKeyPress.m
index 5371475bba11c97af2619c9f5a85efc9f6f6a603..622cf41083d21d58195099567e0e5d81c777459d 100644 (file)
--- a/NJOutputKeyPress.m
+++ b/NJOutputKeyPress.m
@@ -16,7 +16,9 @@
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"key press", @"key": @(_vk) };
+    return _vk != NJKeyInputFieldEmpty
+        ? @{ @"type": self.class.serializationCode, @"key": @(_vk) }
+        : nil;
 }
 
 + (NJOutput *)outputDeserialize:(NSDictionary *)serialization

diff --git a/NJOutputMapping.m b/NJOutputMapping.m
index 5cd5d9f9fd12115760ec84c4315948b2f38db631..6c1ba95ef55529236660c2cfa88c4426ec5906d2 100644 (file)
--- a/NJOutputMapping.m
+++ b/NJOutputMapping.m
@@ -19,7 +19,7 @@
 
 - (NSDictionary *)serialize {
     return _mapping
-        ? @{ @"type": @"mapping", @"name": _mapping.name }
+        ? @{ @"type": self.class.serializationCode, @"name": _mapping.name }
         : nil;
 }
 

diff --git a/NJOutputMouseButton.m b/NJOutputMouseButton.m
index 0cc403f9e533932050d2ea019b3588068f451f7d..ad44b39db2b820dacdff0726b962d960d2930031 100644 (file)
--- a/NJOutputMouseButton.m
+++ b/NJOutputMouseButton.m
@@ -14,7 +14,7 @@
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"mouse button", @"button": @(_button) };
+    return @{ @"type": self.class.serializationCode, @"button": @(_button) };
 }
 
 + (NJOutput *)outputDeserialize:(NSDictionary *)serialization

diff --git a/NJOutputMouseMove.m b/NJOutputMouseMove.m
index 3346fb2708e683d075b9b4431474e32529eb676f..8efb8cb29c174c1708b5b55762e81c0bd9dd3f87 100644 (file)
--- a/NJOutputMouseMove.m
+++ b/NJOutputMouseMove.m
@@ -22,7 +22,7 @@
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"mouse move", @"axis": @(_axis) };
+    return @{ @"type": self.class.serializationCode, @"axis": @(_axis) };
 }
 
 + (NJOutput *)outputDeserialize:(NSDictionary *)serialization

diff --git a/NJOutputMouseScroll.m b/NJOutputMouseScroll.m
index 2f6d2d685d9a307b17313340a5a7ea27cf1cf260..4aa614db0aa3cfe75e8ed1c3ef3337ac6174b287 100644 (file)
--- a/NJOutputMouseScroll.m
+++ b/NJOutputMouseScroll.m
@@ -16,7 +16,7 @@
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"mouse scroll", @"amount": @(_amount) };
+    return @{ @"type": self.class.serializationCode, @"amount": @(_amount) };
 }
 
 + (NJOutput *)outputDeserialize:(NSDictionary *)serialization

diff --git a/NJOutputSwitchMouseMode.m b/NJOutputSwitchMouseMode.m
index 1750869e098f5cb37a281426f2434dd5204ff7c8..130a2a0eebed86f617458df2f470ebaace3517b8 100644 (file)
--- a/NJOutputSwitchMouseMode.m
+++ b/NJOutputSwitchMouseMode.m
@@ -17,7 +17,7 @@
 }
 
 - (NSDictionary *)serialize {
-    return @{ @"type": @"switch mouse mode" };
+    return @{ @"type": self.class.serializationCode };
 }
 
 + (NJOutput *)outputDeserialize:(NSDictionary *)serialization