Changeset 15824 in josm

Timestamp:

2020-02-06T21:59:49+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18677 - Add "download" and "locked" status to osm data layer info

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

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

@@ -715 +715 @@
         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));
-        }
-        if (data.getUploadPolicy() == UploadPolicy.BLOCKED) {
-            p.add(new JLabel(tr("Upload is blocked")), GBC.eop().insets(15, 0, 0, 0));
-        }
+        addConditionalInformation(p, tr("Layer is locked"), isLocked());
+        addConditionalInformation(p, tr("Download is blocked"), data.getDownloadPolicy() == DownloadPolicy.BLOCKED);
+        addConditionalInformation(p, tr("Upload is discouraged"), isUploadDiscouraged());
+        addConditionalInformation(p, tr("Upload is blocked"), data.getUploadPolicy() == UploadPolicy.BLOCKED);
 
         return p;
     }
 
-    @Override public Action[] getMenuEntries() {
+    private static void addConditionalInformation(JPanel p, String text, boolean condition) {
+        if (condition) {
+            p.add(new JLabel(text), GBC.eop().insets(15, 0, 0, 0));
+        }
+    }
+
+    @Override
+    public Action[] getMenuEntries() {
         List<Action> actions = new ArrayList<>();
         actions.addAll(Arrays.asList(