Changeset 1642 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java

Timestamp:

2009-06-06T16:25:25+02:00 (15 years ago)

Author:

Gubaer

Message:

added row numbers and synchronized scrolling in conflict resolution dialog
fixed bugs in conflict resolution

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMerger.java

@@ -32 +32 @@
         );
         myEntriesTable.setName("table.mynodes");
+        myEntriesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
         return embeddInScrollPane(myEntriesTable);
     }
@@ -45 +46 @@
         );
         mergedEntriesTable.setName("table.mergednodes");
+        mergedEntriesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
         return embeddInScrollPane(mergedEntriesTable);
     }
@@ -58 +60 @@
         );
         theirEntriesTable.setName("table.theirnodes");
+        theirEntriesTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
         return embeddInScrollPane(theirEntriesTable);
     }