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

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

Files:

• actions/AddNodeAction.java (modified) (1 diff)
• actions/AlignInCircleAction.java (modified) (1 diff)
• actions/AlignInLineAction.java (modified) (1 diff)
• actions/CreateCircleAction.java (modified) (1 diff)
• actions/DistributeAction.java (modified) (1 diff)
• actions/ImageryAdjustAction.java (modified) (2 diffs)
• actions/JoinNodeWayAction.java (modified) (1 diff)
• actions/MirrorAction.java (modified) (1 diff)
• actions/OrthogonalizeAction.java (modified) (2 diffs)
• actions/ReverseWayAction.java (modified) (1 diff)
• actions/SimplifyWayAction.java (modified) (1 diff)
• actions/UnJoinNodeWayAction.java (modified) (1 diff)
• actions/downloadtasks/DownloadReferrersTask.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (3 diffs)
• actions/mapmode/DrawAction.java (modified) (4 diffs)
• command/AddCommand.java (modified) (2 diffs)
• command/AddPrimitivesCommand.java (modified) (4 diffs)
• command/Command.java (modified) (2 diffs)
• command/conflict/WayNodesConflictResolverCommand.java (modified) (1 diff)
• data/UndoRedoHandler.java (modified) (1 diff)
• data/gpx/GpxData.java (modified) (1 diff)
• data/gpx/WayPoint.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/dialogs/ToggleDialog.java (modified) (1 diff)
• gui/layer/ImageryLayer.java (modified) (1 diff)
• gui/layer/LayerManager.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

@@ -66 +66 @@
         Main.main.undoRedo.add(new AddCommand(nnew));
         getLayerManager().getEditDataSet().setSelected(nnew);
-        if (Main.map.mapView.getRealBounds().contains(nnew.getCoor())) {
-            Main.map.mapView.repaint();
-        } else {
-            AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
+        if (Main.map.mapView != null) {
+            if (Main.map.mapView.getRealBounds().contains(nnew.getCoor())) {
+                Main.map.mapView.repaint();
+            } else {
+                AutoScaleAction.zoomTo(Collections.<OsmPrimitive>singleton(nnew));
+            }
         }
     }

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -284 +284 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Align Nodes in Circle"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -205 +205 @@
             // Do it!
             Main.main.undoRedo.add(cmd);
-            Main.map.repaint();
 
         } catch (InvalidSelection except) {

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -241 +241 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Create Circle"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

@@ -98 +98 @@
         // Do it!
         Main.main.undoRedo.add(new SequenceCommand(tr("Distribute Nodes"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

@@ -137 +137 @@
             }
             kev.consume();
-            Main.map.repaint();
         }
     }
@@ -164 +163 @@
             offsetDialog.updateOffset();
         }
-        Main.map.repaint();
         prevEastNorth = eastNorth;
     }

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -160 +160 @@
         if (cmds.isEmpty()) return;
         Main.main.undoRedo.add(new SequenceCommand(getValue(NAME).toString(), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/MirrorAction.java

@@ -81 +81 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Mirror"), cmds));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -113 +113 @@
                 if (!commands.isEmpty()) {
                     Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize / Undo"), commands));
-                    Main.map.repaint();
                 } else {
                     throw new InvalidUserInputException("Commands are empty");
@@ -153 +152 @@
             final SequenceCommand command = orthogonalize(sel);
             Main.main.undoRedo.add(new SequenceCommand(tr("Orthogonalize"), command));
-            Main.map.repaint();
         } catch (InvalidUserInputException ex) {
             Main.debug(ex);

trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

@@ -103 +103 @@
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
+        // FIXME: This should be handled by undoRedo.
         if (propertiesUpdated) {
             ds.fireSelectionChanged();
         }
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

@@ -124 +124 @@
             ds.endUpdate();
         }
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java

@@ -91 +91 @@
         // I'm sure there's a better way to handle this
         Main.main.undoRedo.add(new RemoveNodesCommand(selectedWay, selectedNodes));
-        Main.map.repaint();
     }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java

@@ -122 +122 @@
                     public void run() {
                         targetLayer.onPostDownloadFromServer();
-                        if (Main.map != null)
-                            Main.map.mapView.repaint();
                     }
                 }

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -134 +134 @@
      */
     public static void doActionPerformed(ActionEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable())
-            return;
+        MainLayerManager lm = Main.getLayerManager();
+        OsmDataLayer editLayer = lm.getEditLayer();
+        if (editLayer == null) {
+            return;
+        }
+
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
         boolean alt = (e.getModifiers() & (ActionEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK)) != 0;
 
-        MainLayerManager lm = Main.getLayerManager();
         Command c;
         if (ctrl) {
-            c = DeleteCommand.deleteWithReferences(lm.getEditLayer(), lm.getEditDataSet().getSelected());
+            c = DeleteCommand.deleteWithReferences(editLayer, lm.getEditDataSet().getSelected());
         } else {
-            c = DeleteCommand.delete(lm.getEditLayer(), lm.getEditDataSet().getSelected(), !alt /* also delete nodes in way */);
+            c = DeleteCommand.delete(editLayer, lm.getEditDataSet().getSelected(), !alt /* also delete nodes in way */);
         }
         // if c is null, an error occurred or the user aborted. Don't do anything in that case.
         if (c != null) {
             Main.main.undoRedo.add(c);
+            //FIXME: This should not be required, DeleteCommand should update the selection, otherwise undo/redo won't work.
             lm.getEditDataSet().setSelected();
-            Main.map.repaint();
         }
     }
@@ -213 +216 @@
     private void repaintIfRequired(Set<OsmPrimitive> newHighlights, WaySegment newHighlightedWaySegment) {
         boolean needsRepaint = false;
-        DataSet ds = getLayerManager().getEditDataSet();
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
 
         if (newHighlightedWaySegment == null && oldHighlightedWaySegment != null) {
-            if (ds != null) {
-                ds.clearHighlightedWaySegments();
+            if (editLayer != null) {
+                editLayer.data.clearHighlightedWaySegments();
                 needsRepaint = true;
             }
             oldHighlightedWaySegment = null;
         } else if (newHighlightedWaySegment != null && !newHighlightedWaySegment.equals(oldHighlightedWaySegment)) {
-            if (ds != null) {
-                ds.setHighlightedWaySegments(Collections.singleton(newHighlightedWaySegment));
+            if (editLayer != null) {
+                editLayer.data.setHighlightedWaySegments(Collections.singleton(newHighlightedWaySegment));
                 needsRepaint = true;
             }
@@ -229 +232 @@
         }
         needsRepaint |= highlightHelper.highlightOnly(newHighlights);
-        if (needsRepaint) {
-            Main.map.mapView.repaint();
+        if (needsRepaint && editLayer != null) {
+            editLayer.invalidate();
         }
     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -185 +185 @@
 
         // update selection to reflect which way being modified
-        DataSet currentDataSet = getLayerManager().getEditDataSet();
-        if (getCurrentBaseNode() != null && currentDataSet != null && !currentDataSet.selectionEmpty()) {
+        OsmDataLayer editLayer = getLayerManager().getEditLayer();
+        if (getCurrentBaseNode() != null && editLayer != null && !editLayer.data.selectionEmpty()) {
+            DataSet currentDataSet = editLayer.data;
             Way continueFrom = getWayForNode(getCurrentBaseNode());
             if (alt && continueFrom != null && (!getCurrentBaseNode().isSelected() || continueFrom.isSelected())) {
@@ -197 +198 @@
         }
 
-        if (needsRepaint) {
-            Main.map.mapView.repaint();
+        if (needsRepaint && editLayer != null) {
+            editLayer.invalidate();
         }
         return needsRepaint;
@@ -917 +918 @@
     @Override
     public void mouseExited(MouseEvent e) {
-        if (!Main.map.mapView.isActiveLayerDrawable())
+        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
+        if (editLayer == null)
             return;
         mousePos = e.getPoint();
@@ -925 +927 @@
         // caused one already, don’t do it again.
         if (!repaintIssued) {
-            Main.map.mapView.repaint();
+            editLayer.invalidate();
         }
     }

trunk/src/org/openstreetmap/josm/command/AddCommand.java

@@ -59 +59 @@
     @Override
     public boolean executeCommand() {
-        getLayer().data.addPrimitive(osm);
+        getAffectedDataSet().addPrimitive(osm);
         osm.setModified(true);
         checkNodeStyles(osm);
@@ -67 +67 @@
     @Override
     public void undoCommand() {
-        getLayer().data.removePrimitive(osm);
+        getAffectedDataSet().removePrimitive(osm);
         checkNodeStyles(osm);
     }

trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java

@@ -78 +78 @@
 
             for (PrimitiveData pd : data) {
-                OsmPrimitive primitive = getLayer().data.getPrimitiveById(pd);
+                OsmPrimitive primitive = getAffectedDataSet().getPrimitiveById(pd);
                 boolean created = primitive == null;
                 if (created) {
@@ -87 +87 @@
                 }
                 if (created) {
-                    getLayer().data.addPrimitive(primitive);
+                    getAffectedDataSet().addPrimitive(primitive);
                 }
                 newPrimitives.add(primitive);
@@ -115 +115 @@
 
     @Override public void undoCommand() {
-        DataSet ds = getLayer().data;
+        DataSet ds = getAffectedDataSet();
 
         if (createdPrimitives == null) {
@@ -167 +167 @@
         Collection<OsmPrimitive> prims = new HashSet<>();
         for (PrimitiveData d : data) {
-            OsmPrimitive osm = getLayer().data.getPrimitiveById(d);
+            OsmPrimitive osm = getAffectedDataSet().getPrimitiveById(d);
             if (osm == null)
                 throw new RuntimeException();

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -210 +211 @@
     protected OsmDataLayer getLayer() {
         return layer;
+    }
+
+    /**
+     * Gets the data set this command affects.
+     * @return The data set. May be <code>null</code> if no layer was set and no edit layer was found.
+     * @since 10467
+     */
+    public DataSet getAffectedDataSet() {
+        return layer == null ? null : layer.data;
     }
 

trunk/src/org/openstreetmap/josm/command/conflict/WayNodesConflictResolverCommand.java

@@ -59 +59 @@
         //
         for (Node n:mergedNodeList) {
-            if (!getLayer().data.getNodes().contains(n)) {
+            if (!getAffectedDataSet().getNodes().contains(n)) {
                 Main.warn(tr("Main dataset does not include node {0}", n.toString()));
             }

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -74 +74 @@
      */
     public synchronized void add(final Command c) {
-        DataSet ds = Main.getLayerManager().getEditDataSet();
-        Collection<? extends OsmPrimitive> oldSelection = ds.getSelected();
+        DataSet ds = c.getAffectedDataSet();
+        if (ds == null) {
+            // old, legacy behaviour
+            ds = Main.getLayerManager().getEditDataSet();
+        }
+        Collection<? extends OsmPrimitive> oldSelection = null;
+        if (ds != null) {
+            oldSelection = ds.getSelected();
+        }
         addNoRedraw(c);
         afterAdd();
 
         // the command may have changed the selection so tell the listeners about the current situation
-        fireIfSelectionChanged(ds, oldSelection);
+        if (ds != null) {
+            fireIfSelectionChanged(ds, oldSelection);
+        }
     }
 

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -203 +203 @@
                     if (pnt.compareTo(earliest) < 0) {
                         earliest = pnt;
-                    } else {
+                    } else if (pnt.compareTo(latest) > 0) {
                         latest = pnt;
                     }

trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

@@ -19 +19 @@
 
     /**
-     * The seconds (not milliseconds!) since 1970-01-01.
+     * The seconds (not milliseconds!) since 1970-01-01 00:00 UTC
      */
     public double time;

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();
     }