Little refactor in world serialization.

Author: bladecoder

blade-engine/src/com/bladecoder/engine/serialization/WorldSerialization.java

@@ -244,18 +244,16 @@ public void saveGameState(String filename) throws IOException {
 	@Override
 	public void write(Json json) {
 		BladeJson bjson = (BladeJson) json;
+		
+		json.writeValue(Config.BLADE_ENGINE_VERSION_PROP,
+				Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, null));
 
 		if (bjson.getMode() == Mode.MODEL) {
-			json.writeValue(Config.BLADE_ENGINE_VERSION_PROP,
-					Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, null));
-
 			json.writeValue("sounds", w.getSounds(), w.getSounds().getClass(), SoundDesc.class);
 			json.writeValue("scenes", w.getScenes(), w.getScenes().getClass(), Scene.class);
 			json.writeValue("initScene", w.getInitScene());
 
 		} else {
-			json.writeValue(Config.BLADE_ENGINE_VERSION_PROP,
-					Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, null));
 			json.writeValue(Config.VERSION_PROP, Config.getProperty(Config.VERSION_PROP, null));
 			json.writeValue("scenes", w.getScenes(), w.getScenes().getClass(), Scene.class);
 			json.writeValue("currentScene", w.getCurrentScene().getId());
@@ -288,12 +286,13 @@ public void write(Json json) {
 
 	@Override
 	public void read(Json json, JsonValue jsonData) {
+		
+		String bladeVersion = json.readValue(Config.BLADE_ENGINE_VERSION_PROP, String.class, jsonData);
 
 		BladeJson bjson = (BladeJson) json;
 		if (bjson.getMode() == Mode.MODEL) {
-			String version = json.readValue(Config.BLADE_ENGINE_VERSION_PROP, String.class, jsonData);
-			if (version != null && !version.equals(Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
-				EngineLogger.debug("Model Engine Version v" + version + " differs from Current Engine Version v"
+			if (bladeVersion != null && !bladeVersion.equals(Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
+				EngineLogger.debug("Model Engine Version v" + bladeVersion + " differs from Current Engine Version v"
 						+ Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
 			}
 
@@ -333,19 +332,13 @@ public void read(Json json, JsonValue jsonData) {
 			// Add sounds to cache
 			cacheSounds();
 		} else {
-			String bladeVersion = json.readValue(Config.BLADE_ENGINE_VERSION_PROP, String.class, jsonData);
 			if (bladeVersion != null
 					&& !bladeVersion.equals(Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""))) {
 				EngineLogger
 						.debug("Saved Game Engine Version v" + bladeVersion + " differs from Current Engine Version v"
 								+ Config.getProperty(Config.BLADE_ENGINE_VERSION_PROP, ""));
 			}
 
-			String version = json.readValue(Config.VERSION_PROP, String.class, jsonData);
-
-			if (version == null)
-				version = "TEST";
-
 			String currentChapter = json.readValue("chapter", String.class, jsonData);
 			String currentScene = json.readValue("currentScene", String.class, jsonData);
 
@@ -402,6 +395,9 @@ public void read(Json json, JsonValue jsonData) {
 				props.put(jsonValue.name, jsonValue.asString());
 			}
 
+			String version = json.readValue(Config.VERSION_PROP, String.class, jsonData);
+			if (version == null)
+				version = "TEST";
 			props.put(WorldProperties.SAVED_GAME_VERSION.toString(), version);
 
 			String actorId = json.readValue("dialogActor", String.class, jsonData);