Changeset 17308 in josm for trunk/src/org

Timestamp:

2020-11-11T16:39:55+01:00 (3 years ago)

Author:

Don-vip

Message:

fix #19995 - upload dialog: separate instances for cell renderer and editor (patch by DevCharly, modified)

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• ActionFlagsTableCell.java (modified) (1 diff)
• SaveLayersTableColumnModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java

@@ -35 +35 @@
  * <br>col.setCellEditor(aftc);
  * </code>
+ *
+ * Note: Do not use the same object both as <code>TableCellRenderer</code> and
+ * <code>TableCellEditor</code> - this can mess up the current editor component
+ * by subsequent calls to the renderer (#19995 and #12462).
  */
 class ActionFlagsTableCell extends JPanel implements TableCellRenderer, TableCellEditor {

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java

@@ -90 +90 @@
     protected void build() {
         // column 0 - layer name, save path editor
-        LayerNameAndFilePathTableCell lnfpRenderer = new LayerNameAndFilePathTableCell();
-        LayerNameAndFilePathTableCell lnfpEditor = new LayerNameAndFilePathTableCell();
         TableColumn col = new TableColumn(0); // keep in sync with SaveLayersModel#columnFilename
         col.setHeaderValue(tr("Layer Name and File Path"));
         col.setResizable(true);
-        col.setCellRenderer(lnfpRenderer);
-        col.setCellEditor(lnfpEditor);
+        col.setCellRenderer(new LayerNameAndFilePathTableCell());
+        col.setCellEditor(new LayerNameAndFilePathTableCell());
         col.setPreferredWidth(324);
         addColumn(col);
@@ -109 +107 @@
 
         // column 2- actions to take
-        ActionFlagsTableCell aftc = new ActionFlagsTableCell();
         col = new TableColumn(2); // keep in sync with SaveLayersModel#columnActions
         col.setHeaderValue(tr("Actions To Take"));
         col.setResizable(true);
-        col.setCellRenderer(aftc);
-        col.setCellEditor(aftc);
+        col.setCellRenderer(new ActionFlagsTableCell());
+        col.setCellEditor(new ActionFlagsTableCell());
         col.setPreferredWidth(100);