7u83/OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Some refactoring / removed current test classes

Browse Source
This commit is contained in:
7u83
2018-12-03 00:03:44 +01:00
parent 59998baa08
commit c30524b388
30 changed files with 245 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/opensesim/gui/Globals.java
View File

@ -47,8 +47,8 @@ import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.LookAndFeel;
import javax.swing.UIManager;
import opensesim.AbstractAsset;
import opensesim.World;
import opensesim.world.AbstractAsset;
import opensesim.world.World;
import opensesim.gui.AssetEditor.AssetEditorPanel;
import org.json.JSONArray;
import org.json.JSONObject;
@ -299,7 +299,7 @@ public class Globals {
prefs = Preferences.userNodeForPackage(c);
world = new World();
// world = new World();
// initialize urllist used by class loader
updateUrlList();
@ -444,6 +444,13 @@ public class Globals {
putTraders(traders);
}
public static JSONObject getWorld(){
JSONObject world = new JSONObject();
world.put(PrefKeys.ASSETS, getAssets());
world.put(PrefKeys.EXCHANGES, getExchanges());
return world;
}
public static void clearAll() {
putStrategies(new JSONObject());