From 137c6af75dd6eb983b2d080f75741c8e5c539ae4 Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Sat, 8 Dec 2018 08:11:14 +0100
Subject: [PATCH] refactoring

---
 nbproject/project.properties                  | 2 +-
 src/opensesim/{sesim => world}/AssetPair.java | 2 +-
 src/opensesim/{util => world}/AssetVol.java   | 2 +-
 src/opensesim/world/DefaultFeeModel.java      | 2 --
 src/opensesim/world/Exchange.java             | 7 ++++---
 src/opensesim/world/Order.java                | 1 -
 src/opensesim/world/World.java                | 1 -
 src/opensesim/world/WorldAdm.java             | 4 ++--
 test/opensesim/world/ExchangeTest.java        | 1 -
 9 files changed, 9 insertions(+), 13 deletions(-)
 rename src/opensesim/{sesim => world}/AssetPair.java (99%)
 rename src/opensesim/{util => world}/AssetVol.java (98%)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 11be66a..c4ce32d 100644
--- a/nbproject/project.properties
+++ b/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=
diff --git a/src/opensesim/sesim/AssetPair.java b/src/opensesim/world/AssetPair.java
similarity index 99%
rename from src/opensesim/sesim/AssetPair.java
rename to src/opensesim/world/AssetPair.java
index b092a35..bbba35c 100644
--- a/src/opensesim/sesim/AssetPair.java
+++ b/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;
diff --git a/src/opensesim/util/AssetVol.java b/src/opensesim/world/AssetVol.java
similarity index 98%
rename from src/opensesim/util/AssetVol.java
rename to src/opensesim/world/AssetVol.java
index 25922ef..5b7e06a 100644
--- a/src/opensesim/util/AssetVol.java
+++ b/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;
 
diff --git a/src/opensesim/world/DefaultFeeModel.java b/src/opensesim/world/DefaultFeeModel.java
index 3e03d3e..e3fd05b 100644
--- a/src/opensesim/world/DefaultFeeModel.java
+++ b/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;
 
 /**
  *
diff --git a/src/opensesim/world/Exchange.java b/src/opensesim/world/Exchange.java
index ad63c68..c011625 100644
--- a/src/opensesim/world/Exchange.java
+++ b/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);
diff --git a/src/opensesim/world/Order.java b/src/opensesim/world/Order.java
index b681700..f7b1f97 100644
--- a/src/opensesim/world/Order.java
+++ b/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;
 
diff --git a/src/opensesim/world/World.java b/src/opensesim/world/World.java
index 2cfc1be..ff3b29e 100644
--- a/src/opensesim/world/World.java
+++ b/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;
diff --git a/src/opensesim/world/WorldAdm.java b/src/opensesim/world/WorldAdm.java
index e02dd65..189c95f 100644
--- a/src/opensesim/world/WorldAdm.java
+++ b/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;
diff --git a/test/opensesim/world/ExchangeTest.java b/test/opensesim/world/ExchangeTest.java
index 59fa8f9..5f476e4 100644
--- a/test/opensesim/world/ExchangeTest.java
+++ b/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;