Changeset 11318 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

Timestamp:

2016-11-26T21:28:20+01:00 (7 years ago)

Author:

Don-vip

Message:

refactor conflict classes

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java

@@ -12 +12 @@
 import javax.swing.table.TableCellRenderer;
 
+import org.openstreetmap.josm.command.conflict.WayNodesConflictResolverCommand;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -54 +55 @@
      * @param isSelected true, if the current row is selected
      */
-    protected void renderNode(ListMergeModel<Node>.EntriesTableModel model, Node node, int row, boolean isSelected) {
+    protected void renderNode(ListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel model, Node node,
+            int row, boolean isSelected) {
         setIcon(icon);
         setBorder(null);
@@ -88 +90 @@
      * @param row the row index
      */
-    protected void renderRowId(ListMergeModel<Node>.EntriesTableModel model, int row) {
+    protected void renderRowId(ListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel model, int row) {
         setIcon(null);
         setBorder(rowNumberBorder);
@@ -130 +132 @@
      */
     @SuppressWarnings("unchecked")
-    protected ListMergeModel<Node>.EntriesTableModel getModel(JTable table) {
-        return (ListMergeModel<Node>.EntriesTableModel) table.getModel();
+    protected ListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel getModel(JTable table) {
+        return (ListMergeModel<Node, WayNodesConflictResolverCommand>.EntriesTableModel) table.getModel();
     }
 }