Changeset 10467 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2016-06-24T00:30:42+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13037 - Small fixes for unit tests (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• dialogs/LayerListDialog.java (modified) (1 diff)
• dialogs/ToggleDialog.java (modified) (1 diff)
• layer/ImageryLayer.java (modified) (1 diff)
• layer/LayerManager.java (modified) (2 diffs)
• layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -101 +101 @@
     @Override
     protected void initializeMainWindow() {
+        mainPanel.reAddListeners();
         if (mainFrame != null) {
             mainFrame.initialize();
@@ -410 +411 @@
         final MainFrame mainFrame = new MainFrame(contentPanePrivate, mainPanel, geometry);
         Main.parent = mainFrame;
-        mainPanel.reAddListeners();
 
         if (args.containsKey(Option.LOAD_PREFERENCES)) {

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -175 +175 @@
      * Creates a layer list and attach it to the given mapView.
      * @param layerManager The layer manager this list is for
-     */
-    private LayerListDialog(MainLayerManager layerManager) {
+     * @since 10467
+     */
+    public LayerListDialog(MainLayerManager layerManager) {
         super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."),
                 Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L,

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -257 +257 @@
         Main.pref.addPreferenceChangeListener(this);
 
+        registerInWindowMenu();
+    }
+
+    /**
+     * Registers this dialog in the window menu. Called in the constructor.
+     * @since 10467
+     */
+    protected void registerInWindowMenu() {
         windowMenuItem = MainMenu.addWithCheckbox(Main.main.menu.windowMenu,
                 (JosmAction) getToggleAction(),

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -117 +117 @@
     }
 
+    /**
+     * Sets the displacement offset of this layer. The layer is automatically invalidated.
+     * @param dx The x offset
+     * @param dy The y offset
+     */
     public void setOffset(double dx, double dy) {
         this.dx = dx;
         this.dy = dy;
+        invalidate();
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/LayerManager.java

@@ -7 +7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Utils;
@@ -175 +176 @@
         insertLayerAt(layer, position);
         fireLayerAdded(layer);
-        layer.hookUpMapView(); // needs to be after fireLayerAdded
+        if (Main.map != null) {
+            layer.hookUpMapView(); // needs to be after fireLayerAdded
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -878 +878 @@
         setRequiresSaveToFile(false);
         setRequiresUploadToServer(isModified());
+        invalidate();
     }
 
@@ -886 +887 @@
         setRequiresSaveToFile(true);
         setRequiresUploadToServer(isModified());
+        invalidate();
     }