ConfigDynamicAttractionGenerator for fixeds and temporal APs

src/de/tud/kom/p2psim/impl/topology/movement/modularosm/attraction/ConfigDynamicAttractionGenerator.java

@@ -20,7 +20,6 @@
 
 package de.tud.kom.p2psim.impl.topology.movement.modularosm.attraction;
 
-import java.util.LinkedList;
 import de.tudarmstadt.maki.simonstrator.api.Event;
 import de.tudarmstadt.maki.simonstrator.api.EventHandler;
 
@@ -33,17 +32,26 @@ import de.tudarmstadt.maki.simonstrator.api.EventHandler;
  */
 public class ConfigDynamicAttractionGenerator extends AbstractAttractionProvider {
 
-	private LinkedList<TemporalAttractionPoint> allAPs = new LinkedList<>();
+	//private LinkedList<TemporalAttractionPoint> temporalAttractionPoints = new LinkedList<>();
 		
-	public void setAttractionPoint(TemporalAttractionPoint ap) {
-		allAPs.add(ap);
+	public void setAttractionPoint(AttractionPoint ap) {
+		addAttractionPoint(ap);
+	}
+	
+	public void setTemporalAttractionPoint(TemporalAttractionPoint ap) {
+		//temporalAttractionPoints.add(ap);
+		if(ap.getPlacementTime() == 0) {
+			placeAP(ap);
+		}
+		else {
+			Event.scheduleWithDelay(ap.getPlacementTime(), new EventHandler() {
+				@Override
+				public void eventOccurred(Object content, int type) {
+					placeAP(ap);
+				}
+			}, null, 0);
+		}
 		
-		Event.scheduleWithDelay(ap.getPlacementTime(), new EventHandler() {
-			@Override
-			public void eventOccurred(Object content, int type) {
-				placeAP(ap);
-			}
-		}, null, 0);
 	}
 	
 	void placeAP(TemporalAttractionPoint ap) {