Changeset 5025 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2012-02-26T16:10:39+01:00 (12 years ago)

Author:

Don-vip

Message:

see #4043 - Have an 'upload prohibited' flag in .osm files

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (11 diffs)

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

@@ -13 +13 @@
 import java.awt.Graphics2D;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -21 +22 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -30 +32 @@
 import javax.swing.Action;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -37 +40 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
+import org.openstreetmap.josm.actions.ToggleUploadDiscouragedLayerAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -214 +219 @@
     }
 
+    protected Icon getBaseIcon() {
+        return ImageProvider.get("layer", "osmdata_small");
+    }
+    
     /**
      * TODO: @return Return a dynamic drawn icon of the map data. The icon is
@@ -219 +228 @@
      */
     @Override public Icon getIcon() {
-        return ImageProvider.get("layer", "osmdata_small");
+        Icon baseIcon = getBaseIcon();
+        if (isUploadDiscouraged()) {
+            return ImageProvider.overlay(baseIcon,
+                    new ImageIcon(ImageProvider.get("warning-small").getImage().getScaledInstance(8, 8, Image.SCALE_SMOOTH)),
+                    ImageProvider.OverlayPosition.SOUTHEAST);
+        } else {
+            return baseIcon;
+        }
     }
 
@@ -395 +411 @@
 
     @Override public boolean isMergable(final Layer other) {
-        return other instanceof OsmDataLayer;
+        return other instanceof OsmDataLayer && (isUploadDiscouraged() == ((OsmDataLayer)other).isUploadDiscouraged());
     }
 
@@ -457 +473 @@
         p.add(new JLabel(wayText, ImageProvider.get("data", "way"), JLabel.HORIZONTAL), GBC.eop().insets(15,0,0,0));
         p.add(new JLabel(relationText, ImageProvider.get("data", "relation"), JLabel.HORIZONTAL), GBC.eop().insets(15,0,0,0));
-        p.add(new JLabel(tr("API version: {0}", (data.getVersion() != null) ? data.getVersion() : tr("unset"))));
+        p.add(new JLabel(tr("API version: {0}", (data.getVersion() != null) ? data.getVersion() : tr("unset"))), GBC.eop().insets(15,0,0,0));
+        if (isUploadDiscouraged()) {
+            p.add(new JLabel(tr("Upload is discouraged")), GBC.eop().insets(15,0,0,0));
+        }
 
         return p;
@@ -475 +494 @@
                 SeparatorLayerAction.INSTANCE,
                 new LayerListPopup.InfoAction(this)};
-        return new Action[]{
+        ArrayList<Action> actions = new ArrayList<Action>();
+        actions.addAll(Arrays.asList(new Action[]{
                 LayerListDialog.getInstance().createActivateLayerAction(this),
                 LayerListDialog.getInstance().createShowHideLayerAction(),
@@ -486 +506 @@
                 new ConvertToGpxLayerAction(),
                 SeparatorLayerAction.INSTANCE,
-                new RenameLayerAction(getAssociatedFile(), this),
+                new RenameLayerAction(getAssociatedFile(), this)}));
+        if (ExpertToggleAction.isExpert() && Main.pref.getBoolean("data.layer.upload_discouragement.menu_item", false)) {
+            actions.add(new ToggleUploadDiscouragedLayerAction(this));
+        }
+        actions.addAll(Arrays.asList(new Action[]{
                 new ConsistencyTestAction(),
                 SeparatorLayerAction.INSTANCE,
-                new LayerListPopup.InfoAction(this)};
+                new LayerListPopup.InfoAction(this)}));
+        return actions.toArray(new Action[0]);
     }
 
@@ -702 +727 @@
          */
     }
+
+    public final boolean isUploadDiscouraged() {
+        return data.isUploadDiscouraged();
+    }
+
+    public final void setUploadDiscouraged(boolean uploadDiscouraged) {
+        data.setUploadDiscouraged(uploadDiscouraged);
+    }
 }