Changeset 17626 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2021-03-21T16:21:39+01:00 (4 years ago)

Author:

simon04

Message:

fix #12326 - Layer list: "dirty" and "modified" indicators for data layers

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainFrame.java (modified) (1 diff)
• dialogs/LayerListDialog.java (modified) (1 diff)
• layer/Layer.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainFrame.java

@@ -166 +166 @@
     public void refreshTitle() {
         OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
-        boolean dirty = editLayer != null && (editLayer.requiresSaveToFile()
-                || (editLayer.requiresUploadToServer() && !editLayer.isUploadDiscouraged()));
+        boolean dirty = editLayer != null && editLayer.isDirty();
         String userInfo = UserIdentityManager.getInstance().getUserName();
         if (userInfo != null && Config.getPref().getBoolean("draw.show-user", false))

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -708 +708 @@
             Layer layer = (Layer) value;
             JLabel label = (JLabel) super.getTableCellRendererComponent(table,
-                    layer.getName(), isSelected, hasFocus, row, column);
+                    layer.getLabel(), isSelected, hasFocus, row, column);
             if (isActiveLayer(layer)) {
                 label.setFont(label.getFont().deriveFont(Font.BOLD));

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

@@ -312 +312 @@
 
     /**
+     * Replies a label for this layer useful for UI elements. Defaults to the layer name
+     * @return a label for this layer
+     * @since 17626
+     */
+    public String getLabel() {
+        return getName();
+    }
+
+    /**
      * Replies the name of the layer
      *

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

@@ -1060 +1060 @@
     }
 
+    /**
+     * Determines if this layer is "dirty", i.e., requires save or upload
+     * @return if this layer is "dirty"
+     * @since 17626
+     */
+    public boolean isDirty() {
+        return requiresSaveToFile() || (requiresUploadToServer() && !isUploadDiscouraged());
+    }
+
+    @Override
+    public String getLabel() {
+        String label = super.getLabel();
+        if (this.isDirty()) {
+            label += " *";
+        }
+        if (this.getDataSet().isEmpty()) {
+            // U+2205 EMPTY SET
+            label += " \u2205";
+        }
+        return label;
+    }
+
     @Override
     public void onPostLoadFromFile() {