Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
- Timestamp:
- 2017-09-13T23:24:50+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r12841 r12846 38 38 import javax.swing.event.ListSelectionListener; 39 39 40 import org.openstreetmap.josm.Main;41 40 import org.openstreetmap.josm.actions.AbstractSelectAction; 42 41 import org.openstreetmap.josm.actions.AutoScaleAction; … … 58 57 import org.openstreetmap.josm.data.osm.event.DatasetEventManager; 59 58 import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode; 60 import org.openstreetmap.josm.data.osm.search.SearchSetting;61 59 import org.openstreetmap.josm.data.osm.event.NodeMovedEvent; 62 60 import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent; … … 66 64 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent; 67 65 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent; 66 import org.openstreetmap.josm.data.osm.search.SearchSetting; 68 67 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 69 68 import org.openstreetmap.josm.gui.MainApplication; … … 82 81 import org.openstreetmap.josm.gui.widgets.ListPopupMenu; 83 82 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher; 83 import org.openstreetmap.josm.spi.preferences.Config; 84 84 import org.openstreetmap.josm.tools.ImageProvider; 85 85 import org.openstreetmap.josm.tools.InputMapUtils; … … 192 192 class MouseEventHandler extends PopupMenuLauncher { 193 193 private final HighlightHelper helper = new HighlightHelper(); 194 private final boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true);194 private final boolean highlightEnabled = Config.getPref().getBoolean("draw.target-highlight", true); 195 195 196 196 MouseEventHandler() { … … 524 524 } 525 525 } 526 int maxsize = Main.pref.getInt("select.history-size", SELECTION_HISTORY_SIZE);526 int maxsize = Config.getPref().getInt("select.history-size", SELECTION_HISTORY_SIZE); 527 527 while (history.size() > maxsize) { 528 528 history.removeLast(); … … 662 662 */ 663 663 public synchronized void sort() { 664 if (selection.size() <= Main.pref.getInt("selection.no_sort_above", 100_000)) {665 boolean quick = selection.size() > Main.pref.getInt("selection.fast_sort_above", 10_000);666 Comparator<OsmPrimitive> c = Main.pref.getBoolean("selection.sort_relations_before_ways", true)664 if (selection.size() <= Config.getPref().getInt("selection.no_sort_above", 100_000)) { 665 boolean quick = selection.size() > Config.getPref().getInt("selection.fast_sort_above", 10_000); 666 Comparator<OsmPrimitive> c = Config.getPref().getBoolean("selection.sort_relations_before_ways", true) 667 667 ? OsmPrimitiveComparator.orderingRelationsWaysNodes() 668 668 : OsmPrimitiveComparator.orderingWaysRelationsNodes();
Note:
See TracChangeset
for help on using the changeset viewer.