Cleaned up the topology package for better sorting of classes

src/de/tud/kom/p2psim/api/topology/Topology.java

@@ -25,7 +25,7 @@ import de.tud.kom.p2psim.api.topology.obstacles.ObstacleModel;
 import de.tud.kom.p2psim.api.topology.social.SocialView;
 import de.tud.kom.p2psim.api.topology.views.TopologyView;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.component.GlobalComponent;
 
 /**

src/de/tud/kom/p2psim/api/topology/movement/MovementSupported.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.api.topology.movement;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.LocationActuator;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.LocationSensor;
 

src/de/tud/kom/p2psim/api/topology/movement/SimLocationActuator.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.api.topology.movement;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.LocationActuator;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.LocationSensor;
 

src/de/tud/kom/p2psim/api/topology/movement/local/LocalMovementStrategy.java

@@ -23,7 +23,7 @@ package de.tud.kom.p2psim.api.topology.movement.local;
 import de.tud.kom.p2psim.api.topology.movement.SimLocationActuator;
 import de.tud.kom.p2psim.api.topology.obstacles.ObstacleModel;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.util.Either;
 
 /**

src/de/tud/kom/p2psim/api/topology/obstacles/Obstacle.java

@@ -25,7 +25,7 @@ import java.util.List;
 import com.vividsolutions.jts.geom.Geometry;
 
 import de.tud.kom.p2psim.api.topology.views.TopologyView;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * An obstacle (Hosts can not run through them, and communication may be either

src/de/tud/kom/p2psim/api/topology/obstacles/ObstacleModel.java

@@ -25,7 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.util.Tuple;
 
 

src/de/tud/kom/p2psim/api/topology/placement/PlacementModel.java

@@ -23,8 +23,8 @@ package de.tud.kom.p2psim.api.topology.placement;
 import de.tud.kom.p2psim.api.topology.Topology;
 import de.tud.kom.p2psim.api.topology.TopologyComponent;
 import de.tud.kom.p2psim.api.topology.obstacles.Obstacle;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
 import de.tud.kom.p2psim.impl.topology.TopologyFactory;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 /**
  * Strategies and Distributions that place hosts in a {@link Topology}. These

src/de/tud/kom/p2psim/api/topology/waypoints/WaypointModel.java

@@ -26,7 +26,7 @@ import java.util.Set;
 
 import de.tud.kom.p2psim.api.topology.obstacles.ObstacleModel;
 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.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/api/util/geo/maps/Map.java

@@ -24,7 +24,7 @@ import java.util.Collection;
 import java.util.List;
 
 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.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/api/util/geo/maps/Node.java

@@ -20,7 +20,7 @@
 
 package de.tud.kom.p2psim.api.util.geo.maps;
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 
 public interface Node {
 

src/de/tud/kom/p2psim/impl/linklayer/mac/wifi/Ieee80211AdHocMac.java

@@ -46,7 +46,7 @@ import de.tud.kom.p2psim.impl.linklayer.DefaultLinkMessageEvent;
 import de.tud.kom.p2psim.impl.linklayer.mac.AbstractMacLayer;
 import de.tud.kom.p2psim.impl.linklayer.mac.wifi.AbstractRateManager.RateManagerTypes;
 import de.tud.kom.p2psim.impl.linklayer.mac.wifi.DcfManager.WifiState;
-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.wifi.WifiTopologyView;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring;
 import de.tud.kom.p2psim.impl.util.LiveMonitoring.ProgressValue;

src/de/tud/kom/p2psim/impl/network/gnp/topology/GeographicPosition.java

@@ -23,7 +23,7 @@ package de.tud.kom.p2psim.impl.network.gnp.topology;
 
 
 
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
 
 /**

src/de/tud/kom/p2psim/impl/network/modular/st/positioning/GNPPositioning.java

@@ -28,7 +28,7 @@ import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.network.modular.common.GNPToolkit;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.PositioningStrategy;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
 
 /**

src/de/tud/kom/p2psim/impl/network/modular/st/positioning/GeographicalPositioning.java

@@ -25,7 +25,7 @@ import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.network.modular.common.GeoToolkit;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.PositioningStrategy;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
 
 /**

src/de/tud/kom/p2psim/impl/network/modular/st/positioning/SimpleEuclidianPositioning.java

@@ -26,7 +26,7 @@ import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.PositioningStrategy;
 import de.tud.kom.p2psim.impl.network.simple.SimpleSubnet;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
 

src/de/tud/kom/p2psim/impl/network/modular/st/positioning/TorusPositioning.java

@@ -26,7 +26,7 @@ import java.util.Random;
 import de.tud.kom.p2psim.api.common.SimHost;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
 import de.tud.kom.p2psim.impl.network.modular.st.PositioningStrategy;
-import de.tud.kom.p2psim.impl.topology.PositionVector;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.Location;
 

src/de/tud/kom/p2psim/impl/topology/DefaultTopology.java

@@ -33,6 +33,7 @@ import de.tud.kom.p2psim.api.topology.social.SocialView;
 import de.tud.kom.p2psim.api.topology.views.TopologyView;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
 import de.tud.kom.p2psim.impl.topology.movement.modularosm.GPSCalculation;
+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.visualization.world.SocialViewComponentVis;
 

src/de/tud/kom/p2psim/impl/topology/TopologyFactory.java

@@ -36,9 +36,12 @@ import de.tud.kom.p2psim.api.topology.views.TopologyView;
 import de.tud.kom.p2psim.api.topology.waypoints.WaypointModel;
 import de.tud.kom.p2psim.impl.network.modular.DBHostListManager;
 import de.tud.kom.p2psim.impl.network.modular.db.NetMeasurementDB;
+import de.tud.kom.p2psim.impl.topology.component.DefaultTopologyComponent;
+import de.tud.kom.p2psim.impl.topology.component.UAVTopologyComponent;
 import de.tud.kom.p2psim.impl.topology.movement.AbstractWaypointMovementModel;
 import de.tud.kom.p2psim.impl.topology.movement.NoMovement;
 import de.tud.kom.p2psim.impl.topology.placement.GNPPlacement;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tud.kom.p2psim.impl.topology.views.latency.GNPLatency;
 import de.tudarmstadt.maki.simonstrator.api.Binder;
 import de.tudarmstadt.maki.simonstrator.api.Host;

src/de/tud/kom/p2psim/impl/topology/AbstractTopologyComponent.java → src/de/tud/kom/p2psim/impl/topology/component/AbstractTopologyComponent.java

@@ -18,7 +18,7 @@
  *
  */
 
-package de.tud.kom.p2psim.impl.topology;
+package de.tud.kom.p2psim.impl.topology.component;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -32,6 +32,9 @@ import de.tud.kom.p2psim.api.topology.Topology;
 import de.tud.kom.p2psim.api.topology.TopologyComponent;
 import de.tud.kom.p2psim.api.topology.movement.MovementModel;
 import de.tud.kom.p2psim.api.topology.placement.PlacementModel;
+import de.tud.kom.p2psim.impl.topology.util.LocalGraphView;
+import de.tud.kom.p2psim.impl.topology.util.LocationRequestImpl;
+import de.tud.kom.p2psim.impl.topology.util.PositionVector;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.Graph;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.IEdge;
 import de.tudarmstadt.maki.simonstrator.api.common.graph.INode;

src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java → src/de/tud/kom/p2psim/impl/topology/component/DefaultTopologyComponent.java

@@ -18,7 +18,7 @@
  *
  */
 
-package de.tud.kom.p2psim.impl.topology;
+package de.tud.kom.p2psim.impl.topology.component;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedList;