Changeset 4301 in josm for trunk

Timestamp:

2011-08-08T00:32:38+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6642 - patch by cmuelle8 - TMSLayer: put option in tile context menu to hide errors

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (6 diffs)

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

@@ -90 +90 @@
     public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty(PREFERENCE_PREFIX + ".default_autozoom", true);
     public static final BooleanProperty PROP_DEFAULT_AUTOLOAD = new BooleanProperty(PREFERENCE_PREFIX + ".default_autoload", true);
+    public static final BooleanProperty PROP_DEFAULT_SHOWERRORS = new BooleanProperty(PREFERENCE_PREFIX + ".default_showerrors", true);
     public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", DEFAULT_MIN_ZOOM);
     public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", DEFAULT_MAX_ZOOM);
@@ -156 +157 @@
     JCheckBoxMenuItem autoZoomPopup;
     JCheckBoxMenuItem autoLoadPopup;
+    JCheckBoxMenuItem showErrorsPopup;
     Tile showMetadataTile;
     private Image attrImage;
@@ -171 +173 @@
     protected boolean autoZoom;
     protected boolean autoLoad;
+    protected boolean showErrors;
 
     void redraw()
@@ -321 +324 @@
 
         if(!isProjectionSupported(Main.getProjection())) {
-              JOptionPane.showMessageDialog(Main.parent,
-                  tr("TMS layers do not support the projection {0}.\n{1}\n"
-                  + "Change the projection or remove the layer.",
-                      Main.getProjection().toCode(), nameSupportedProjections()),
-                      tr("Warning"),
-                      JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent,
+                tr("TMS layers do not support the projection {0}.\n{1}\n"
+                + "Change the projection or remove the layer.",
+                Main.getProjection().toCode(), nameSupportedProjections()),
+                tr("Warning"),
+                JOptionPane.WARNING_MESSAGE);
         }
 
@@ -360 +363 @@
         autoLoadPopup.setSelected(autoLoad);
         tileOptionMenu.add(autoLoadPopup);
+
+        showErrors = PROP_DEFAULT_SHOWERRORS.get();
+        showErrorsPopup = new JCheckBoxMenuItem();
+        showErrorsPopup.setAction(new AbstractAction(tr("Show Errors")) {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                showErrors = !showErrors;
+            }
+        });
+        showErrorsPopup.setSelected(showErrors);
+        tileOptionMenu.add(showErrorsPopup);
 
         tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Load Tile")) {
@@ -854 +868 @@
         }*/
 
-        if (tile.hasError()) {
+        if (tile.hasError() && showErrors) {
             myDrawString(g, tr("Error") + ": " + tr(tile.getErrorMessage()), p.x + 2, texty);
             texty += 1 + fontHeight;