From 03fbd9cd25827fddc5b56a4d5f6bb72493fe9205 Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Tue, 4 Dec 2018 15:31:34 +0100 Subject: [PATCH] Reformatted --- src/opensesim/gui/Globals.java | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/opensesim/gui/Globals.java b/src/opensesim/gui/Globals.java index ef20e74..7c4daa0 100644 --- a/src/opensesim/gui/Globals.java +++ b/src/opensesim/gui/Globals.java @@ -218,9 +218,10 @@ public class Globals { asset_types_raw.forEach((a) -> { asset_types.add(a); }); - - if (!sort) + + if (!sort) { return asset_types; + } asset_types.sort(new Comparator>() { @Override @@ -260,6 +261,9 @@ public class Globals { Collection lafs; // lafs = opensesim.util.XClassLoader.getClassesList(urllist, LookAndFeel.class); lafs = class_cache.getClassCollection(LookAndFeel.class); + if (lafs == null) { + return; + } ClassLoader currentThreadClassLoader = Thread.currentThread().getContextClassLoader(); @@ -299,8 +303,7 @@ public class Globals { prefs = Preferences.userNodeForPackage(c); - // world = new World(); - + // world = new World(); // initialize urllist used by class loader updateUrlList(); @@ -341,19 +344,20 @@ public class Globals { String assets_json = prefs.get(PrefKeys.ASSETS, "{}"); return new JSONObject(assets_json); } - - static public final void putAssets(JSONObject assets){ + + static public final void putAssets(JSONObject assets) { prefs.put(PrefKeys.ASSETS, assets.toString()); } - - static public final JSONObject getExchanges(){ + + static public final JSONObject getExchanges() { String json = prefs.get(PrefKeys.EXCHANGES, "{}"); return new JSONObject(json); } - static public final void putExchanges(JSONObject e){ + + static public final void putExchanges(JSONObject e) { prefs.put(PrefKeys.EXCHANGES, e.toString()); } - + static public final JSONArray getTraders() { String traders_json = Globals.prefs.get(PrefKeys.TRADERS, "[]"); @@ -361,8 +365,6 @@ public class Globals { return traders; } - - static public final JSONObject getStrategies() { String cfglist = Globals.prefs.get(PrefKeys.STRATEGIES, "{}"); JSONObject cfgs = new JSONObject(cfglist); @@ -444,8 +446,7 @@ public class Globals { putTraders(traders); } - - + public static void clearAll() { putStrategies(new JSONObject()); putTraders(new JSONArray()); @@ -460,12 +461,11 @@ public class Globals { loadString(s); } - - - public static JSONObject getWorld(){ + + public static JSONObject getWorld() { JSONObject cfg = new JSONObject(); cfg.put(World.JKEYS.ASSETS, getAssets()); - cfg.put(World.JKEYS.EXCHANGES, getExchanges()); + cfg.put(World.JKEYS.EXCHANGES, getExchanges()); return cfg; }