Changeset 32580 in osm for applications

Timestamp:

2016-07-05T14:49:06+02:00 (8 years ago)

Author:

floscher

Message:

[mapillary] Use common TreeCellRenderer for ChangesetDialog and HistoryDialog

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui

Files:

• MapillaryChangesetDialog.java (modified) (6 diffs)
• MapillaryHistoryDialog.java (modified) (4 diffs)
• MapillaryImageTreeCellRenderer.java (added)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryChangesetDialog.java

@@ -20 +20 @@
 import javax.swing.SwingUtilities;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
@@ -70 +69 @@
   private MapillaryChangesetDialog() {
     super(
-      tr("Current Mapillary changeset"), "mapillaryhistory.png", tr("Open Mapillary changeset dialog"),
+      tr("Current Mapillary changeset"),
+      "mapillaryhistory.png",
+      tr("Open Mapillary changeset dialog"),
       Shortcut.registerShortcut(
         tr("Mapillary changeset"), tr("Open Mapillary changeset dialog"), KeyEvent.VK_9, Shortcut.NONE
-      ), 200
+      ),
+      200
     );
 
@@ -82 +84 @@
     this.changesetTree.setShowsRootHandles(true);
     this.changesetTree.setRootVisible(false);
-    this.changesetTree.setCellRenderer(new MapillaryCellRenderer());
+    this.changesetTree.setCellRenderer(new MapillaryImageTreeCellRenderer());
     this.changesetTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
 
@@ -105 +107 @@
    */
   public static synchronized MapillaryChangesetDialog getInstance() {
-    if (instance == null)
+    if (instance == null) {
       instance = new MapillaryChangesetDialog();
+    }
     return instance;
   }
@@ -148 +151 @@
       buildTree();
     }
-
   }
 
@@ -166 +168 @@
     }
   }
-
-  private static class MapillaryCellRenderer extends DefaultTreeCellRenderer {
-
-    private static final long serialVersionUID = -3129520241562296901L;
-
-    @Override
-    public Component getTreeCellRendererComponent(
-      JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus
-    ) {
-      super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-      setIcon(ImageProvider.get("data/node.png"));
-      return this;
-    }
-  }
-
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryHistoryDialog.java

@@ -26 +26 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeSelectionModel;
@@ -88 +87 @@
     this.undoTree.setShowsRootHandles(true);
     this.undoTree.setRootVisible(false);
-    this.undoTree.setCellRenderer(new MapillaryCellRenderer());
+    this.undoTree.setCellRenderer(new MapillaryImageTreeCellRenderer());
     this.undoTree.getSelectionModel().setSelectionMode(
         TreeSelectionModel.SINGLE_TREE_SELECTION);
@@ -97 +96 @@
 
     this.redoTree.expandRow(0);
-    this.redoTree.setCellRenderer(new MapillaryCellRenderer());
+    this.redoTree.setCellRenderer(new MapillaryImageTreeCellRenderer());
     this.redoTree.setShowsRootHandles(true);
     this.redoTree.setRootVisible(false);
@@ -227 +226 @@
   }
 
-  private static class MapillaryCellRenderer extends DefaultTreeCellRenderer {
-
-    private static final long serialVersionUID = -3129520241562296901L;
-
-    @Override
-    public Component getTreeCellRendererComponent(
-        JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus
-    ) {
-      super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-      setIcon(ImageProvider.get("data/node.png"));
-      return this;
-    }
-  }
-
   /**
    * Destroys the unique instance of the class.