From 53bc93a15cfb7020c9913157fd223e09d0cf7583 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Wed, 5 Dec 2018 18:43:57 +0100
Subject: [PATCH] World can be exported as JSONObject

---
 nbproject/project.properties                  |  2 +-
 .../gui/AssetEditor/AssetListDialog.java      |  2 +-
 src/opensesim/world/World.java                | 38 ++++++++++++++-----
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 307bc4f..de91a1b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,4 +1,4 @@
-#Wed, 05 Dec 2018 18:03:39 +0100
+#Wed, 05 Dec 2018 18:41:22 +0100
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=
diff --git a/src/opensesim/gui/AssetEditor/AssetListDialog.java b/src/opensesim/gui/AssetEditor/AssetListDialog.java
index 459e8f5..2544909 100644
--- a/src/opensesim/gui/AssetEditor/AssetListDialog.java
+++ b/src/opensesim/gui/AssetEditor/AssetListDialog.java
@@ -177,7 +177,7 @@ public class AssetListDialog extends EscDialog {
 
         AssetEditorDialog.runDialog(this, worldadm, o, null);
         assetListPanel.reload();
-
+        
     }//GEN-LAST:event_newButtonActionPerformed
 
     private void doneButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_doneButtonActionPerformed
diff --git a/src/opensesim/world/World.java b/src/opensesim/world/World.java
index c38a635..2c8d820 100644
--- a/src/opensesim/world/World.java
+++ b/src/opensesim/world/World.java
@@ -34,8 +34,10 @@ import java.util.HashSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import opensesim.sesim.AssetPair;
+import opensesim.sesim.interfaces.GetJson;
 import opensesim.util.idgenerator.IDGenerator;
 import opensesim.util.SeSimException;
+import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -43,9 +45,7 @@ import org.json.JSONObject;
  *
  * @author 7u83 <7u83@mail.ru>
  */
-public class World {
-    
-    
+public class World implements GetJson {
 
     public static final class JKEYS {
 
@@ -82,22 +82,40 @@ public class World {
      */
     public World(JSONObject cfg) {
 
+        putJson(cfg);
+        
+
+    }
+    
+    private void putJson(JSONObject cfg){
         // Read assets
-        JSONObject jassets = cfg.getJSONObject(World.JKEYS.ASSETS);
-        for (String symbol : jassets.keySet()) {
+        JSONArray jassets = cfg.optJSONArray(World.JKEYS.ASSETS);
+        for (int i=0; i<jassets.length();i++) {
+            JSONObject o = jassets.optJSONObject(i);
             AbstractAsset a;
             try {
-                a = createAsset_p(jassets.getJSONObject(symbol));
+                a = createAsset_p(o);
             } catch (SeSimException ex) {
                 Logger.getLogger(World.class.getName()).log(Level.SEVERE, null, ex);
                 return;
             }
             assetsById.add(a);
-            assetsBySymbol.put(symbol, a);
-        }
+            assetsBySymbol.put(a.getSymbol(), a);
+        }        
     }
-    
-    
+
+    @Override
+    public JSONObject getJson() {
+        JSONObject cfg=new JSONObject();
+        // Write assets
+        JSONArray jassets = new JSONArray();
+        for (AbstractAsset asset: this.getAssetCollection()){
+            jassets.put(asset.getJson());
+        }
+        cfg.put(World.JKEYS.ASSETS, jassets);
+        return cfg;
+    }
+
     private long masterkey;
     public World(long masterkey){
         this.masterkey=masterkey;