diff --git a/src/main/org/insa/graphics/MainWindow.java b/src/main/org/insa/graphics/MainWindow.java index eebda19..0104332 100644 --- a/src/main/org/insa/graphics/MainWindow.java +++ b/src/main/org/insa/graphics/MainWindow.java @@ -338,11 +338,13 @@ public class MainWindow extends JFrame { setJMenuBar(createMenuBar(openMapActionListener)); + // Initial panel to show "Open Map... " JPanel openPanel = new JPanel(); openPanel.setLayout(new BoxLayout(openPanel, BoxLayout.PAGE_AXIS)); JButton openButton = new JButton("Open Map... "); openButton.setAlignmentX(Component.CENTER_ALIGNMENT); openButton.addActionListener(openMapActionListener); + openButton.setFocusPainted(false); openPanel.add(Box.createVerticalGlue()); openPanel.add(openButton); openPanel.add(Box.createVerticalGlue()); diff --git a/src/main/org/insa/graphics/drawing/BasicGraphPalette.java b/src/main/org/insa/graphics/drawing/BasicGraphPalette.java index bca569f..8feb2a7 100644 --- a/src/main/org/insa/graphics/drawing/BasicGraphPalette.java +++ b/src/main/org/insa/graphics/drawing/BasicGraphPalette.java @@ -13,16 +13,6 @@ public class BasicGraphPalette implements GraphPalette { private static final Color SMALL_ROAD_COLOR = new Color(255, 234, 0); private static final Color COASTLINE_COLOR = Color.BLUE; - @Override - public int getDefaultPointWidth() { - return 2; - } - - @Override - public Color getDefaultPointColor() { - return Color.GREEN; - } - @Override public Color getColorForArc(Arc arc) { RoadType type = arc.getRoadInformation().getType(); diff --git a/src/main/org/insa/graphics/drawing/BlackAndWhiteGraphPalette.java b/src/main/org/insa/graphics/drawing/BlackAndWhiteGraphPalette.java index c31a8fb..71d5b50 100644 --- a/src/main/org/insa/graphics/drawing/BlackAndWhiteGraphPalette.java +++ b/src/main/org/insa/graphics/drawing/BlackAndWhiteGraphPalette.java @@ -10,11 +10,6 @@ public class BlackAndWhiteGraphPalette extends BasicGraphPalette { private final static Color[] ROAD_COLOR_FROM_WIDTH = { null, new Color(140, 140, 140), new Color(80, 80, 80), new Color(40, 40, 40), new Color(30, 30, 30) }; - @Override - public Color getDefaultPointColor() { - return Color.BLACK; - } - @Override public Color getColorForArc(Arc arc) { int width = getWidthForArc(arc); diff --git a/src/main/org/insa/graphics/drawing/GraphPalette.java b/src/main/org/insa/graphics/drawing/GraphPalette.java index b4292e4..78a2d1e 100644 --- a/src/main/org/insa/graphics/drawing/GraphPalette.java +++ b/src/main/org/insa/graphics/drawing/GraphPalette.java @@ -6,16 +6,6 @@ import org.insa.graph.Arc; public interface GraphPalette { - /** - * @return The default point width for this palette. - */ - public int getDefaultPointWidth(); - - /** - * @return The default point color for this palette. - */ - public Color getDefaultPointColor(); - /** * @param arc Arc for which color should be retrieved. *