Changeset 11534 in josm
- Timestamp:
- 2017-02-04T14:47:39+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawSnapHelper.java
r11502 r11534 167 167 private static final class AnglePopupMenu extends JPopupMenu { 168 168 169 private final JCheckBoxMenuItem repeatedCb;170 private final JCheckBoxMenuItem helperCb;171 private final JCheckBoxMenuItem projectionCb;172 173 169 private AnglePopupMenu(final DrawSnapHelper snapHelper) { 174 repeatedCb = new JCheckBoxMenuItem(new RepeatedAction(snapHelper));175 helperCb = new JCheckBoxMenuItem(new HelperAction(snapHelper));176 projectionCb = new JCheckBoxMenuItem(new ProjectionAction(snapHelper));170 JCheckBoxMenuItem repeatedCb = new JCheckBoxMenuItem(new RepeatedAction(snapHelper)); 171 JCheckBoxMenuItem helperCb = new JCheckBoxMenuItem(new HelperAction(snapHelper)); 172 JCheckBoxMenuItem projectionCb = new JCheckBoxMenuItem(new ProjectionAction(snapHelper)); 177 173 178 174 helperCb.setState(DrawAction.DRAW_CONSTRUCTION_GEOMETRY.get()); -
trunk/src/org/openstreetmap/josm/gui/MapScaler.java
r10853 r11534 110 110 111 111 private final double dist100Pixel; 112 private final double lineDistance;113 112 /** 114 113 * Distance in meters between two ticks. … … 125 124 TickMarks(double dist100Pixel, int width) { 126 125 this.dist100Pixel = dist100Pixel; 127 lineDistance = dist100Pixel * width / 100;126 double lineDistance = dist100Pixel * width / 100; 128 127 129 128 double log10 = Math.log(lineDistance) / Math.log(10); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r10616 r11534 327 327 */ 328 328 class DownloadAllChildrenTask extends DownloadTask { 329 private final Relation relation;330 329 private final Stack<Relation> relationsToDownload; 331 330 private final Set<Long> downloadedRelationIds; … … 333 332 DownloadAllChildrenTask(Dialog parent, Relation r) { 334 333 super(tr("Download relation members"), parent); 335 this.relation = r;336 334 relationsToDownload = new Stack<>(); 337 335 downloadedRelationIds = new HashSet<>(); 338 relationsToDownload.push( this.relation);336 relationsToDownload.push(r); 339 337 } 340 338 -
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 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
r11035 r11534 64 64 setEnabled(enabled); 65 65 66 ChangeListener changeListener = e -> { 67 if (isEnabled()) applyFilterWithDelay(); 68 }; 69 66 70 dateFrom.addDateListener(changeListener); 67 71 dateTo.addDateListener(changeListener); 68 72 noTimestampCb.addChangeListener(changeListener); 69 73 } 70 71 private final transient ChangeListener changeListener = e -> {72 if (isEnabled()) applyFilterWithDelay();73 };74 74 75 75 private final Timer t = new Timer(200, e -> applyFilter());
Note:
See TracChangeset
for help on using the changeset viewer.