Class package relocation.

juxeii · May 28, 2016 · 0147906 · 0147906
1 parent adbade9
commit 0147906
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 11 deletions.
diff --git a/...g/order/call/RunnableWithJFException.java → ...ramming/misc/RunnableWithJFException.java b/...g/order/call/RunnableWithJFException.java → ...ramming/misc/RunnableWithJFException.java
@@ -1,4 +1,4 @@
-package com.jforex.programming.order.call;
+package com.jforex.programming.misc;
 
 import com.dukascopy.api.JFException;
 

diff --git a/src/main/java/com/jforex/programming/order/OrderCreateUtil.java b/src/main/java/com/jforex/programming/order/OrderCreateUtil.java
@@ -2,7 +2,6 @@
 
 import java.util.Collection;
 
-import com.jforex.programming.order.call.OrderSupplier;
 import com.jforex.programming.order.event.OrderEvent;
 import com.jforex.programming.order.event.OrderEventTypeData;
 

diff --git a/...programming/order/call/OrderSupplier.java → ...orex/programming/order/OrderSupplier.java b/...programming/order/call/OrderSupplier.java → ...orex/programming/order/OrderSupplier.java
@@ -1,4 +1,4 @@
-package com.jforex.programming.order.call;
+package com.jforex.programming.order;
 
 import com.dukascopy.api.IOrder;
 import com.dukascopy.api.JFException;

diff --git a/src/main/java/com/jforex/programming/order/OrderUtilHandler.java b/src/main/java/com/jforex/programming/order/OrderUtilHandler.java
@@ -3,13 +3,13 @@
 import static com.jforex.programming.order.event.OrderEventTypeSets.endOfOrderEventTypes;
 
 import com.dukascopy.api.IOrder;
+
+import com.jforex.programming.misc.RunnableWithJFException;
 import com.jforex.programming.misc.RxUtil;
 import com.jforex.programming.order.call.OrderCallExecutor;
 import com.jforex.programming.order.call.OrderCallExecutorResult;
 import com.jforex.programming.order.call.OrderCallRejectException;
 import com.jforex.programming.order.call.OrderCallRequest;
-import com.jforex.programming.order.call.OrderSupplier;
-import com.jforex.programming.order.call.RunnableWithJFException;
 import com.jforex.programming.order.event.OrderEvent;
 import com.jforex.programming.order.event.OrderEventGateway;
 import com.jforex.programming.order.event.OrderEventType;

diff --git a/src/main/java/com/jforex/programming/order/call/OrderCallExecutor.java b/src/main/java/com/jforex/programming/order/call/OrderCallExecutor.java
@@ -7,6 +7,7 @@
 import com.dukascopy.api.IOrder;
 import com.dukascopy.api.JFException;
 import com.jforex.programming.misc.ConcurrentUtil;
+import com.jforex.programming.order.OrderSupplier;
 
 public class OrderCallExecutor {
 

diff --git a/src/test/java/com/jforex/programming/order/call/test/OrderCallExecutorTest.java b/src/test/java/com/jforex/programming/order/call/test/OrderCallExecutorTest.java
@@ -19,9 +19,10 @@
 
 import com.dukascopy.api.IOrder;
 import com.dukascopy.api.JFException;
+
+import com.jforex.programming.order.OrderSupplier;
 import com.jforex.programming.order.call.OrderCallExecutor;
 import com.jforex.programming.order.call.OrderCallExecutorResult;
-import com.jforex.programming.order.call.OrderSupplier;
 import com.jforex.programming.test.common.CommonUtilForTest;
 import com.jforex.programming.test.fakes.IOrderForTest;
 

diff --git a/src/test/java/com/jforex/programming/order/test/OrderChangeUtilTest.java b/src/test/java/com/jforex/programming/order/test/OrderChangeUtilTest.java
@@ -12,9 +12,9 @@
 import org.mockito.Captor;
 import org.mockito.Mock;
 
+import com.jforex.programming.misc.RunnableWithJFException;
 import com.jforex.programming.order.OrderChangeUtil;
 import com.jforex.programming.order.OrderUtilHandler;
-import com.jforex.programming.order.call.RunnableWithJFException;
 import com.jforex.programming.order.event.OrderEvent;
 import com.jforex.programming.order.event.OrderEventTypeData;
 import com.jforex.programming.test.common.InstrumentUtilForTest;

diff --git a/src/test/java/com/jforex/programming/order/test/OrderCreateUtilTest.java b/src/test/java/com/jforex/programming/order/test/OrderCreateUtilTest.java
@@ -17,8 +17,8 @@
 import com.google.common.collect.Sets;
 import com.jforex.programming.order.OrderCreateUtil;
 import com.jforex.programming.order.OrderParams;
+import com.jforex.programming.order.OrderSupplier;
 import com.jforex.programming.order.OrderUtilHandler;
-import com.jforex.programming.order.call.OrderSupplier;
 import com.jforex.programming.order.event.OrderEvent;
 import com.jforex.programming.order.event.OrderEventTypeData;
 import com.jforex.programming.test.common.InstrumentUtilForTest;

diff --git a/src/test/java/com/jforex/programming/order/test/OrderUtilHandlerTest.java b/src/test/java/com/jforex/programming/order/test/OrderUtilHandlerTest.java
@@ -20,13 +20,13 @@
 import com.dukascopy.api.IOrder;
 import com.dukascopy.api.JFException;
 import com.google.common.collect.Sets;
+import com.jforex.programming.misc.RunnableWithJFException;
+import com.jforex.programming.order.OrderSupplier;
 import com.jforex.programming.order.OrderUtilHandler;
 import com.jforex.programming.order.call.OrderCallExecutor;
 import com.jforex.programming.order.call.OrderCallExecutorResult;
 import com.jforex.programming.order.call.OrderCallRejectException;
 import com.jforex.programming.order.call.OrderCallRequest;
-import com.jforex.programming.order.call.RunnableWithJFException;
-import com.jforex.programming.order.call.OrderSupplier;
 import com.jforex.programming.order.event.OrderEvent;
 import com.jforex.programming.order.event.OrderEventGateway;
 import com.jforex.programming.order.event.OrderEventType;

diff --git a/src/test/java/com/jforex/programming/order/test/OrderUtilTest.java b/src/test/java/com/jforex/programming/order/test/OrderUtilTest.java
@@ -17,8 +17,8 @@
 import com.jforex.programming.order.OrderChangeUtil;
 import com.jforex.programming.order.OrderParams;
 import com.jforex.programming.order.OrderPositionUtil;
+import com.jforex.programming.order.OrderSupplier;
 import com.jforex.programming.order.OrderUtil;
-import com.jforex.programming.order.call.OrderSupplier;
 import com.jforex.programming.order.event.OrderEvent;
 import com.jforex.programming.position.PositionOrders;
 import com.jforex.programming.position.RestoreSLTPPolicy;