Changeset 8620 in josm

Timestamp:

2015-07-26T23:01:55+02:00 (8 years ago)

Author:

wiktorn

Message:

autozoom checkbox display fix in right-menu click

• proper display of state of checkbox on right-click menu (autoZoom, autoLoad, showErrors)
• add WMTS layer to session exporter

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/AbstractTileSourceLayer.java (modified) (6 diffs)
• io/session/SessionWriter.java (modified) (2 diffs)

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

@@ -20 +20 @@
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -38 +39 @@
 import javax.swing.Action;
 import javax.swing.BorderFactory;
+import javax.swing.DefaultButtonModel;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JLabel;
@@ -471 +473 @@
     }
 
+    private class BooleanButtonModel extends DefaultButtonModel {
+        private Field field;
+
+        public BooleanButtonModel(Field field) {
+            this.field = field;
+        }
+
+        @Override
+        public boolean isSelected() {
+            try {
+                return field.getBoolean(AbstractTileSourceLayer.this);
+            } catch (IllegalArgumentException | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+    }
     /**
      * Creates popup menu items and binds to mouse actions
@@ -480 +499 @@
         initTileSource(this.tileSource);
 
+        ;
         // keep them final here, so we avoid namespace clutter in the class
         final JPopupMenu tileOptionMenu = new JPopupMenu();
         final TileHolder clickedTileHolder = new TileHolder();
+        Field autoZoomField;
+        Field autoLoadField;
+        Field showErrorsField;
+        try {
+            autoZoomField = AbstractTileSourceLayer.class.getField("autoZoom");
+            autoLoadField = AbstractTileSourceLayer.class.getDeclaredField("autoLoad");
+            showErrorsField = AbstractTileSourceLayer.class.getDeclaredField("showErrors");
+        } catch (NoSuchFieldException | SecurityException e) {
+            // shoud not happen
+            throw new RuntimeException(e);
+        }
 
         autoZoom = PROP_DEFAULT_AUTOZOOM.get();
         JCheckBoxMenuItem autoZoomPopup = new JCheckBoxMenuItem();
+        autoZoomPopup.setModel(new BooleanButtonModel(autoZoomField));
         autoZoomPopup.setAction(new AutoZoomAction());
-        autoZoomPopup.setSelected(autoZoom);
         tileOptionMenu.add(autoZoomPopup);
 
@@ -493 +524 @@
         JCheckBoxMenuItem autoLoadPopup = new JCheckBoxMenuItem();
         autoLoadPopup.setAction(new AutoLoadTilesAction());
-        autoLoadPopup.setSelected(autoLoad);
+        autoLoadPopup.setModel(new BooleanButtonModel(autoLoadField));
         tileOptionMenu.add(autoLoadPopup);
 
@@ -504 +535 @@
             }
         });
-        showErrorsPopup.setSelected(showErrors);
+        showErrorsPopup.setModel(new BooleanButtonModel(showErrorsField));
         tileOptionMenu.add(showErrorsPopup);
 

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.layer.WMSLayer;
+import org.openstreetmap.josm.gui.layer.WMTSLayer;
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -54 +55 @@
         registerSessionLayerExporter(TMSLayer.class , ImagerySessionExporter.class);
         registerSessionLayerExporter(WMSLayer.class , ImagerySessionExporter.class);
+        registerSessionLayerExporter(WMTSLayer.class , ImagerySessionExporter.class);
         registerSessionLayerExporter(GpxLayer.class , GpxTracksSessionExporter.class);
         registerSessionLayerExporter(GeoImageLayer.class , GeoImageSessionExporter.class);