Changeset 11534 in josm for trunk/src/org/openstreetmap/josm/gui/io
- Timestamp:
- 2017-02-04T14:47:39+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/io
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
r10611 r11534 40 40 private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this); 41 41 42 private final transient ActionListener al = e -> cellEditorSupport.fireEditingStopped();43 44 42 /** 45 43 * Constructs a new {@code ActionFlagsTableCell}. … … 50 48 setLayout(new GridBagLayout()); 51 49 50 ActionListener al = e -> cellEditorSupport.fireEditingStopped(); 52 51 ActionMap am = getActionMap(); 53 52 for (final JCheckBox b : checkBoxes) { -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r11457 r11534 527 527 private final ExecutorService worker; 528 528 private boolean canceled; 529 private Future<?> currentFuture;530 529 private AbstractIOTask currentTask; 531 530 … … 565 564 continue; 566 565 } 567 currentFuture = worker.submit(currentTask);566 Future<?> currentFuture = worker.submit(currentTask); 568 567 try { 569 568 // wait for the asynchronous task to complete 570 //571 569 currentFuture.get(); 572 570 } catch (CancellationException e) { … … 606 604 } 607 605 currentTask = new SaveLayerTask(layerInfo, monitor); 608 currentFuture = worker.submit(currentTask);606 Future<?> currentFuture = worker.submit(currentTask); 609 607 610 608 try { … … 632 630 } 633 631 this.currentTask = null; 634 this.currentFuture = null;635 632 } 636 633 }
Note:
See TracChangeset
for help on using the changeset viewer.