Changeset 5808 in josm

Timestamp:

2013-03-29T09:31:36+01:00 (12 years ago)

Author:

akks

Message:

fix #8549, patch by Zverikk: Remove [deprecated] imagery offset server support

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ImageryAdjustAction.java (modified) (1 diff)
• gui/layer/ImageryLayer.java (modified) (10 diffs)
• gui/preferences/imagery/CommonSettingsPanel.java (modified) (6 diffs)
• io/imagery/OffsetServer.java (deleted)
• io/imagery/OsmosnimkiOffsetServer.java (deleted)

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

@@ -145 +145 @@
             return;
         oldMapMode = Main.map.mapMode;
-        layer.enableOffsetServer(false);
         super.actionPerformed(e);
     }

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

@@ -26 +26 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ImageryAdjustAction;
 import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -38 +36 @@
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MenuScroller;
-import org.openstreetmap.josm.io.imagery.OffsetServer;
-import org.openstreetmap.josm.io.imagery.OsmosnimkiOffsetServer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -66 +62 @@
     protected int sharpenLevel;
 
-    protected boolean offsetServerSupported;
-    protected boolean offsetServerUsed;
-    protected OffsetServerThread offsetServerThread;
-
     private final ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
-    private final AbstractAction useServerOffsetAction = new AbstractAction(tr("(use server offset)")) {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            enableOffsetServer(true);
-        }
-    };
-
-    protected OffsetServerThread createoffsetServerThread() {
-        return new OffsetServerThread(new OsmosnimkiOffsetServer(
-                OsmosnimkiOffsetServer.PROP_SERVER_URL.get()));
-    }
 
     public ImageryLayer(ImageryInfo info) {
@@ -94 +75 @@
         }
         this.sharpenLevel = PROP_SHARPEN_LEVEL.get();
-        if (OffsetServer.PROP_SERVER_ENABLED.get()) {
-            offsetServerThread = createoffsetServerThread();
-            offsetServerThread.start();
-        }
     }
 
@@ -164 +141 @@
         public void actionPerformed(ActionEvent ev) {
             setOffset(b.dx, b.dy);
-            enableOffsetServer(false);
             Main.main.menu.imageryMenu.refreshOffsetMenu();
             Main.map.repaint();
@@ -183 +159 @@
         public boolean supportLayers(List<Layer> layers) {
             return false;
-        }
-    }
-
-    public void enableOffsetServer(boolean enable) {
-        offsetServerUsed = enable;
-        if (offsetServerUsed && !offsetServerThread.isAlive()) {
-            offsetServerThread = createoffsetServerThread();
-            offsetServerThread.start();
         }
     }
@@ -202 +170 @@
     public JComponent getOffsetMenuItem(JComponent subMenu) {
         JMenuItem adjustMenuItem = new JMenuItem(adjustAction);
-        if (OffsetBookmark.allBookmarks.isEmpty() && !offsetServerSupported) return adjustMenuItem;
+        if (OffsetBookmark.allBookmarks.isEmpty()) return adjustMenuItem;
 
         subMenu.add(adjustMenuItem);
-        if (offsetServerSupported) {
-            JCheckBoxMenuItem item = new JCheckBoxMenuItem(useServerOffsetAction);
-            if (offsetServerUsed) {
-                item.setSelected(true);
-            }
-            subMenu.add(item);
-        }
         subMenu.add(new JSeparator());
         boolean hasBookmarks = false;
@@ -220 +181 @@
             }
             JCheckBoxMenuItem item = new JCheckBoxMenuItem(new ApplyOffsetAction(b));
-            if (b.dx == dx && b.dy == dy && !offsetServerUsed) {
+            if (b.dx == dx && b.dy == dy) {
                 item.setSelected(true);
             }
@@ -235 +196 @@
             }
         }
-        return (hasBookmarks || offsetServerSupported) ? subMenu : adjustMenuItem;
+        return hasBookmarks ? subMenu : adjustMenuItem;
     }
 
@@ -265 +226 @@
     }
 
-    protected class OffsetServerThread extends Thread {
-        OffsetServer offsetServer;
-        EastNorth oldCenter = new EastNorth(Double.NaN, Double.NaN);
-
-        public OffsetServerThread(OffsetServer offsetServer) {
-            this.offsetServer = offsetServer;
-            setDaemon(true);
-        }
-
-        private void updateOffset() {
-            if (Main.map == null || Main.map.mapView == null) return;
-            EastNorth center = Main.map.mapView.getCenter();
-            if (center.equals(oldCenter)) return;
-            oldCenter = center;
-
-            EastNorth offset = offsetServer.getOffset(getInfo(), center);
-            if (offset != null) {
-                setOffset(offset.east(),offset.north());
-            }
-        }
-
-        @Override
-        public void run() {
-            if (!offsetServerSupported) {
-                if (!offsetServer.isLayerSupported(info)) return;
-                offsetServerSupported = true;
-            }
-            offsetServerUsed = true;
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    Main.main.menu.imageryMenu.refreshOffsetMenu();
-                }
-            });
-            try {
-                while (offsetServerUsed) {
-                    updateOffset();
-                    Thread.sleep(1000);
-                }
-            } catch (InterruptedException e) {
-            }
-            offsetServerUsed = false;
-        }
-    }
-
     /* (non-Javadoc)
      * @see org.openstreetmap.josm.gui.layer.Layer#destroy()

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java

@@ -10 +10 @@
 
 import javax.swing.JButton;
-import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
 import javax.swing.JLabel;
@@ -16 +15 @@
 import javax.swing.JPanel;
 import javax.swing.JSlider;
-import javax.swing.JTextField;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
-import org.openstreetmap.josm.io.imagery.OffsetServer;
-import org.openstreetmap.josm.io.imagery.OsmosnimkiOffsetServer;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.GBC;
@@ -37 +31 @@
     private final JSlider fadeAmount = new JSlider(0, 100);
     private final JosmComboBox sharpen;
-    private final JCheckBox useOffsetServer;
-    private final JTextField offsetServerUrl;
 
     /**
@@ -80 +72 @@
         add(GBC.glue(5, 0), GBC.std().fill(GBC.HORIZONTAL));
         add(this.sharpen, GBC.eol().fill(GBC.HORIZONTAL));
-
-        this.useOffsetServer = new JCheckBox(tr("Use offset server: "));
-        this.offsetServerUrl = new JTextField();
-        this.useOffsetServer.addChangeListener(new ChangeListener() {
-            @Override
-            public void stateChanged(ChangeEvent e) {
-                offsetServerUrl.setEnabled(useOffsetServer.isSelected());
-            }
-        });
-        offsetServerUrl.setEnabled(useOffsetServer.isSelected());
-        add(this.useOffsetServer, GBC.eol().fill(GBC.HORIZONTAL));
-        add(this.offsetServerUrl, GBC.eol().fill(GBC.HORIZONTAL));
     }
     
@@ -103 +83 @@
         this.fadeAmount.setValue(ImageryLayer.PROP_FADE_AMOUNT.get());
         this.sharpen.setSelectedIndex(Math.max(0, Math.min(2, ImageryLayer.PROP_SHARPEN_LEVEL.get())));
-        this.useOffsetServer.setSelected(OffsetServer.PROP_SERVER_ENABLED.get());
-        this.offsetServerUrl.setText(OsmosnimkiOffsetServer.PROP_SERVER_URL.get());
     }
     
@@ -112 +90 @@
      */
     public boolean saveSettings() {
-        OffsetServer.PROP_SERVER_ENABLED.put(useOffsetServer.isSelected());
-        OsmosnimkiOffsetServer.PROP_SERVER_URL.put(offsetServerUrl.getText());
-
         ImageryLayer.PROP_FADE_AMOUNT.put(this.fadeAmount.getValue());
         ImageryLayer.PROP_FADE_COLOR.put(this.btnFadeColor.getBackground());