Changeset 29394 in osm for applications/editors/josm

Timestamp:

2013-03-24T20:08:00+01:00 (11 years ago)

Author:

zverik

Message:

iodb: small refactoring, also offset watcher

Location:

applications/editors/josm/plugins/imagery_offset_db

Files:

• images/getoffsetnow.png (added)
• src/iodb/GetImageryOffsetAction.java (modified) (5 diffs)
• src/iodb/ImageryOffsetWatcher.java (added)
• src/iodb/OffsetDialog.java (modified) (5 diffs)
• src/iodb/OffsetDialogButton.java (modified) (1 diff)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java

@@ -7 +7 @@
 import java.net.*;
 import java.util.*;
+import javax.swing.Action;
+import javax.swing.Icon;
 import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
@@ -15 +17 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -24 +27 @@
  */
 public class GetImageryOffsetAction extends JosmAction {
+    private Icon iconOffsetOk;
+    private Icon iconOffsetBad;
     
     /**
      * Initialize the action. Sets "Ctrl+Alt+I" shortcut: the only shortcut in this plugin.
+     * Also registers itself with {@link ImageryOffsetWatcher}.
      */
     public GetImageryOffsetAction() {
@@ -32 +38 @@
                 Shortcut.registerShortcut("imageryoffset:get", tr("Imagery: {0}", tr("Get Imagery Offset...")),
                 KeyEvent.VK_I, Shortcut.ALT_CTRL), true);
+        iconOffsetOk = ImageProvider.get("getoffset");
+        iconOffsetBad = ImageProvider.get("getoffsetnow"); // todo: create icon
+        ImageryOffsetWatcher.getInstance().register(this);
     }
 
@@ -84 +93 @@
 
     /**
+     * Update action icon based on an offset state.
+     */
+    public void offsetStateChanged( boolean isOffsetGood ) {
+        putValue(Action.SMALL_ICON, isOffsetGood ? iconOffsetOk : iconOffsetBad);
+    }
+
+    /**
+     * Remove offset listener.
+     */
+    @Override
+    public void destroy() {
+        ImageryOffsetWatcher.getInstance().unregister(this);
+        super.destroy();
+    }
+
+    /**
      * A task that downloads offsets for a given position and imagery layer,
      * then parses resulting XML and calls
      * {@link #showOffsetDialog(java.util.List)} on success.
      */
-    class DownloadOffsetsTask extends SimpleOffsetQueryTask {
+    private class DownloadOffsetsTask extends SimpleOffsetQueryTask {
         private ImageryLayer layer;
         private List<ImageryOffsetBase> offsets;

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialog.java

@@ -17 +17 @@
 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -29 +28 @@
  * @license WTFPL
  */
-public class OffsetDialog extends JDialog implements ActionListener, NavigatableComponent.ZoomChangeListener, MapViewPaintable {
+public class OffsetDialog extends JDialog implements ActionListener, MapView.ZoomChangeListener, MapViewPaintable {
     protected static final String PREF_CALIBRATION = "iodb.show.calibration";
     protected static final String PREF_DEPRECATED = "iodb.show.deprecated";
@@ -55 +54 @@
         setResizable(false);
         this.offsets = offsets;
-        NavigatableComponent.addZoomChangeListener(this);
 
         // make this dialog close on "escape"
@@ -194 +192 @@
         selectedOffset = null;
         prepareDialog();
+        MapView.addZoomChangeListener(this);
         if( !MODAL ) {
             Main.map.mapView.addTemporaryLayer(this);
@@ -218 +217 @@
                 || Main.pref.getBoolean("iodb.close.on.select", true);
         if( closeDialog ) {
-            NavigatableComponent.removeZoomChangeListener(this);
+            MapView.removeZoomChangeListener(this);
             setVisible(false);
         }

applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetDialogButton.java

@@ -74 +74 @@
         description = description.replace("<", "&lt;").replace(">", "&gt;");
         JLabel descriptionLabel = new JLabel("<html><div style=\"width: 300px;\">"+description+"</div></html>");
-        Font descriptionFont = new Font(descriptionLabel.getFont().getName(), Font.BOLD, descriptionLabel.getFont().getSize() - 2);
+        Font descriptionFont = new Font(descriptionLabel.getFont().getName(), Font.BOLD, descriptionLabel.getFont().getSize());
         descriptionLabel.setFont(descriptionFont);