refactoring

nbproject/project.properties

@@ -1,4 +1,4 @@
-#Thu, 06 Dec 2018 15:03:16 +0100
+#Fri, 07 Dec 2018 20:30:03 +0100
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=

src/opensesim/world/AssetPair.java

@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package opensesim.sesim;
+package opensesim.world;
 
 import opensesim.world.Order;
 import java.util.HashMap;

src/opensesim/world/AssetVol.java

@@ -23,7 +23,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package opensesim.util;
+package opensesim.world;
 
 import opensesim.world.AbstractAsset;
 

src/opensesim/world/DefaultFeeModel.java

@@ -25,9 +25,7 @@
  */
 package opensesim.world;
 
-import opensesim.sesim.AssetPair;
 import opensesim.sesim.interfaces.FeeModel;
-import opensesim.util.AssetVol;
 
 /**
  *

src/opensesim/world/Exchange.java

@@ -31,7 +31,6 @@ import java.util.HashMap;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import opensesim.world.World;
-import opensesim.sesim.AssetPair;
 import opensesim.sesim.interfaces.Configurable;
 import org.json.JSONObject;
 
@@ -60,10 +59,12 @@ public class Exchange implements Configurable{
     }
     
     Exchange(World world, JSONObject cfg){
+        final int x;
+
     }
 
     public String getName() {
-        return name;
+        return  name;
     }
     
     public String getSymbol(){
@@ -81,7 +82,7 @@ public class Exchange implements Configurable{
         return null;
     }
     
-    public Collection getOrderBook(AssetPair a){
+    public Collection<Order> getOrderBook(AssetPair a){
         TradingEnv e = asset_pairs.get(a);
         SortedSet<Order> ob = e.order_books.get(Order.Type.BUYLIMIT);
         return Collections.unmodifiableCollection(ob);

src/opensesim/world/Order.java

@@ -27,7 +27,6 @@ package opensesim.world;
 
 import opensesim.world.Account;
 import opensesim.world.World;
-import opensesim.sesim.AssetPair;
 import opensesim.util.idgenerator.IDGenerator;
 import opensesim.util.idgenerator.Id;
 

src/opensesim/world/World.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 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;

src/opensesim/world/WorldAdm.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, tohe
+ * Copyright (c) 2018, 7u73
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@ import org.json.JSONObject;
 
 /**
  *
- * @author tohe
+ * @author 7u83
  */
 public class WorldAdm {
     public World world;

test/opensesim/world/ExchangeTest.java

@@ -26,7 +26,6 @@
 package opensesim.world;
 
 import java.util.Collection;
-import opensesim.sesim.AssetPair;
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.AfterClass;