move Connectible to other packet

2015-07-31 10:59:35 +03:00
parent eb9f42ddb6
commit b3b0b6ec3d
12 changed files with 7 additions and 13 deletions
--- a/core/src/main/java/ru/trader/analysis/graph/CCrawler.java
+++ b/core/src/main/java/ru/trader/analysis/graph/CCrawler.java
@@ -6,7 +6,6 @@ import ru.trader.analysis.AnalysisCallBack;
 import ru.trader.analysis.RouteSpecification;
 import ru.trader.core.Profile;
 import ru.trader.core.Ship;
-import ru.trader.graph.Connectable;

 import java.util.Collection;
 import java.util.List;
--- a/core/src/main/java/ru/trader/analysis/graph/Connectable.java
+++ b/core/src/main/java/ru/trader/analysis/graph/Connectable.java
@@ -1,4 +1,4 @@
-package ru.trader.graph;
+package ru.trader.analysis.graph;

 public interface Connectable<T> extends Comparable<Connectable<T>>{

--- a/core/src/main/java/ru/trader/analysis/graph/ConnectibleEdge.java
+++ b/core/src/main/java/ru/trader/analysis/graph/ConnectibleEdge.java
@@ -1,7 +1,5 @@
 package ru.trader.analysis.graph;

-import ru.trader.graph.Connectable;
-
 public class ConnectibleEdge<T extends Connectable<T>> extends Edge<T> {
    protected double refill;
    protected double fuelCost;
--- a/core/src/main/java/ru/trader/analysis/graph/ConnectibleGraph.java
+++ b/core/src/main/java/ru/trader/analysis/graph/ConnectibleGraph.java
@@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory;
 import ru.trader.analysis.AnalysisCallBack;
 import ru.trader.core.Profile;
 import ru.trader.core.Ship;
-import ru.trader.graph.Connectable;

 import java.util.Collection;

--- a/core/src/main/java/ru/trader/analysis/graph/Path.java
+++ b/core/src/main/java/ru/trader/analysis/graph/Path.java
@@ -1,7 +1,6 @@
 package ru.trader.analysis.graph;

 import ru.trader.core.Ship;
-import ru.trader.graph.Connectable;

 import java.util.ArrayList;
 import java.util.Collection;
--- a/core/src/main/java/ru/trader/core/AbstractItemStat.java
+++ b/core/src/main/java/ru/trader/core/AbstractItemStat.java
@@ -1,6 +1,6 @@
 package ru.trader.core;

-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;

 import java.util.Collection;
 import java.util.Collections;
--- a/core/src/main/java/ru/trader/core/AbstractPlace.java
+++ b/core/src/main/java/ru/trader/core/AbstractPlace.java
@@ -3,7 +3,7 @@ package ru.trader.core;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;

 import java.util.Objects;

--- a/core/src/main/java/ru/trader/core/AbstractVendor.java
+++ b/core/src/main/java/ru/trader/core/AbstractVendor.java
@@ -3,7 +3,7 @@ package ru.trader.core;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;

 import java.util.Objects;

--- a/core/src/main/java/ru/trader/core/Place.java
+++ b/core/src/main/java/ru/trader/core/Place.java
@@ -1,6 +1,6 @@
 package ru.trader.core;

-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;

 import java.util.ArrayList;
 import java.util.Collection;
--- a/core/src/main/java/ru/trader/core/TransitVendor.java
+++ b/core/src/main/java/ru/trader/core/TransitVendor.java
@@ -1,6 +1,6 @@
 package ru.trader.core;

-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;

 import java.util.Collection;
 import java.util.Collections;
--- a/core/src/main/java/ru/trader/core/Vendor.java
+++ b/core/src/main/java/ru/trader/core/Vendor.java
@@ -1,6 +1,6 @@
 package ru.trader.core;

-import ru.trader.graph.Connectable;
+import ru.trader.analysis.graph.Connectable;

 import java.util.ArrayList;
 import java.util.Collection;
--- a/core/src/test/java/ru/trader/analysis/graph/Point.java
+++ b/core/src/test/java/ru/trader/analysis/graph/Point.java
@@ -1,7 +1,6 @@
 package ru.trader.analysis.graph;

 import org.jetbrains.annotations.NotNull;
-import ru.trader.graph.Connectable;

 import java.util.Objects;