Cleaned up the topology package for better sorting of classes

src/de/tud/kom/p2psim/impl/topology/views/visualization/world/StrongWaypointComponentVis.java

@@ -34,7 +34,7 @@ import javax.swing.JComponent;
 
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModelListener;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Path;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.StrongWaypoint;

src/de/tud/kom/p2psim/impl/topology/views/visualization/world/WeakWaypointComponentVis.java

@@ -37,7 +37,7 @@ import javax.swing.JComponent;
 
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModelListener;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.DefaultWeightedEdgeRetrievableGraph;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Path;

src/de/tud/kom/p2psim/impl/topology/waypoints/AbstractWaypointModel.java

@@ -37,7 +37,7 @@ import de.tud.kom.p2psim.api.topology.waypoints.WaypointModelListener;
 import de.tud.kom.p2psim.api.util.geo.maps.Map;
 import de.tud.kom.p2psim.impl.scenario.simcfg2.annotations.After;
 import de.tud.kom.p2psim.impl.scenario.simcfg2.annotations.Configure;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.DefaultWeightedEdgeRetrievableGraph;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Path;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;

src/de/tud/kom/p2psim/impl/topology/waypoints/DefaultWaypointModel.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.impl.topology.waypoints;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 public class DefaultWaypointModel extends AbstractWaypointModel {
 	public DefaultWaypointModel() {

src/de/tud/kom/p2psim/impl/topology/waypoints/graph/StrongWaypoint.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.impl.topology.waypoints.graph;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * The strong waypoint is intended for the movement through a

src/de/tud/kom/p2psim/impl/topology/waypoints/graph/Waypoint.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.impl.topology.waypoints.graph;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * Represents a node in the map graph.

src/de/tud/kom/p2psim/impl/topology/waypoints/graph/WeakWaypoint.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.impl.topology.waypoints.graph;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * The weak waypoint is intended to provide additional movement

src/de/tud/kom/p2psim/impl/topology/waypoints/strong/OSMHotspotStrategy.java

@@ -51,7 +51,7 @@ import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
 import de.tud.kom.p2psim.api.util.geo.maps.Node;
 import de.tud.kom.p2psim.api.util.geo.maps.Way;
 import de.tud.kom.p2psim.impl.simengine.Simulator;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector.DisplayString;
 import de.tud.kom.p2psim.impl.topology.waypoints.StrongWaypointSupport;

src/de/tud/kom/p2psim/impl/util/geo/maps/AbstractMap.java

@@ -40,8 +40,8 @@ import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.api.topology.obstacles.Obstacle;
 import de.tud.kom.p2psim.api.util.geo.maps.Map;
 import de.tud.kom.p2psim.api.util.geo.maps.Way;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
 import de.tud.kom.p2psim.impl.topology.obstacles.PolygonObstacle;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.DefaultWeightedEdgeRetrievableGraph;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Path;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.PathEdgeFactory;

src/de/tud/kom/p2psim/impl/util/geo/maps/MapChangeListener.java

@@ -21,7 +21,7 @@
 package de.tud.kom.p2psim.impl.util.geo.maps;
 
 import de.tud.kom.p2psim.api.topology.obstacles.Obstacle;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Path;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;
 import de.tud.kom.p2psim.impl.util.geo.maps.AbstractMap.Axis;

src/de/tud/kom/p2psim/impl/util/geo/maps/MapLoader.java

@@ -23,7 +23,7 @@ package de.tud.kom.p2psim.impl.util.geo.maps;
 import com.google.common.collect.Maps;
 
 import de.tud.kom.p2psim.api.util.geo.maps.Map;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView;
 import de.tud.kom.p2psim.impl.util.geo.maps.AbstractMap.Axis;
 import de.tud.kom.p2psim.impl.util.geo.maps.osm.OSMMap;

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/FuzzyWaypointCache.java

@@ -24,7 +24,7 @@ import java.util.Map;
 
 import com.google.common.collect.Maps;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;
 
 class FuzzyWaypointCache {

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMMap.java

@@ -32,7 +32,7 @@ import com.google.common.collect.Maps;
 
 import de.tud.kom.p2psim.api.util.geo.maps.Node;
 import de.tud.kom.p2psim.api.util.geo.maps.Way;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.WeakWaypoint;
 import de.tud.kom.p2psim.impl.util.Tuple;

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMNode.java

@@ -21,7 +21,7 @@
 package de.tud.kom.p2psim.impl.util.geo.maps.osm;
 
 import de.tud.kom.p2psim.api.util.geo.maps.Node;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 public class OSMNode implements Node {
 	private Long id;

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMObstacle.java

@@ -24,8 +24,8 @@ import java.util.List;
 
 import com.google.common.collect.Maps;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
 import de.tud.kom.p2psim.impl.topology.obstacles.PolygonObstacle;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 public class OSMObstacle extends PolygonObstacle {
 	private java.util.Map<String, String> attributes = Maps.newHashMap();

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/OSMReader.java

@@ -38,7 +38,7 @@ import org.xml.sax.helpers.DefaultHandler;
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
 import de.tud.kom.p2psim.api.util.geo.maps.Node;
 import de.tud.kom.p2psim.api.util.geo.maps.Way;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.Monitor;
 import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/UTM.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.impl.util.geo.maps.osm;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * A simple bean that holds information about a UTM coordinate

src/de/tud/kom/p2psim/impl/util/geo/maps/osm/UTMConversion.java

@@ -9,7 +9,8 @@ import static java.lang.Math.cos;
 import static java.lang.Math.pow;
 import static java.lang.Math.sin;
 import static java.lang.Math.tan;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * This class can be used to convert lat/lon coordinates to

src/de/tud/kom/p2psim/impl/util/geo/maps/svg/SVGMap.java

@@ -47,8 +47,8 @@ import com.vividsolutions.jts.algorithm.LineIntersector;
 import com.vividsolutions.jts.algorithm.RobustLineIntersector;
 
 import de.tud.kom.p2psim.api.scenario.ConfigurationException;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
 import de.tud.kom.p2psim.impl.topology.obstacles.PolygonObstacle;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.views.VisualizationTopologyView.VisualizationInjector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Path;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;

src/de/tud/kom/p2psim/impl/util/structures/WaypointKdTree.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.impl.util.structures;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.waypoints.graph.Waypoint;
 
 public class WaypointKdTree extends KdTree<Waypoint> {