Changeset 2448 in josm for trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java

Timestamp:

2009-11-14T17:59:10+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3352: History doesn't get invalidated on upload?
fixed #3912: Extend history dialog to contain the currently modified version
new: zoom to node in list of nodes in history dialog (popup menu)
new: load history of node from node list in history dialog (popup menu or double click)
fixed: close all history dialogs when the number of layers drop to 0
fixed: implemented equals() and hashCode() on SimplePrimitiveId
fixed: history features now usePrimitiveId instead of long.

File:

• trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java

@@ -15 +15 @@
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -44 +47 @@
     }
 
-    protected void renderIcon(HistoryOsmPrimitive primitive) {
-        ImageIcon icon = null;
-        if (primitive != null) {
-            icon = icons.get(primitive.getType());
-        }
+    protected void renderIcon(OsmPrimitiveType type) {
+        ImageIcon icon = type == null? null : icons.get(type);
         setIcon(icon);
     }
 
     protected void renderText(HistoryOsmPrimitive primitive) {
-        // render lable text
+        // render label text
         //
         StringBuilder sb = new StringBuilder();
@@ -86 +86 @@
     }
 
+    protected OsmDataLayer getEditLayer() {
+        try {
+            return Main.map.mapView.getEditLayer();
+        } catch(NullPointerException e) {
+            return null;
+        }
+    }
+
+    protected void renderLatestText(OsmPrimitive primitive) {
+        // -- label text
+        StringBuffer sb = new StringBuffer();
+        if (primitive == null) {
+            setText("");
+            return;
+        }
+        if (primitive.isModified()) {
+            sb.append("*");
+        }
+        sb.append(tr("Version {0} in editor", primitive.getVersion()));
+        if (primitive.isDeleted()) {
+            sb.append(tr("[deleted]"));
+        }
+        setText(sb.toString());
+
+        // -- tooltip text
+        sb = new StringBuffer();
+        OsmDataLayer l = getEditLayer();
+
+        sb.append(
+                tr(
+                        "Version {0} currently edited in data layer ''{1}''",
+                        primitive.getId(),
+                        l == null ? tr("unknown") : l.getName()
+                )
+        );
+        setToolTipText(sb.toString());
+    }
+
     protected void renderBackground(JTable table, int row, boolean isSelected) {
         Color bgColor = Color.WHITE;
@@ -96 +134 @@
     }
 
+    public void renderVersionFromHistory(HistoryOsmPrimitive primitive, JTable table, int row, boolean isSelected) {
+        renderIcon(primitive.getType());
+        renderText(primitive);
+        renderBackground(table, row, isSelected);
+    }
+
+    public void renderLatest(OsmPrimitive primitive, JTable table, int row, boolean isSelected) {
+        renderIcon(primitive.getType());
+        renderLatestText(getModel(table).getLatest());
+        renderBackground(table, row, isSelected);
+    }
+
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
-
-        HistoryOsmPrimitive primitive = (HistoryOsmPrimitive)value;
-        renderIcon(primitive);
-        renderText(primitive);
-        renderBackground(table, row, isSelected);
+        if (getModel(table).isLatest(row)) {
+            renderLatest(getModel(table).getLatest(),table, row, isSelected);
+        } else {
+            renderVersionFromHistory((HistoryOsmPrimitive)value, table, row, isSelected);
+        }
         return this;
     }