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

Removed old master key stuff

Browse Source
This commit is contained in:
7u83 2018-12-21 23:19:35 +01:00
parent dca661c8f2
commit 8d2ff5bb80
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/opensesim/world/GodWorld.java
View File

@ -27,7 +27,6 @@ package opensesim.world;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -83,8 +82,7 @@ public class GodWorld implements GetJson, World {
HashSet<AssetPair> assetPairs = new HashSet<>(); HashSet<AssetPair> assetPairs = new HashSet<>();
//ArrayList<Exchange> exchanges = new ArrayList<>(); private Scheduler scheduler = new Scheduler();
private Scheduler scheduler = new Scheduler();
/** /**
* Create a World object. * Create a World object.
@ -172,17 +170,6 @@ public class GodWorld implements GetJson, World {
return cfg; return cfg;
} }
private long masterkey;
public GodWorld(JSONObject cfg, long masterkey) {
this.masterkey = masterkey;
putJson(cfg);
}
/* public boolean checkMasterKey(long masterkey) {
return masterkey == this.masterkey;
}
*/
public AbstractAsset createAsset(JSONObject cfg) throws SeSimException { public AbstractAsset createAsset(JSONObject cfg) throws SeSimException {
AbstractAsset a; AbstractAsset a;
String class_name; String class_name;
@ -214,7 +201,6 @@ public class GodWorld implements GetJson, World {
// -------------------------------------------------------------------- // --------------------------------------------------------------------
// Exchanges in our world // Exchanges in our world
// -------------------------------------------------------------------- // --------------------------------------------------------------------
private final HashMap<String, Exchange> exchanges = new HashMap<>(); private final HashMap<String, Exchange> exchanges = new HashMap<>();
private Exchange default_exchange = null; private Exchange default_exchange = null;
@ -225,23 +211,26 @@ public class GodWorld implements GetJson, World {
default_exchange = ex; default_exchange = ex;
} }
} }
public Exchange getDefaultExchange(){ public Exchange getDefaultExchange() {
return default_exchange; return default_exchange;
} }
@Override @Override
public Collection<Exchange> getExchangeCollection() { public Collection<Exchange> getExchangeCollection() {
return Collections.unmodifiableCollection(exchanges.values()); return Collections.unmodifiableCollection(exchanges.values());
} }
// --------------------------------------------------------------------
// Assets
// --------------------------------------------------------------------
@Override
public Collection<AbstractAsset> getAssetCollection() { public Collection<AbstractAsset> getAssetCollection() {
return assets.getCollection(); //Collections.unmodifiableCollection(assetsById); return assets.getCollection(); //Collections.unmodifiableCollection(assetsById);
} }
@Override
public AbstractAsset getAssetBySymbol(String symbol) { public AbstractAsset getAssetBySymbol(String symbol) {
return this.assets.get(symbol); return this.assets.get(symbol);
} }