Changeset 17889 in josm for trunk/src

Timestamp:

2021-05-13T00:19:26+02:00 (4 years ago)

Author:

simon04

Message:

see #20880 - Extract class VersionTableCellRenderer

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• VersionTable.java (modified) (2 diffs)
• VersionTableCellRenderer.java (added)
• VersionTableColumnModel.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import javax.swing.DefaultCellEditor;
 import javax.swing.JCheckBox;
-import javax.swing.JLabel;
 import javax.swing.JPopupMenu;
 import javax.swing.JRadioButton;
@@ -324 +323 @@
     }
 
-    /**
-     * Renderer for history version labels, allowing to define horizontal alignment.
-     */
-    public static class AlignedRenderer extends JLabel implements TableCellRenderer {
-
-        /**
-         * Constructs a new {@code AlignedRenderer}.
-         * @param hAlignment Horizontal alignment. One of the following constants defined in SwingConstants:
-         *        LEFT, CENTER (the default for image-only labels), RIGHT, LEADING (the default for text-only labels) or TRAILING
-         */
-        public AlignedRenderer(int hAlignment) {
-            setHorizontalAlignment(hAlignment);
-        }
-
-        AlignedRenderer() {
-            this(SwingConstants.LEADING);
-        }
-
-        @Override
-        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
-                int row, int column) {
-            String v = "";
-            if (value != null) {
-                v = value.toString();
-            }
-            setText(v);
-            return this;
-        }
-    }
-
     private static void adjustColumnWidth(JTable tbl, int col, int cellInset) {
         int maxwidth = 0;

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import javax.swing.SwingConstants;
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.TableColumn;
@@ -42 +41 @@
         /* translation note: 3 letter abbr. for "Version" */
         col.setHeaderValue(tr("Ver"));
-        col.setCellRenderer(new VersionTable.AlignedRenderer(SwingConstants.CENTER));
+        col.setCellRenderer(new VersionTableCellRenderer());
         col.setResizable(false);
         addColumn(col);