Changeset 7434 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode

Timestamp:

2014-08-20T03:07:15+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #8885 (see #4614) - add offline mode with new command line argument --offline which can take one of several of these values (comma separated):

• josm_website: to disable all accesses to JOSM website (when not cached, disables Getting Started page, help, plugin list, styles, imagery, presets, rules)
• osm_api: to disable all accesses to OSM API (disables download, upload, changeset queries, history, user message notification)
• all: alias to disable all values. Currently equivalent to "josm_website,osm_api"

Plus improved javadoc, fixed EDT violations, and fixed a bug with HTTP redirection sent without "Location" header

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (7 diffs)

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

@@ -129 +129 @@
     }
 
+    /**
+     * Invoked when the action occurs.
+     * @param e Action event
+     */
     public static void doActionPerformed(ActionEvent e) {
-        if(!Main.map.mapView.isActiveLayerDrawable())
+        if (!Main.map.mapView.isActiveLayerDrawable())
             return;
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
@@ -149 +153 @@
     }
 
-    @Override public void mouseDragged(MouseEvent e) {
+    @Override
+    public void mouseDragged(MouseEvent e) {
         mouseMoved(e);
     }
@@ -157 +162 @@
      * @param e The mouse event that has been captured
      */
-    @Override public void mouseMoved(MouseEvent e) {
+    @Override
+    public void mouseMoved(MouseEvent e) {
         oldEvent = e;
         giveUserFeedback(e);
@@ -245 +251 @@
         Main.map.mapView.setNewCursor(parameters.mode.cursor(), this);
     }
+
     /**
      * Gives the user feedback for the action he/she is about to do. Currently
@@ -274 +281 @@
      * position.
      */
-    @Override public void mouseReleased(MouseEvent e) {
+    @Override
+    public void mouseReleased(MouseEvent e) {
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
@@ -293 +301 @@
     }
 
-    @Override public String getModeHelpText() {
+    @Override
+    public String getModeHelpText() {
         return tr("Click to delete. Shift: delete way segment. Alt: do not delete unused nodes when deleting a way. Ctrl: delete referring objects.");
     }
 
-    @Override public boolean layerIsSupported(Layer l) {
+    @Override
+    public boolean layerIsSupported(Layer l) {
         return l instanceof OsmDataLayer;
     }
@@ -391 +401 @@
     @Override
     public void modifiersChanged(int modifiers) {
-        if(oldEvent == null)
-            return;
-        // We don't have a mouse event, so we pass the old mouse event but the
-        // new modifiers.
+        if (oldEvent == null)
+            return;
+        // We don't have a mouse event, so we pass the old mouse event but the new modifiers.
         giveUserFeedback(oldEvent, modifiers);
     }