From e5d1b30cfd9e66c24969cd6cc5b8d1de31ac6df1 Mon Sep 17 00:00:00 2001
From: Holt59 <capelle.mikael@gmail.com>
Date: Tue, 6 Mar 2018 10:30:43 +0100
Subject: [PATCH] Clean code.

---
 src/main/org/insa/graphics/MainWindow.java    | 31 ++++++++++---------
 .../drawing/components/BasicDrawing.java      |  8 +++++
 .../components/ZoomAndPanListener.java        |  3 +-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/main/org/insa/graphics/MainWindow.java b/src/main/org/insa/graphics/MainWindow.java
index 51a7ec8..6117b16 100644
--- a/src/main/org/insa/graphics/MainWindow.java
+++ b/src/main/org/insa/graphics/MainWindow.java
@@ -241,8 +241,17 @@ public class MainWindow extends JFrame {
                 launchThread(new Runnable() {
                     @Override
                     public void run() {
+                        // Run the algorithm.
                         ShortestPathSolution solution = copyAlgorithm.run();
-                        displayShortestPathSolution(solution);
+                        // Add the solution to the solution panel (but do not display
+                        // overlay).
+                        spPanel.solutionPanel.addSolution(solution, false);
+                        // If the solution is feasible, add the path to the path panel.
+                        if (solution.isFeasible()) {
+                            pathPanel.addPath(solution.getPath());
+                        }
+                        // Show the solution panel and enable the shortest-path panel.
+                        spPanel.solutionPanel.setVisible(true);
                         spPanel.setEnabled(true);
                     }
                 });
@@ -372,15 +381,6 @@ public class MainWindow extends JFrame {
         }
     }
 
-    private void displayShortestPathSolution(ShortestPathSolution solution) {
-        spPanel.solutionPanel.addSolution(solution, false); // Do not add overlay in the solution
-                                                            // panel.
-        if (solution.isFeasible()) {
-            pathPanel.addPath(solution.getPath());
-        }
-        spPanel.solutionPanel.setVisible(true);
-    }
-
     /**
      * Notify all listeners that a new graph has been loaded.
      */
@@ -456,10 +456,10 @@ public class MainWindow extends JFrame {
                 mainPanel.setLeftComponent(mapViewDrawing);
                 mainPanel.setDividerLocation(oldLocation);
                 notifyDrawingLoaded(basicDrawing, mapViewDrawing);
+                drawing.clear();
+                ((MapViewDrawing) drawing).drawGraph(mfile);
             }
-
-            // 2. We draw the graph.
-            if (isNewGraph) {
+            else if (isNewGraph) {
                 drawing.clear();
                 ((MapViewDrawing) drawing).drawGraph(mfile);
             }
@@ -476,8 +476,11 @@ public class MainWindow extends JFrame {
                 mainPanel.setLeftComponent(basicDrawing);
                 mainPanel.setDividerLocation(oldLocation);
                 notifyDrawingLoaded(mapViewDrawing, basicDrawing);
+                this.currentPalette = palette;
+                drawing.clear();
+                drawing.drawGraph(graph, palette);
             }
-            if (isNewGraph || palette != this.currentPalette) {
+            else if (isNewGraph || palette != this.currentPalette) {
                 this.currentPalette = palette;
                 drawing.clear();
                 drawing.drawGraph(graph, palette);
diff --git a/src/main/org/insa/graphics/drawing/components/BasicDrawing.java b/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
index 7a46f28..ccffa77 100644
--- a/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
+++ b/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
@@ -319,6 +319,7 @@ public class BasicDrawing extends JPanel implements Drawing {
      * 
      */
     public BasicDrawing() {
+        setLayout(null);
         this.zoomAndPanListener = new ZoomAndPanListener(this,
                 ZoomAndPanListener.DEFAULT_MIN_ZOOM_LEVEL, 20, 1.2);
 
@@ -421,6 +422,13 @@ public class BasicDrawing extends JPanel implements Drawing {
         this.repaint();
     }
 
+    /**
+     * @return The current ZoomAndPanListener associated with this drawing.
+     */
+    public ZoomAndPanListener getZoomAndPanListener() {
+        return this.zoomAndPanListener;
+    }
+
     /**
      * @param lon
      * @return
diff --git a/src/main/org/insa/graphics/drawing/components/ZoomAndPanListener.java b/src/main/org/insa/graphics/drawing/components/ZoomAndPanListener.java
index 764861d..041061f 100644
--- a/src/main/org/insa/graphics/drawing/components/ZoomAndPanListener.java
+++ b/src/main/org/insa/graphics/drawing/components/ZoomAndPanListener.java
@@ -107,7 +107,8 @@ public class ZoomAndPanListener implements MouseListener, MouseMotionListener, M
                 if (zoomLevel > minZoomLevel) {
                     zoomLevel--;
                     Point2D p1 = transformPoint(p);
-                    coordTransform.scale(1 / zoomMultiplicationFactor, 1 / zoomMultiplicationFactor);
+                    coordTransform.scale(1 / zoomMultiplicationFactor,
+                            1 / zoomMultiplicationFactor);
                     Point2D p2 = transformPoint(p);
                     coordTransform.translate(p2.getX() - p1.getX(), p2.getY() - p1.getY());
                     targetComponent.repaint();