changed Packackage structure

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/EdgeCreatedListener.java → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/EdgeCreatedListener.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.informatik.tk.scopviz.main;
+package de.tu_darmstadt.informatik.tk.scopviz.graphs;
 
 import org.graphstream.graph.Edge;
 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/GraphHelper.java

@@ -0,0 +1,17 @@
+package de.tu_darmstadt.informatik.tk.scopviz.graphs;
+
+public class GraphHelper {
+
+	public static MyGraph merge(MyGraph graph1, MyGraph graph2) {
+		Double targetMinX = graph1.getMinX();
+		Double targetMaxX = graph1.getMaxX();
+		Double sourceMinX = graph2.getMinX();
+		Double sourceMaxX = graph2.getMaxX();
+		Double scalingFactor = ((targetMaxX - targetMinX + 1) / graph1.getNodeCount())
+				/ ((sourceMaxX - sourceMinX + 1) / graph2.getNodeCount());
+
+		// TODO
+		return null;
+	}
+
+}

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/GraphManager.java → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/GraphManager.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.informatik.tk.scopviz.main;
+package de.tu_darmstadt.informatik.tk.scopviz.graphs;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -8,7 +8,6 @@ import java.util.LinkedList;
 import org.graphstream.algorithm.Toolkit;
 import org.graphstream.graph.Edge;
 import org.graphstream.graph.Element;
-import org.graphstream.graph.Graph;
 import org.graphstream.graph.Node;
 import org.graphstream.ui.geom.Point3;
 import org.graphstream.ui.swingViewer.ViewPanel;
@@ -16,6 +15,9 @@ import org.graphstream.ui.view.Viewer;
 import org.graphstream.ui.view.ViewerPipe;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
+import de.tu_darmstadt.informatik.tk.scopviz.main.CreationMode;
+import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
+import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.GraphDisplayManager;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.OptionsManager;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.PropertiesManager;
@@ -280,7 +282,7 @@ public class GraphManager {
 	 * 
 	 * @return the graph
 	 */
-	public Graph getGraph() {
+	public MyGraph getGraph() {
 		return g;
 	}
 
@@ -380,76 +382,48 @@ public class GraphManager {
 	 * Returns the smallest X Coordinate of any Node in the Graph.
 	 * 
 	 * @return the smallest X Coordinate in the Graph
+	 * @deprecated Use
+	 *             {@link de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph#getMinX()}
+	 *             instead
 	 */
 	public double getMinX() {
-		double currentMin = Double.MAX_VALUE;
-		Node n = null;
-		Iterator<Node> allNodes = g.getNodeIterator();
-
-		while (allNodes.hasNext()) {
-			n = allNodes.next();
-			if (n.hasAttribute("x") && currentMin > (Double) n.getAttribute("x")) {
-				currentMin = (Double) n.getAttribute("x");
-			}
-		}
-		return currentMin;
+		return g.getMinX();
 	}
 
 	/**
 	 * Returns the biggest X Coordinate of any Node in the Graph.
 	 * 
 	 * @return the biggest X Coordinate in the Graph
+	 * @deprecated Use
+	 *             {@link de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph#getMaxX()}
+	 *             instead
 	 */
 	public double getMaxX() {
-		double currentMax = Double.MIN_VALUE;
-		Node n = null;
-		Iterator<Node> allNodes = g.getNodeIterator();
-
-		while (allNodes.hasNext()) {
-			n = allNodes.next();
-			if (n.hasAttribute("x") && currentMax < (Double) n.getAttribute("x")) {
-				currentMax = (Double) n.getAttribute("x");
-			}
-		}
-		return currentMax;
+		return g.getMaxX();
 	}
 
 	/**
 	 * Returns the smallest Y Coordinate of any Node in the Graph.
 	 * 
 	 * @return the smallest Y Coordinate in the Graph
+	 * @deprecated Use
+	 *             {@link de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph#getMinY()}
+	 *             instead
 	 */
 	public double getMinY() {
-		double currentMin = Double.MAX_VALUE;
-		Node n = null;
-		Iterator<Node> allNodes = g.getNodeIterator();
-
-		while (allNodes.hasNext()) {
-			n = allNodes.next();
-			if (n.hasAttribute("y") && currentMin > (Double) n.getAttribute("y")) {
-				currentMin = (Double) n.getAttribute("y");
-			}
-		}
-		return currentMin;
+		return g.getMinY();
 	}
 
 	/**
 	 * Returns the biggest Y Coordinate of any Node in the Graph.
 	 * 
 	 * @return the biggest Y Coordinate in the Graph
+	 * @deprecated Use
+	 *             {@link de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph#getMaxY()}
+	 *             instead
 	 */
 	public double getMaxY() {
-		double currentMax = Double.MIN_VALUE;
-		Node n = null;
-		Iterator<Node> allNodes = g.getNodeIterator();
-
-		while (allNodes.hasNext()) {
-			n = allNodes.next();
-			if (n.hasAttribute("y") && currentMax < (Double) n.getAttribute("y")) {
-				currentMax = (Double) n.getAttribute("y");
-			}
-		}
-		return currentMax;
+		return g.getMaxY();
 	}
 
 	/**

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MappingGraphManager.java → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/MappingGraphManager.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.informatik.tk.scopviz.main;
+package de.tu_darmstadt.informatik.tk.scopviz.graphs;
 
 import java.util.HashMap;
 
@@ -7,6 +7,7 @@ import org.graphstream.graph.Edge;
 import org.graphstream.graph.Node;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
+import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 
 /**
  * Class extending GraphManager. Offers the possibility to merge an underlay and

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/MyGraph.java → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/MyGraph.java

@@ -1,5 +1,6 @@
-package de.tu_darmstadt.informatik.tk.scopviz.main;
+package de.tu_darmstadt.informatik.tk.scopviz.graphs;
 
+import java.util.Iterator;
 import java.util.LinkedList;
 
 import org.graphstream.graph.Edge;
@@ -188,4 +189,80 @@ public class MyGraph extends SingleGraph {
 		nodeCreatedNotify(n);
 		return n;
 	}
+
+	/**
+	 * Returns the smallest X Coordinate of any Node in the Graph.
+	 * 
+	 * @return the smallest X Coordinate in the Graph
+	 */
+	public double getMinX() {
+		double currentMin = Double.MAX_VALUE;
+		Node n = null;
+		Iterator<Node> allNodes = getNodeIterator();
+
+		while (allNodes.hasNext()) {
+			n = allNodes.next();
+			if (n.hasAttribute("x") && currentMin > (Double) n.getAttribute("x")) {
+				currentMin = (Double) n.getAttribute("x");
+			}
+		}
+		return currentMin;
+	}
+
+	/**
+	 * Returns the biggest X Coordinate of any Node in the Graph.
+	 * 
+	 * @return the biggest X Coordinate in the Graph
+	 */
+	public double getMaxX() {
+		double currentMax = Double.MIN_VALUE;
+		Node n = null;
+		Iterator<Node> allNodes = getNodeIterator();
+
+		while (allNodes.hasNext()) {
+			n = allNodes.next();
+			if (n.hasAttribute("x") && currentMax < (Double) n.getAttribute("x")) {
+				currentMax = (Double) n.getAttribute("x");
+			}
+		}
+		return currentMax;
+	}
+
+	/**
+	 * Returns the smallest Y Coordinate of any Node in the Graph.
+	 * 
+	 * @return the smallest Y Coordinate in the Graph
+	 */
+	public double getMinY() {
+		double currentMin = Double.MAX_VALUE;
+		Node n = null;
+		Iterator<Node> allNodes = getNodeIterator();
+
+		while (allNodes.hasNext()) {
+			n = allNodes.next();
+			if (n.hasAttribute("y") && currentMin > (Double) n.getAttribute("y")) {
+				currentMin = (Double) n.getAttribute("y");
+			}
+		}
+		return currentMin;
+	}
+
+	/**
+	 * Returns the biggest Y Coordinate of any Node in the Graph.
+	 * 
+	 * @return the biggest Y Coordinate in the Graph
+	 */
+	public double getMaxY() {
+		double currentMax = Double.MIN_VALUE;
+		Node n = null;
+		Iterator<Node> allNodes = getNodeIterator();
+
+		while (allNodes.hasNext()) {
+			n = allNodes.next();
+			if (n.hasAttribute("y") && currentMax < (Double) n.getAttribute("y")) {
+				currentMax = (Double) n.getAttribute("y");
+			}
+		}
+		return currentMax;
+	}
 }

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/NodeCreatedListener.java → scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/graphs/NodeCreatedListener.java

@@ -1,4 +1,4 @@
-package de.tu_darmstadt.informatik.tk.scopviz.main;
+package de.tu_darmstadt.informatik.tk.scopviz.graphs;
 
 import org.graphstream.graph.Node;
 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/io/GraphMLImporter.java

@@ -8,8 +8,8 @@ import org.graphstream.graph.Node;
 import org.graphstream.graph.implementations.SingleGraph;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
-import de.tu_darmstadt.informatik.tk.scopviz.main.MyGraph;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.OptionsManager;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/EdgeSelectionHelper.java

@@ -8,6 +8,8 @@ import org.graphstream.graph.Node;
 import org.graphstream.ui.geom.Point3;
 import org.graphstream.ui.view.Camera;
 
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
+
 /**
  * This class contains helpful static functions.
  * 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/main/Main.java

@@ -1,5 +1,6 @@
 package de.tu_darmstadt.informatik.tk.scopviz.main;
 
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.GraphDisplayManager;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.handlers.MyAnimationTimer;
 import javafx.animation.AnimationTimer;

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/metrics/ScopvizGraphMetric.java

@@ -2,7 +2,7 @@ package de.tu_darmstadt.informatik.tk.scopviz.metrics;
 
 import java.util.LinkedList;
 
-import de.tu_darmstadt.informatik.tk.scopviz.main.MyGraph;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph;
 import javafx.util.Pair;
 
 public interface ScopvizGraphMetric {

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/metrics/ScopvizGraphOperator.java

@@ -2,16 +2,16 @@ package de.tu_darmstadt.informatik.tk.scopviz.metrics;
 
 import java.util.LinkedList;
 
-import de.tu_darmstadt.informatik.tk.scopviz.main.MyGraph;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph;
 
 public interface ScopvizGraphOperator {
 
-	/**Metric
-	 * Returns true if the GraphOperator requires the Setup() to be called 
-	 * if this is false setup() will not be called.
+	/**
+	 * Metric Returns true if the GraphOperator requires the Setup() to be
+	 * called if this is false setup() will not be called.
 	 */
-	public boolean isSetupRequired ();
-	
+	public boolean isSetupRequired();
+
 	/**
 	 * calculates a new Version of the Graph using the given operator.
 	 * 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/ButtonManager.java

@@ -5,9 +5,9 @@ import java.util.ArrayList;
 import org.graphstream.graph.implementations.Graphs;
 import org.jxmapviewer.viewer.WaypointPainter;
 
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
-import de.tu_darmstadt.informatik.tk.scopviz.main.MyGraph;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.mapView.CustomWaypoint;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.mapView.CustomWaypointRenderer;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.mapView.MapViewFunctions;
@@ -138,11 +138,7 @@ public final class ButtonManager {
 
 		ToolboxManager.setOperatorItems();
 		setBorderStyle((Button) arg0.getSource());
-<<<<<<< HEAD
 
-=======
-		
->>>>>>> branch 'Jascha' of https://git.tk.informatik.tu-darmstadt.de/julien.gedeon/bp-scopviz.git
 		controller.getOpenButton().setText("Open...");
 	}
 
@@ -166,7 +162,7 @@ public final class ButtonManager {
 	 * Handler for the Symbol Representation Layer switch Button.
 	 */
 	public static void symbolRepAction(ActionEvent arg0) {
-		
+
 		if (!(GraphDisplayManager.getCurrentLayer().equals(Layer.SYMBOL))) {
 
 			// add a copy of the underlay graph to the the symbol layer
@@ -181,7 +177,7 @@ public final class ButtonManager {
 
 		GraphDisplayManager.switchActiveGraph();
 		setBorderStyle((Button) arg0.getSource());
-		
+
 		controller.getOpenButton().setText("Open...");
 	}
 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GUIController.java

@@ -267,7 +267,7 @@ public class GUIController implements Initializable {
 		tip = new Tooltip();
 		tip.setText("Geographical Visualization");
 		symbolRepButton.setTooltip(tip);
-		
+
 		ArrayList<Button> layerButtons = new ArrayList<Button>();
 		layerButtons.add(underlayButton);
 		layerButtons.add(operatorButton);
@@ -432,8 +432,8 @@ public class GUIController implements Initializable {
 		assert stackPane != null : "fx:id=\"stackPane\" was not injected: check your FXML file 'MainWindow.fxml'.";
 		assert swingNodeWorldView != null : "fx:id=\"swingNodeWorldView\" was not injected: check your FXML file 'MainWindow.fxml'.";
 	}
-	
-	MenuItem getOpenButton(){
+
+	MenuItem getOpenButton() {
 		return open;
 	}
 }

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/GraphDisplayManager.java

@@ -9,13 +9,14 @@ import org.graphstream.graph.Edge;
 import org.graphstream.graph.Node;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphHelper;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.MappingGraphManager;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.MyGraph;
 import de.tu_darmstadt.informatik.tk.scopviz.io.GraphMLImporter;
 import de.tu_darmstadt.informatik.tk.scopviz.main.CreationMode;
-import de.tu_darmstadt.informatik.tk.scopviz.main.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
-import de.tu_darmstadt.informatik.tk.scopviz.main.MappingGraphManager;
-import de.tu_darmstadt.informatik.tk.scopviz.main.MyGraph;
 import javafx.event.EventHandler;
 import javafx.scene.input.ScrollEvent;
 import javafx.scene.layout.Pane;
@@ -137,15 +138,15 @@ public final class GraphDisplayManager {
 	 * 
 	 * @param fileURL
 	 *            URL of the file
-	 * @param currentLayer
+	 * @param replaceCurrent
 	 *            if true the given graph will replace any preexisting graph in
 	 *            the current layer, if false they will be merged.
 	 * @return the id to access the specific Graph
 	 */
-	public static int addGraph(URL fileURL, boolean currentLayer) {
+	public static int addGraph(URL fileURL, boolean replaceCurrent) {
 		String id = getGraphStringID(count);
 		MyGraph g = importer.readGraph(id, fileURL);
-		return addGraph(g, currentLayer);
+		return addGraph(g, replaceCurrent);
 	}
 
 	/**
@@ -163,27 +164,27 @@ public final class GraphDisplayManager {
 		if (g == null) {
 			throw new NullArgumentException();
 		}
-		// create and format the GraphManager
-		GraphManager v = new GraphManager(g);
-		g.addAttribute("layer", currentLayer);
-		g.addAttribute("ui.antialias");
-
+		GraphManager v;
 		int ret = 0;
 		// replacing the current graph or merging
 		if (replaceCurrent) {
+			v = new GraphManager(g);
+			v.getGraph().addAttribute("layer", currentLayer);
+			v.getGraph().addAttribute("ui.antialias");
 			removeAllCurrentGraphs();
+			vList.add(v);
 			ret = count++;
+			// set basic style
+			v.setStylesheet(StylesheetManager.DEFAULT_STYLESHEET);
 		} else {
-			// TODO add code for multigraph
-			// return theIdOfTheMergedGraph;
+			v = getCurrentGraphManager();
+			GraphHelper.merge(v.getGraph(), g);
+			ret = currentGraphManager;
 		}
 
 		// set ui.class
 		v.convertUiClass();
-		// set basic style
-		v.setStylesheet(StylesheetManager.DEFAULT_STYLESHEET);
 		// display the graph
-		vList.add(v);
 		switchActiveGraph();
 		return ret;
 	}
@@ -384,7 +385,7 @@ public final class GraphDisplayManager {
 				}
 			}
 		}
-		// TODO get Graphmanager;
+		// TODO get Graphmanager?
 		currentLayer = Layer.UNDERLAY;
 		addGraph(tempGraph, true);
 		GraphManager und = getGraphManager(Layer.UNDERLAY);
@@ -432,7 +433,6 @@ public final class GraphDisplayManager {
 		und.addNodeCreatedListener(map);
 		op.addEdgeCreatedListener(map);
 		op.addNodeCreatedListener(map);
-		// TODO wait for implementation
 		map.loadGraph(g);
 		currentLayer = tempLayer;
 	}

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/MenuBarManager.java

@@ -1,7 +1,7 @@
 package de.tu_darmstadt.informatik.tk.scopviz.ui;
 
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.io.GraphMLExporter;
-import de.tu_darmstadt.informatik.tk.scopviz.main.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 import javafx.event.ActionEvent;
@@ -36,10 +36,10 @@ public final class MenuBarManager {
 	 * Handler for the "open" MenuItem.
 	 */
 	public static final void openAction(ActionEvent event) {
-		if (GraphDisplayManager.getCurrentLayer()==Layer.MAPPING){
-		GraphDisplayManager.readMapping();	
+		if (GraphDisplayManager.getCurrentLayer() == Layer.MAPPING) {
+			GraphDisplayManager.readMapping();
 		} else {
-		GraphDisplayManager.addGraph(Main.getInstance().getPrimaryStage(), true);
+			GraphDisplayManager.addGraph(Main.getInstance().getPrimaryStage(), true);
 		}
 	}
 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/PropertiesManager.java

@@ -9,7 +9,7 @@ import org.graphstream.graph.Element;
 import org.graphstream.graph.Node;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
-import de.tu_darmstadt.informatik.tk.scopviz.main.GraphManager;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 import javafx.application.Platform;

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/handlers/MyMouseManager.java

@@ -11,9 +11,9 @@ import org.graphstream.ui.view.Camera;
 import org.graphstream.ui.view.util.DefaultMouseManager;
 
 import de.tu_darmstadt.informatik.tk.scopviz.debug.Debug;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.main.CreationMode;
 import de.tu_darmstadt.informatik.tk.scopviz.main.EdgeSelectionHelper;
-import de.tu_darmstadt.informatik.tk.scopviz.main.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Main;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.PropertiesManager;
 

scopviz/src/main/java/de/tu_darmstadt/informatik/tk/scopviz/ui/mapView/MapViewFunctions.java

@@ -17,7 +17,7 @@ import org.jxmapviewer.viewer.GeoPosition;
 import org.jxmapviewer.viewer.TileFactoryInfo;
 import org.jxmapviewer.viewer.WaypointPainter;
 
-import de.tu_darmstadt.informatik.tk.scopviz.main.GraphManager;
+import de.tu_darmstadt.informatik.tk.scopviz.graphs.GraphManager;
 import de.tu_darmstadt.informatik.tk.scopviz.main.Layer;
 import de.tu_darmstadt.informatik.tk.scopviz.main.MainApp;
 import de.tu_darmstadt.informatik.tk.scopviz.ui.GraphDisplayManager;