Changeset 10072 in josm

Timestamp:

2016-03-28T18:27:56+02:00 (9 years ago)

Author:

Don-vip

Message:

refactor duplicated code

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java

@@ -15 +15 @@
  */
 public class MemberTableMemberCellRenderer extends MemberTableCellRenderer {
-
-    /**
-     * Constructs a new {@code MemberTableMemberCellRenderer}.
-     */
-    public MemberTableMemberCellRenderer() {
-        super();
-    }
 
     protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java

@@ -3 +3 @@
 
 import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
 
-import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.UIManager;
@@ -12 +9 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -20 +15 @@
  *
  */
-public class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
-    public static final Color BGCOLOR_DOUBLE_ENTRY = new Color(254, 226, 214);
-    public static final Color BGCOLOR_SINGLE_ENTRY = new Color(235, 255, 177);
+public class SelectionTableCellRenderer extends MemberTableMemberCellRenderer {
+    public static final Color BGCOLOR_SINGLE_ENTRY = BGCOLOR_IN_JOSM_SELECTION;
 
     /**
      * reference to the member table model; required, in order to check whether a
-     * selected primitive is already used in the member list of the currently edited
-     * relation
+     * selected primitive is already used in the member list of the currently edited relation
      */
-    private MemberTableModel model;
+    private final MemberTableModel model;
 
     /**
      * constructor
+     * @param model member table model
      */
-    public SelectionTableCellRenderer() {
-        setIcon(null);
-        setOpaque(true);
+    public SelectionTableCellRenderer(MemberTableModel model) {
+        this.model = model;
     }
 
-    /**
-     * reset the renderer
-     */
-    protected void reset() {
-        setBackground(UIManager.getColor("Table.background"));
-        setForeground(UIManager.getColor("Table.foreground"));
-        setBorder(null);
-        setIcon(null);
-        setToolTipText(null);
-    }
-
-    protected void renderBackground(OsmPrimitive primitive) {
+    @Override
+    protected void renderBackgroundForeground(MemberTableModel model, OsmPrimitive primitive, boolean isSelected) {
         Color bgc = UIManager.getColor("Table.background");
         if (primitive != null && model != null && model.getNumMembersWithPrimitive(primitive) == 1) {
@@ -60 +43 @@
     }
 
-    protected void renderPrimitive(OsmPrimitive primitive, Dimension cellSize) {
-        int size = Math.min(cellSize.width, cellSize.height);
-        setIcon(ImageProvider.getPadded(primitive, new Dimension(size, size)));
-        setText(primitive.getDisplayName(DefaultNameFormatter.getInstance()));
-        setToolTipText(DefaultNameFormatter.getInstance().buildDefaultToolTip(primitive));
-    }
-
     @Override
-    public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
-            int row, int column) {
-
-        reset();
-        if (value == null)
-            return this;
-
-        Dimension cellSize = table.getCellRect(row, column, false).getSize();
-
-        renderBackground((OsmPrimitive) value);
-        renderPrimitive((OsmPrimitive) value, cellSize);
-        return this;
-    }
-
-    public void setMemberTableModel(MemberTableModel model) {
-        this.model = model;
+    protected MemberTableModel getModel(JTable table) {
+        return model;
     }
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java

@@ -10 +10 @@
     public SelectionTableColumnModel(MemberTableModel model) {
         TableColumn col = null;
-        SelectionTableCellRenderer renderer = new SelectionTableCellRenderer();
-        renderer.setMemberTableModel(model);
+        SelectionTableCellRenderer renderer = new SelectionTableCellRenderer(model);
 
         // column 0 - the member role

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRendererTest.java

@@ -30 +30 @@
     public void testSelectionTableCellRenderer() {
         MemberTableModel model = new MemberTableModel(null, null, null);
-        SelectionTableCellRenderer r = new SelectionTableCellRenderer();
-        r.setMemberTableModel(model);
+        SelectionTableCellRenderer r = new SelectionTableCellRenderer(model);
         assertEquals(r, r.getTableCellRendererComponent(null, null, false, false, 0, 0));
         assertEquals(r, r.getTableCellRendererComponent(new JTable(model), new Node(), false, false, 0, 0));