Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2017-09-13T16:30:27+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 67 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
r11921 r12841 60 60 immediateChoices.get(prefKey), 61 61 sessionChoices.get(prefKey), 62 !Main.pref.getBoolean("message." + prefKey, true) ? Main.pref.getInt eger("message." + prefKey + ".value", -1) : -162 !Main.pref.getBoolean("message." + prefKey, true) ? Main.pref.getInt("message." + prefKey + ".value", -1) : -1 63 63 ); 64 64 } … … 239 239 break; 240 240 case PERMANENT: 241 Main.pref.put ("message." + prefKey, false);242 Main.pref.putInt eger("message." + prefKey + ".value", value);241 Main.pref.putBoolean("message." + prefKey, false); 242 Main.pref.putInt("message." + prefKey + ".value", value); 243 243 break; 244 244 } -
trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
r12620 r12841 95 95 String motd = new WikiReader().readLang("StartupPage"); 96 96 // Save this to prefs in case JOSM is updated so MOTD can be refreshed 97 Main.pref.putInt eger("cache.motd.html.version", myVersion);97 Main.pref.putInt("cache.motd.html.version", myVersion); 98 98 Main.pref.put("cache.motd.html.java", myJava); 99 99 Main.pref.put("cache.motd.html.lang", myLang); … … 115 115 // 2. Cannot be written (e.g. while developing). Obviously we don't want to update 116 116 // everytime because of something we can't read. 117 return (Main.pref.getInt eger("cache.motd.html.version", -999) == myVersion)117 return (Main.pref.getInt("cache.motd.html.version", -999) == myVersion) 118 118 && Main.pref.get("cache.motd.html.java").equals(myJava) 119 119 && Main.pref.get("cache.motd.html.lang").equals(myLang); -
trunk/src/org/openstreetmap/josm/gui/IconToggleButton.java
r11553 r12841 120 120 Main.pref.put(getPreferenceKey(), null); 121 121 } else { 122 Main.pref.put (getPreferenceKey(), b);122 Main.pref.putBoolean(getPreferenceKey(), b); 123 123 } 124 124 } -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r12828 r12841 1252 1252 if (wasv6 && !hasv6) { 1253 1253 Logging.info(tr("Detected no useable IPv6 network, prefering IPv4 over IPv6 after next restart.")); 1254 Main.pref.put ("validated.ipv6", hasv6); // be sure it is stored before the restart!1254 Main.pref.putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart! 1255 1255 try { 1256 1256 RestartAction.restartJOSM(); … … 1259 1259 } 1260 1260 } 1261 Main.pref.put ("validated.ipv6", hasv6);1261 Main.pref.putBoolean("validated.ipv6", hasv6); 1262 1262 }, "IPv6-checker").start(); 1263 1263 } -
trunk/src/org/openstreetmap/josm/gui/MainFrame.java
r12678 r12841 110 110 geometry.remember("gui.geometry"); 111 111 } 112 Main.pref.put ("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);112 Main.pref.putBoolean("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0); 113 113 } 114 114 -
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r12636 r12841 583 583 public void actionPerformed(ActionEvent e) { 584 584 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState(); 585 Main.pref.put ("sidetoolbar.always-visible", sel);585 Main.pref.putBoolean("sidetoolbar.always-visible", sel); 586 586 } 587 587 }); … … 625 625 @Override 626 626 public void actionPerformed(ActionEvent e) { 627 Main.pref.put ("sidetoolbar.visible", false);627 Main.pref.putBoolean("sidetoolbar.visible", false); 628 628 } 629 629 }); -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r12735 r12841 775 775 public void actionPerformed(ActionEvent e) { 776 776 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState(); 777 Main.pref.put ("statusbar.always-visible", sel);777 Main.pref.putBoolean("statusbar.always-visible", sel); 778 778 } 779 779 }); … … 1079 1079 // Compute total length of selected way(s) until an arbitrary limit set to 250 ways 1080 1080 // in order to prevent performance issue if a large number of ways are selected (old behaviour kept in that case, see #8403) 1081 int maxWays = Math.max(1, Main.pref.getInt eger("selection.max-ways-for-statusline", 250));1081 int maxWays = Math.max(1, Main.pref.getInt("selection.max-ways-for-statusline", 250)); 1082 1082 if (!ways.isEmpty() && ways.size() <= maxWays) { 1083 1083 dist = 0.0; -
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r12778 r12841 871 871 if ((now.getTime() - zoomTimestamp.getTime()) > (Main.pref.getDouble("zoom.undo.delay", 1.0) * 1000)) { 872 872 zoomUndoBuffer.push(new ZoomData(center, scale)); 873 if (zoomUndoBuffer.size() > Main.pref.getInt eger("zoom.undo.max", 50)) {873 if (zoomUndoBuffer.size() > Main.pref.getInt("zoom.undo.max", 50)) { 874 874 zoomUndoBuffer.remove(0); 875 875 } … … 1144 1144 1145 1145 if (ds != null) { 1146 double snapDistanceSq = Main.pref.getInt eger("mappaint.segment.snap-distance", 10);1146 double snapDistanceSq = Main.pref.getInt("mappaint.segment.snap-distance", 10); 1147 1147 snapDistanceSq *= snapDistanceSq; 1148 1148 1149 for (Way w : ds.searchWays(getBBox(p, Main.pref.getInt eger("mappaint.segment.snap-distance", 10)))) {1149 for (Way w : ds.searchWays(getBBox(p, Main.pref.getInt("mappaint.segment.snap-distance", 10)))) { 1150 1150 if (!predicate.test(w)) { 1151 1151 continue; -
trunk/src/org/openstreetmap/josm/gui/Notification.java
r11100 r12841 43 43 * E.g. "Please select at least one node". 44 44 */ 45 public static final int TIME_SHORT = Main.pref.getInt eger("notification-time-short-ms", 3000);45 public static final int TIME_SHORT = Main.pref.getInt("notification-time-short-ms", 3000); 46 46 47 47 /** 48 48 * Short message of one or two lines (5 s). 49 49 */ 50 public static final int TIME_DEFAULT = Main.pref.getInt eger("notification-time-default-ms", 5000);50 public static final int TIME_DEFAULT = Main.pref.getInt("notification-time-default-ms", 5000); 51 51 52 52 /** 53 53 * Somewhat longer message (10 s). 54 54 */ 55 public static final int TIME_LONG = Main.pref.getInt eger("notification-time-long-ms", 10_000);55 public static final int TIME_LONG = Main.pref.getInt("notification-time-long-ms", 10_000); 56 56 57 57 /** … … 59 59 * (Make sure is still sensible to show as a notification) 60 60 */ 61 public static final int TIME_VERY_LONG = Main.pref.getInt eger("notification-time-very_long-ms", 20_000);61 public static final int TIME_VERY_LONG = Main.pref.getInt("notification-time-very_long-ms", 20_000); 62 62 63 63 private Component content; -
trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
r12675 r12841 82 82 int w = getWidth(); 83 83 if (w > 200) { 84 Main.pref.putInt eger("progressdialog.size", w);84 Main.pref.putInt("progressdialog.size", w); 85 85 } 86 86 } … … 98 98 setDropTarget(null); // Workaround to JDK bug 7027598/7100524/7169912 (#8613) 99 99 pack(); 100 setSize(Main.pref.getInt eger("progressdialog.size", 600), getSize().height);100 setSize(Main.pref.getInt("progressdialog.size", 600), getSize().height); 101 101 } 102 102 -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
r12620 r12841 162 162 setFileCacheEnabled(Main.pref.getBoolean("slippy_map_chooser.file_cache", true)); 163 163 } 164 setMaxTilesInMemory(Main.pref.getInt eger("slippy_map_chooser.max_tiles", 1000));164 setMaxTilesInMemory(Main.pref.getInt("slippy_map_chooser.max_tiles", 1000)); 165 165 166 166 List<TileSource> tileSources = getAllTileSources(); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
r11772 r12841 78 78 */ 79 79 public void rememberPreferences() { 80 Main.pref.put (getClass().getName() + ".showTagsWithConflictsOnly", cbShowTagsWithConflictsOnly.isSelected());81 Main.pref.put (getClass().getName() + ".showTagsWithMultiValuesOnly", cbShowTagsWithMultiValuesOnly.isSelected());80 Main.pref.putBoolean(getClass().getName() + ".showTagsWithConflictsOnly", cbShowTagsWithConflictsOnly.isSelected()); 81 Main.pref.putBoolean(getClass().getName() + ".showTagsWithMultiValuesOnly", cbShowTagsWithMultiValuesOnly.isSelected()); 82 82 } 83 83 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r12636 r12841 275 275 @Override 276 276 public void itemStateChanged(ItemEvent e) { 277 Main.pref.put ("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected());277 Main.pref.putBoolean("changeset-dialog.for-selected-objects-only", cbInSelectionOnly.isSelected()); 278 278 pnlList.removeAll(); 279 279 if (cbInSelectionOnly.isSelected()) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java
r12301 r12841 180 180 protected void restorePrimitivesHistory(HistoryComboBox cbHistory) { 181 181 List<String> cmtHistory = new LinkedList<>( 182 Main.pref.get Collection(getClass().getName() + ".primitivesHistory", new LinkedList<String>()));182 Main.pref.getList(getClass().getName() + ".primitivesHistory", new LinkedList<String>())); 183 183 // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement() 184 184 Collections.reverse(cmtHistory); … … 193 193 protected void remindPrimitivesHistory(HistoryComboBox cbHistory) { 194 194 cbHistory.addCurrentItemToHistory(); 195 Main.pref.put Collection(getClass().getName() + ".primitivesHistory", cbHistory.getHistory());195 Main.pref.putList(getClass().getName() + ".primitivesHistory", cbHistory.getHistory()); 196 196 } 197 197 … … 208 208 public void setupDialog() { 209 209 setContent(panel, false); 210 cbType.setSelectedIndex(Main.pref.getInt eger("downloadprimitive.lasttype", 0));210 cbType.setSelectedIndex(Main.pref.getInt("downloadprimitive.lasttype", 0)); 211 211 tfId.setType(cbType.getType()); 212 212 if (Main.pref.getBoolean("downloadprimitive.autopaste", true)) { … … 221 221 String buf = ClipboardUtils.getClipboardStringContent(); 222 222 if (buf == null || buf.isEmpty()) return; 223 if (buf.length() > Main.pref.getInt eger("downloadprimitive.max-autopaste-length", 2000)) return;223 if (buf.length() > Main.pref.getInt("downloadprimitive.max-autopaste-length", 2000)) return; 224 224 final List<SimplePrimitiveId> ids = SimplePrimitiveId.fuzzyParse(buf); 225 225 if (!ids.isEmpty()) { … … 244 244 @Override public void windowClosed(WindowEvent e) { 245 245 if (e != null && e.getComponent() == this && getValue() == getContinueButtonIndex()) { 246 Main.pref.putInt eger("downloadprimitive.lasttype", cbType.getSelectedIndex());246 Main.pref.putInt("downloadprimitive.lasttype", cbType.getSelectedIndex()); 247 247 248 248 if (!tfId.readIds()) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r12663 r12841 524 524 } 525 525 } 526 int maxsize = Main.pref.getInt eger("select.history-size", SELECTION_HISTORY_SIZE);526 int maxsize = Main.pref.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 eger("selection.no_sort_above", 100_000)) {665 boolean quick = selection.size() > Main.pref.getInt eger("selection.fast_sort_above", 10_000);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 666 Comparator<OsmPrimitive> c = Main.pref.getBoolean("selection.sort_relations_before_ways", true) 667 667 ? OsmPrimitiveComparator.orderingRelationsWaysNodes() -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r12678 r12841 773 773 protected void setIsShowing(boolean val) { 774 774 isShowing = val; 775 Main.pref.put (preferencePrefix+".visible", val);775 Main.pref.putBoolean(preferencePrefix+".visible", val); 776 776 stateChanged(); 777 777 } … … 782 782 } 783 783 isDocked = val; 784 Main.pref.put (preferencePrefix+".docked", val);784 Main.pref.putBoolean(preferencePrefix+".docked", val); 785 785 stateChanged(); 786 786 } … … 788 788 protected void setIsCollapsed(boolean val) { 789 789 isCollapsed = val; 790 Main.pref.put (preferencePrefix+".minimized", val);790 Main.pref.putBoolean(preferencePrefix+".minimized", val); 791 791 stateChanged(); 792 792 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
r11326 r12841 209 209 */ 210 210 public void rememberSettings() { 211 Main.pref.put ("changeset-query.advanced.user-restrictions", cbUserRestriction.isSelected());212 Main.pref.put ("changeset-query.advanced.open-restrictions", cbOpenAndCloseRestrictions.isSelected());213 Main.pref.put ("changeset-query.advanced.time-restrictions", cbTimeRestrictions.isSelected());214 Main.pref.put ("changeset-query.advanced.bbox-restrictions", cbBoundingBoxRestriction.isSelected());211 Main.pref.putBoolean("changeset-query.advanced.user-restrictions", cbUserRestriction.isSelected()); 212 Main.pref.putBoolean("changeset-query.advanced.open-restrictions", cbOpenAndCloseRestrictions.isSelected()); 213 Main.pref.putBoolean("changeset-query.advanced.time-restrictions", cbTimeRestrictions.isSelected()); 214 Main.pref.putBoolean("changeset-query.advanced.bbox-restrictions", cbBoundingBoxRestriction.isSelected()); 215 215 216 216 pnlUserRestriction.rememberSettings(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
r12743 r12841 191 191 Main.pref.put("changeset-query.basic.query", q.toString()); 192 192 } 193 Main.pref.put ("changeset-query.basic.my-changesets-only", cbMyChangesetsOnly.isSelected());193 Main.pref.putBoolean("changeset-query.basic.my-changesets-only", cbMyChangesetsOnly.isSelected()); 194 194 } 195 195 -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/RecentTagCollection.java
r12659 r12841 12 12 import org.openstreetmap.josm.data.osm.search.SearchSetting; 13 13 import org.openstreetmap.josm.data.osm.search.SearchCompiler; 14 import org.openstreetmap.josm.data.preferences. CollectionProperty;14 import org.openstreetmap.josm.data.preferences.ListProperty; 15 15 16 16 /** … … 44 44 } 45 45 46 public void loadFromPreference( CollectionProperty property) {46 public void loadFromPreference(ListProperty property) { 47 47 recentTags.clear(); 48 48 Iterator<String> it = property.get().iterator(); … … 54 54 } 55 55 56 public void saveToPreference( CollectionProperty property) {56 public void saveToPreference(ListProperty property) { 57 57 List<String> c = new ArrayList<>(recentTags.size() * 2); 58 58 for (Tag t : recentTags.keySet()) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r12758 r12841 73 73 import org.openstreetmap.josm.data.osm.search.SearchSetting; 74 74 import org.openstreetmap.josm.data.preferences.BooleanProperty; 75 import org.openstreetmap.josm.data.preferences. CollectionProperty;75 import org.openstreetmap.josm.data.preferences.ListProperty; 76 76 import org.openstreetmap.josm.data.preferences.EnumProperty; 77 77 import org.openstreetmap.josm.data.preferences.IntegerProperty; … … 128 128 DEFAULT_LRU_TAGS_NUMBER); 129 129 /** The preference storage of recent tags */ 130 public static final CollectionProperty PROPERTY_RECENT_TAGS = new CollectionProperty("properties.recent-tags",130 public static final ListProperty PROPERTY_RECENT_TAGS = new ListProperty("properties.recent-tags", 131 131 Collections.<String>emptyList()); 132 132 public static final StringProperty PROPERTY_TAGS_TO_IGNORE = new StringProperty("properties.recent-tags.ignore", -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java
r12743 r12841 300 300 */ 301 301 public final void save() { 302 List< Collection<String>> coll = new LinkedList<>();302 List<List<String>> coll = new LinkedList<>(); 303 303 for (Object o : ((DefaultListModel<Bookmark>) getModel()).toArray()) { 304 304 if (o instanceof HomeLocationBookmark || o instanceof ChangesetBookmark) { … … 315 315 coll.add(Arrays.asList(array)); 316 316 } 317 Main.pref.put Array("bookmarks", coll);317 Main.pref.putListOfLists("bookmarks", coll); 318 318 } 319 319 -
trunk/src/org/openstreetmap/josm/gui/download/DownloadObjectDialog.java
r12279 r12841 103 103 super.windowClosed(e); 104 104 if (e != null && e.getComponent() == this && getValue() == 1) { 105 Main.pref.put ("downloadprimitive.referrers", referrers.isSelected());106 Main.pref.put ("downloadprimitive.full", fullRel.isSelected());107 Main.pref.put ("download.newlayer", newLayer.isSelected());105 Main.pref.putBoolean("downloadprimitive.referrers", referrers.isSelected()); 106 Main.pref.putBoolean("downloadprimitive.full", fullRel.isSelected()); 107 Main.pref.putBoolean("download.newlayer", newLayer.isSelected()); 108 108 } 109 109 } -
trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryList.java
r12620 r12841 244 244 */ 245 245 private void savePreferences() { 246 Collection<Map<String, String>> toSave = new ArrayList<>(this.items.size());246 List<Map<String, String>> toSave = new ArrayList<>(this.items.size()); 247 247 for (SelectorItem item : this.items.values()) { 248 248 Map<String, String> it = new HashMap<>(); … … 254 254 } 255 255 256 Main.pref.putListOf Structs(PREFERENCE_ITEMS, toSave);256 Main.pref.putListOfMaps(PREFERENCE_ITEMS, toSave); 257 257 } 258 258 … … 263 263 private static Map<String, SelectorItem> restorePreferences() { 264 264 Collection<Map<String, String>> toRetrieve = 265 Main.pref.getListOf Structs(PREFERENCE_ITEMS, Collections.emptyList());265 Main.pref.getListOfMaps(PREFERENCE_ITEMS, Collections.emptyList()); 266 266 Map<String, SelectorItem> result = new HashMap<>(); 267 267 -
trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java
r12655 r12841 20 20 21 21 import org.openstreetmap.josm.Main; 22 import org.openstreetmap.josm.data.preferences. CollectionProperty;22 import org.openstreetmap.josm.data.preferences.ListProperty; 23 23 import org.openstreetmap.josm.gui.ExtendedDialog; 24 24 import org.openstreetmap.josm.gui.util.GuiHelper; … … 47 47 private static final String SPAN_START = "<span>"; 48 48 private static final String SPAN_END = "</span>"; 49 private static final CollectionProperty OVERPASS_WIZARD_HISTORY =50 new CollectionProperty("download.overpass.wizard", new ArrayList<String>());49 private static final ListProperty OVERPASS_WIZARD_HISTORY = 50 new ListProperty("download.overpass.wizard", new ArrayList<String>()); 51 51 private final transient OverpassTurboQueryWizard overpassQueryBuilder; 52 52 -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r12634 r12841 115 115 cbSearchExpression = new HistoryComboBox(); 116 116 cbSearchExpression.setToolTipText(tr("Enter a place name to search for")); 117 List<String> cmtHistory = new LinkedList<>(Main.pref.get Collection(HISTORY_KEY, new LinkedList<String>()));117 List<String> cmtHistory = new LinkedList<>(Main.pref.getList(HISTORY_KEY, new LinkedList<String>())); 118 118 Collections.reverse(cmtHistory); 119 119 cbSearchExpression.setPossibleItems(cmtHistory); … … 189 189 return; 190 190 cbSearchExpression.addCurrentItemToHistory(); 191 Main.pref.put Collection(HISTORY_KEY, cbSearchExpression.getHistory());191 Main.pref.putList(HISTORY_KEY, cbSearchExpression.getHistory()); 192 192 NameQueryTask task = new NameQueryTask(cbSearchExpression.getText()); 193 193 MainApplication.worker.submit(task); -
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r11646 r12841 341 341 Object val = tbl.getColumnModel().getColumn(col).getHeaderValue(); 342 342 Component comp = tcr.getTableCellRendererComponent(tbl, val, false, false, -1, col); 343 maxwidth = Math.max(comp.getPreferredSize().width + Main.pref.getInt eger("table.header-inset", 0), maxwidth);343 maxwidth = Math.max(comp.getPreferredSize().width + Main.pref.getInt("table.header-inset", 0), maxwidth); 344 344 345 345 int spacing = tbl.getIntercellSpacing().width; -
trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java
r12719 r12841 78 78 hcbUploadComment.setToolTipText(tr("Enter an upload comment")); 79 79 hcbUploadComment.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH); 80 List<String> cmtHistory = new LinkedList<>(Main.pref.get Collection(HISTORY_KEY, new LinkedList<String>()));80 List<String> cmtHistory = new LinkedList<>(Main.pref.getList(HISTORY_KEY, new LinkedList<String>())); 81 81 Collections.reverse(cmtHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement() 82 82 hcbUploadComment.setPossibleItems(cmtHistory); … … 100 100 hcbUploadSource.setToolTipText(tr("Enter a source")); 101 101 hcbUploadSource.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH); 102 List<String> sourceHistory = new LinkedList<>(Main.pref.get Collection(SOURCE_HISTORY_KEY, getDefaultSources()));102 List<String> sourceHistory = new LinkedList<>(Main.pref.getList(SOURCE_HISTORY_KEY, getDefaultSources())); 103 103 Collections.reverse(sourceHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement() 104 104 hcbUploadSource.setPossibleItems(sourceHistory); … … 166 166 // store the history of comments 167 167 hcbUploadComment.addCurrentItemToHistory(); 168 Main.pref.put Collection(HISTORY_KEY, hcbUploadComment.getHistory());169 Main.pref.putInt eger(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));168 Main.pref.putList(HISTORY_KEY, hcbUploadComment.getHistory()); 169 Main.pref.putInt(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()))); 170 170 // store the history of sources 171 171 hcbUploadSource.addCurrentItemToHistory(); 172 Main.pref.put Collection(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());172 Main.pref.putList(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory()); 173 173 } 174 174 -
trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
r12634 r12841 256 256 case ItemEvent.SELECTED: 257 257 firePropertyChange(CLOSE_CHANGESET_AFTER_UPLOAD, false, true); 258 Main.pref.put ("upload.changeset.close", true);258 Main.pref.putBoolean("upload.changeset.close", true); 259 259 break; 260 260 case ItemEvent.DESELECTED: 261 261 firePropertyChange(CLOSE_CHANGESET_AFTER_UPLOAD, true, false); 262 Main.pref.put ("upload.changeset.close", false);262 Main.pref.putBoolean("upload.changeset.close", false); 263 263 break; 264 264 default: // Do nothing -
trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java
r12826 r12841 400 400 MainApplication.worker.submit(pluginDownloadTask); 401 401 } 402 Collection<String> pls = new ArrayList<>(Main.pref.getCollection("plugins"));402 List<String> pls = new ArrayList<>(Main.pref.getList("plugins")); 403 403 for (PluginInformation pi2: toInstallPlugins) { 404 404 if (!pls.contains(pi2.name)) { … … 413 413 new File(Main.pref.getPluginsDirectory(), pi4.name+".jar").deleteOnExit(); 414 414 } 415 Main.pref.put Collection("plugins", pls);415 Main.pref.putList("plugins", pls); 416 416 }); 417 417 } -
trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
r12634 r12841 58 58 private void rebuild() { 59 59 removeAll(); 60 Collection<String> fileHistory = Main.pref.get Collection("file-open.history");60 Collection<String> fileHistory = Main.pref.getList("file-open.history"); 61 61 62 62 for (final String file : fileHistory) { … … 101 101 @Override 102 102 public void actionPerformed(ActionEvent e) { 103 Main.pref.put Collection("file-open.history", null);103 Main.pref.putList("file-open.history", null); 104 104 } 105 105 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r12799 r12841 653 653 654 654 private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) { 655 Collection<String> history = Main.pref.get Collection(historyKey, def);656 int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInt eger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));655 Collection<String> history = Main.pref.getList(historyKey, def); 656 int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInt(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0)); 657 657 if (history != null && age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4)) 658 658 && !history.isEmpty()) { -
trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java
r12687 r12841 323 323 UploadStrategy strategy = UploadStrategy.getFromPreferences(); 324 324 rbStrategy.get(strategy).setSelected(true); 325 int chunkSize = Main.pref.getInt eger("osm-server.upload-strategy.chunk-size", 1);325 int chunkSize = Main.pref.getInt("osm-server.upload-strategy.chunk-size", 1); 326 326 tfChunkSize.setText(Integer.toString(chunkSize)); 327 327 updateNumRequestsLabels(); … … 337 337 try { 338 338 chunkSize = Integer.parseInt(tfChunkSize.getText().trim()); 339 Main.pref.putInt eger("osm-server.upload-strategy.chunk-size", chunkSize);339 Main.pref.putInt("osm-server.upload-strategy.chunk-size", chunkSize); 340 340 } catch (NumberFormatException e) { 341 341 // don't save invalid value to preferences -
trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java
r12671 r12841 162 162 setCanceled(false); 163 163 164 Main.pref.put ("lastAddAuthor", author.isSelected());164 Main.pref.putBoolean("lastAddAuthor", author.isSelected()); 165 165 if (!authorName.getText().isEmpty()) { 166 166 Main.pref.put("lastAuthorName", authorName.getText()); -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r12671 r12841 174 174 Main.pref.put("geoimage.timezone", timezone.formatTimezone()); 175 175 Main.pref.put("geoimage.delta", delta.formatOffset()); 176 Main.pref.put ("geoimage.showThumbs", yLayer.useThumbs);176 Main.pref.putBoolean("geoimage.showThumbs", yLayer.useThumbs); 177 177 178 178 yLayer.useThumbs = cbShowThumbs.isSelected(); -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
r12636 r12841 119 119 for (Marker marker : layer.data) { 120 120 final Node node = new Node(marker.getCoor()); 121 final Collection<String> mapping = Main.pref.get Collection("gpx.to-osm-mapping", Arrays.asList(121 final Collection<String> mapping = Main.pref.getList("gpx.to-osm-mapping", Arrays.asList( 122 122 GpxConstants.GPX_NAME, "name", 123 123 GpxConstants.GPX_DESC, "description", -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
r12377 r12841 105 105 Main.pref.putLong(prefDateMin, dateFrom.getDate().getTime()); 106 106 Main.pref.putLong(prefDateMax, dateTo.getDate().getTime()); 107 Main.pref.put (prefDate0, noTimestampCb.isSelected());107 Main.pref.putBoolean(prefDate0, noTimestampCb.isSelected()); 108 108 } 109 109 -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
r10611 r12841 85 85 add(new JLabel(tr("Download near:")), GBC.eol()); 86 86 downloadNear = new JList<>(new String[]{tr("track only"), tr("waypoints only"), tr("track and waypoints")}); 87 downloadNear.setSelectedIndex(Main.pref.getInt eger(prefNear, 0));87 downloadNear.setSelectedIndex(Main.pref.getInt(prefNear, 0)); 88 88 add(downloadNear, GBC.eol()); 89 89 } else { … … 138 138 */ 139 139 protected final void rememberSettings() { 140 Main.pref.put (prefOsm, isDownloadOsmData());141 Main.pref.put (prefGps, isDownloadGpxData());140 Main.pref.putBoolean(prefOsm, isDownloadOsmData()); 141 Main.pref.putBoolean(prefGps, isDownloadGpxData()); 142 142 Main.pref.putDouble(prefDist, getDistance()); 143 143 Main.pref.putDouble(prefArea, getArea()); 144 144 if (prefNear != null) { 145 Main.pref.putInt eger(prefNear, getNear());145 Main.pref.putInt(prefNear, getNear()); 146 146 } 147 147 } -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
r12725 r12841 183 183 184 184 private void setupColors() { 185 hdopAlpha = Main.pref.getInt eger("hdop.color.alpha", -1);185 hdopAlpha = Main.pref.getInt("hdop.color.alpha", -1); 186 186 velocityScale = ColorScale.createHSBScale(256); 187 187 /** Colors (without custom alpha channel, if given) for HDOP painting. **/ … … 320 320 colorModeDynamic = Main.pref.getBoolean("draw.rawgps.colors.dynamic", spec, false); 321 321 /* good HDOP's are between 1 and 3, very bad HDOP's go into 3 digit values */ 322 hdoprange = Main.pref.getInt eger("hdop.range", 7);323 minTrackDurationForTimeColoring = Main.pref.getInt eger("draw.rawgps.date-coloring-min-dt", 60);324 largePointAlpha = Main.pref.getInt eger("draw.rawgps.large.alpha", -1) & 0xFF;322 hdoprange = Main.pref.getInt("hdop.range", 7); 323 minTrackDurationForTimeColoring = Main.pref.getInt("draw.rawgps.date-coloring-min-dt", 60); 324 largePointAlpha = Main.pref.getInt("draw.rawgps.large.alpha", -1) & 0xFF; 325 325 326 326 // get heatmap parameters -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
r12669 r12841 159 159 160 160 ImageWarp.PointTransform transform; 161 int stride = Main.pref.getInt eger("imagery.warp.projection-interpolation.stride", 7);161 int stride = Main.pref.getInt("imagery.warp.projection-interpolation.stride", 7); 162 162 if (stride > 0) { 163 163 transform = new ImageWarp.GridTransform(pointTransform, stride); -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java
r12725 r12841 64 64 enabled = Main.pref.getBoolean("marker.traceaudio", true); 65 65 if (!enabled) return; 66 dropTolerance = Main.pref.getInt eger("marker.playHeadDropTolerance", 50);66 dropTolerance = Main.pref.getInt("marker.playHeadDropTolerance", 50); 67 67 if (MainApplication.isDisplayingMapView()) { 68 68 MapFrame map = MainApplication.getMap(); -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
r12825 r12841 256 256 } 257 257 258 Collection<String> prefIconDirs = Main.pref.get Collection("mappaint.icon.sources");258 Collection<String> prefIconDirs = Main.pref.getList("mappaint.icon.sources"); 259 259 for (String fileset : prefIconDirs) { 260 260 String[] a; -
trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java
r12831 r12841 79 79 Main.pref.put(prefKey, null); 80 80 } else { 81 Main.pref.put (prefKey, b);81 Main.pref.putBoolean(prefKey, b); 82 82 } 83 83 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java
r12722 r12841 90 90 ); 91 91 92 fillImage.alpha = Utils.clamp(Main.pref.getInt eger("mappaint.fill-image-alpha", 255), 0, 255);92 fillImage.alpha = Utils.clamp(Main.pref.getInt("mappaint.fill-image-alpha", 255), 0, 255); 93 93 Integer pAlpha = Utils.colorFloat2int(c.get(FILL_OPACITY, null, float.class)); 94 94 if (pAlpha != null) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java
r11615 r12841 238 238 } else { 239 239 this.nameTags = new ArrayList<>( 240 Main.pref.get Collection("mappaint.nameOrder", Arrays.asList(DEFAULT_NAME_TAGS))240 Main.pref.getList("mappaint.nameOrder", Arrays.asList(DEFAULT_NAME_TAGS)) 241 241 ); 242 242 this.nameComplementTags = new ArrayList<>( 243 Main.pref.get Collection("mappaint.nameComplementOrder", Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS))243 Main.pref.getList("mappaint.nameComplementOrder", Arrays.asList(DEFAULT_NAME_COMPLEMENT_TAGS)) 244 244 ); 245 245 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
r12756 r12841 196 196 mapImage.offsetY = Math.round(offsetYF); 197 197 198 mapImage.alpha = Utils.clamp(Main.pref.getInt eger("mappaint.icon-image-alpha", 255), 0, 255);198 mapImage.alpha = Utils.clamp(Main.pref.getInt("mappaint.icon-image-alpha", 255), 0, 255); 199 199 Integer pAlpha = Utils.colorFloat2int(c.get(keys[ICON_OPACITY_IDX], null, float.class)); 200 200 if (pAlpha != null) { … … 357 357 // However, it would be better, if the settings could be changed at runtime. 358 358 int size = max( 359 Main.pref.getInt eger("mappaint.node.selected-size", 5),360 Main.pref.getInt eger("mappaint.node.unselected-size", 3),361 Main.pref.getInt eger("mappaint.node.connection-size", 5),362 Main.pref.getInt eger("mappaint.node.tagged-size", 3)359 Main.pref.getInt("mappaint.node.selected-size", 5), 360 Main.pref.getInt("mappaint.node.unselected-size", 3), 361 Main.pref.getInt("mappaint.node.connection-size", 5), 362 Main.pref.getInt("mappaint.node.tagged-size", 3) 363 363 ); 364 364 return new SimpleBoxProvider(new Rectangle(-size/2, -size/2, size, size)); -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
r12539 r12841 148 148 s = defaultFontSize; 149 149 if (s == null) { 150 defaultFontSize = s = (float) Main.pref.getInt eger("mappaint.fontsize", 8);150 defaultFontSize = s = (float) Main.pref.getInt("mappaint.fontsize", 8); 151 151 } 152 152 } -
trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
r10268 r12841 281 281 public void rememberPreferences(Preferences pref) { 282 282 CheckParameterUtil.ensureParameterNotNull(pref, "pref"); 283 pref.put ("oauth.settings.use-default", cbUseDefaults.isSelected());283 pref.putBoolean("oauth.settings.use-default", cbUseDefaults.isSelected()); 284 284 if (cbUseDefaults.isSelected()) { 285 285 new OAuthParameters(null, null, null, null, null, null, null).rememberPreferences(pref); -
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
r12825 r12841 423 423 424 424 if (!iconPaths.isEmpty()) { 425 if (Main.pref.put Collection(iconPref, iconPaths)) {425 if (Main.pref.putList(iconPref, iconPaths)) { 426 426 changed = true; 427 427 } 428 } else if (Main.pref.put Collection(iconPref, null)) {428 } else if (Main.pref.putList(iconPref, null)) { 429 429 changed = true; 430 430 } -
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r12643 r12841 496 496 @Override 497 497 public void actionPerformed(ActionEvent e) { 498 Collection<String> t = new LinkedList<>(getToolString());498 List<String> t = new LinkedList<>(getToolString()); 499 499 ActionParser parser = new ActionParser(null); 500 500 // get text definition of current action … … 502 502 // remove the button from toolbar preferences 503 503 t.remove(res); 504 Main.pref.put Collection("toolbar", t);504 Main.pref.putList("toolbar", t); 505 505 MainApplication.getToolbar().refreshToolbarControl(); 506 506 } … … 532 532 public void actionPerformed(ActionEvent e) { 533 533 boolean sel = ((JCheckBoxMenuItem) e.getSource()).getState(); 534 Main.pref.put ("toolbar.always-visible", sel);535 Main.pref.put ("menu.always-visible", sel);534 Main.pref.putBoolean("toolbar.always-visible", sel); 535 Main.pref.putBoolean("menu.always-visible", sel); 536 536 } 537 537 }); … … 971 971 @Override 972 972 public boolean ok() { 973 Collection<String> t = new LinkedList<>();973 List<String> t = new LinkedList<>(); 974 974 ActionParser parser = new ActionParser(null); 975 975 for (int i = 0; i < selected.size(); ++i) { … … 987 987 t = Collections.singletonList(EMPTY_TOOLBAR_MARKER); 988 988 } 989 Main.pref.put Collection("toolbar", t);989 Main.pref.putList("toolbar", t); 990 990 MainApplication.getToolbar().refreshToolbarControl(); 991 991 return false; … … 1074 1074 public static Collection<String> getToolString() { 1075 1075 1076 Collection<String> toolStr = Main.pref.get Collection("toolbar", Arrays.asList(deftoolbar));1076 Collection<String> toolStr = Main.pref.getList("toolbar", Arrays.asList(deftoolbar)); 1077 1077 if (toolStr == null || toolStr.isEmpty()) { 1078 1078 toolStr = Arrays.asList(deftoolbar); … … 1214 1214 } 1215 1215 } 1216 Main.pref.put Collection("toolbar", t);1216 Main.pref.putList("toolbar", t); 1217 1217 MainApplication.getToolbar().refreshToolbarControl(); 1218 1218 } -
trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java
r9778 r12841 133 133 @Override 134 134 public boolean ok() { 135 Main.pref.put ("audio.menuinvisible", !audioMenuVisible.isSelected());136 Main.pref.put ("marker.traceaudio", markerAudioTraceVisible.isSelected());137 Main.pref.put ("marker.buttonlabels", markerButtonLabels.isSelected());138 Main.pref.put ("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected());139 Main.pref.put ("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected());140 Main.pref.put ("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected());141 Main.pref.put ("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected());142 Main.pref.put ("marker.audiofromstart", audioMarkersFromStart.isSelected());135 Main.pref.putBoolean("audio.menuinvisible", !audioMenuVisible.isSelected()); 136 Main.pref.putBoolean("marker.traceaudio", markerAudioTraceVisible.isSelected()); 137 Main.pref.putBoolean("marker.buttonlabels", markerButtonLabels.isSelected()); 138 Main.pref.putBoolean("marker.audiofromexplicitwaypoints", audioMarkersFromExplicitWaypoints.isSelected()); 139 Main.pref.putBoolean("marker.audiofromuntimedwaypoints", audioMarkersFromUntimedWaypoints.isSelected()); 140 Main.pref.putBoolean("marker.audiofromnamedtrackpoints", audioMarkersFromNamedTrackpoints.isSelected()); 141 Main.pref.putBoolean("marker.audiofromwavtimestamps", audioMarkersFromWavTimestamps.isSelected()); 142 Main.pref.putBoolean("marker.audiofromstart", audioMarkersFromStart.isSelected()); 143 143 Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText()); 144 144 Main.pref.put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText()); -
trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java
r12400 r12841 109 109 // virtual nodes 110 110 virtualNodes.setToolTipText(tr("Draw virtual nodes in select mode for easy way modification.")); 111 virtualNodes.setSelected(Main.pref.getInt eger("mappaint.node.virtual-size", 8) != 0);111 virtualNodes.setSelected(Main.pref.getInt("mappaint.node.virtual-size", 8) != 0); 112 112 113 113 // background layers in inactive color … … 195 195 public boolean ok() { 196 196 boolean restart = gpxPanel.savePreferences(); 197 Main.pref.put ("draw.data.area_outline_only", outlineOnly.isSelected());198 Main.pref.put ("draw.segment.direction", directionHint.isSelected());199 Main.pref.put ("draw.segment.head_only", headArrow.isSelected());200 Main.pref.put ("draw.oneway", onewayArrow.isSelected());201 Main.pref.put ("draw.segment.order_number", segmentOrderNumber.isSelected());202 Main.pref.put ("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected());203 Main.pref.put ("draw.data.downloaded_area", sourceBounds.isSelected());204 Main.pref.put ("draw.data.inactive_color", inactive.isSelected());205 Main.pref.put ("mappaint.use-antialiasing", useAntialiasing.isSelected());206 Main.pref.put ("mappaint.wireframe.use-antialiasing", useWireframeAntialiasing.isSelected());207 Main.pref.put ("draw.target-highlight", useHighlighting.isSelected());208 Main.pref.put ("draw.helper-line", drawHelperLine.isSelected());209 Main.pref.put ("display.discardable-keys", discardableKeys.isSelected());197 Main.pref.putBoolean("draw.data.area_outline_only", outlineOnly.isSelected()); 198 Main.pref.putBoolean("draw.segment.direction", directionHint.isSelected()); 199 Main.pref.putBoolean("draw.segment.head_only", headArrow.isSelected()); 200 Main.pref.putBoolean("draw.oneway", onewayArrow.isSelected()); 201 Main.pref.putBoolean("draw.segment.order_number", segmentOrderNumber.isSelected()); 202 Main.pref.putBoolean("draw.segment.order_number.on_selected", segmentOrderNumberOnSelectedWay.isSelected()); 203 Main.pref.putBoolean("draw.data.downloaded_area", sourceBounds.isSelected()); 204 Main.pref.putBoolean("draw.data.inactive_color", inactive.isSelected()); 205 Main.pref.putBoolean("mappaint.use-antialiasing", useAntialiasing.isSelected()); 206 Main.pref.putBoolean("mappaint.wireframe.use-antialiasing", useWireframeAntialiasing.isSelected()); 207 Main.pref.putBoolean("draw.target-highlight", useHighlighting.isSelected()); 208 Main.pref.putBoolean("draw.helper-line", drawHelperLine.isSelected()); 209 Main.pref.putBoolean("display.discardable-keys", discardableKeys.isSelected()); 210 210 AutoFilterManager.PROP_AUTO_FILTER_ENABLED.put(autoFilters.isSelected()); 211 211 AutoFilterManager.PROP_AUTO_FILTER_RULE.put(((AutoFilterRule) autoFilterRules.getSelectedItem()).getKey()); 212 int vn = Main.pref.getInt eger("mappaint.node.virtual-size", 8);212 int vn = Main.pref.getInt("mappaint.node.virtual-size", 8); 213 213 if (virtualNodes.isSelected()) { 214 214 if (vn < 1) { … … 218 218 vn = 0; 219 219 } 220 Main.pref.putInt eger("mappaint.node.virtual-size", vn);220 Main.pref.putInt("mappaint.node.virtual-size", vn); 221 221 return restart; 222 222 } -
trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java
r12620 r12841 454 454 layerNameDot = ""; 455 455 } 456 Main.pref.put ("marker.makeautomarkers"+layerNameDot, makeAutoMarkers.isSelected());456 Main.pref.putBoolean("marker.makeautomarkers"+layerNameDot, makeAutoMarkers.isSelected()); 457 457 if (drawRawGpsLinesGlobal.isSelected()) { 458 458 Main.pref.put("draw.rawgps.lines" + layerNameDot, null); … … 466 466 } else { 467 467 if (layerName == null || !locLayer) { 468 Main.pref.put ("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected());468 Main.pref.putBoolean("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected()); 469 469 Main.pref.put("draw.rawgps.max-line-length" + layerNameDot, drawRawGpsMaxLineLength.getText()); 470 470 } 471 471 if (layerName == null || locLayer) { 472 Main.pref.put ("draw.rawgps.lines.local" + layerNameDot, drawRawGpsLinesAll.isSelected() || drawRawGpsLinesLocal.isSelected());472 Main.pref.putBoolean("draw.rawgps.lines.local" + layerNameDot, drawRawGpsLinesAll.isSelected() || drawRawGpsLinesLocal.isSelected()); 473 473 Main.pref.put("draw.rawgps.max-line-length.local" + layerNameDot, drawRawGpsMaxLineLengthLocal.getText()); 474 474 } 475 Main.pref.put ("draw.rawgps.lines.force"+layerNameDot, forceRawGpsLines.isSelected());476 Main.pref.put ("draw.rawgps.direction"+layerNameDot, drawGpsArrows.isSelected());477 Main.pref.put ("draw.rawgps.alternatedirection"+layerNameDot, drawGpsArrowsFast.isSelected());475 Main.pref.putBoolean("draw.rawgps.lines.force"+layerNameDot, forceRawGpsLines.isSelected()); 476 Main.pref.putBoolean("draw.rawgps.direction"+layerNameDot, drawGpsArrows.isSelected()); 477 Main.pref.putBoolean("draw.rawgps.alternatedirection"+layerNameDot, drawGpsArrowsFast.isSelected()); 478 478 Main.pref.put("draw.rawgps.min-arrow-distance"+layerNameDot, drawGpsArrowsMinDist.getText()); 479 479 } 480 480 481 Main.pref.put ("draw.rawgps.hdopcircle"+layerNameDot, hdopCircleGpsPoints.isSelected());482 Main.pref.put ("draw.rawgps.large"+layerNameDot, largeGpsPoints.isSelected());481 Main.pref.putBoolean("draw.rawgps.hdopcircle"+layerNameDot, hdopCircleGpsPoints.isSelected()); 482 Main.pref.putBoolean("draw.rawgps.large"+layerNameDot, largeGpsPoints.isSelected()); 483 483 Main.pref.put("draw.rawgps.linewidth"+layerNameDot, drawLineWidth.getText()); 484 Main.pref.put ("draw.rawgps.lines.alpha-blend"+layerNameDot, drawLineWithAlpha.isSelected());485 486 Main.pref.put ("mappaint.gpx.use-antialiasing", useGpsAntialiasing.isSelected());484 Main.pref.putBoolean("draw.rawgps.lines.alpha-blend"+layerNameDot, drawLineWithAlpha.isSelected()); 485 486 Main.pref.putBoolean("mappaint.gpx.use-antialiasing", useGpsAntialiasing.isSelected()); 487 487 488 488 TemplateEntryProperty.forMarker(layerName).put(waypointLabelPattern.getText()); … … 495 495 return false; 496 496 } else if (colorTypeVelocity.isSelected()) { 497 Main.pref.putInt eger("draw.rawgps.colors"+layerNameDot, 1);497 Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 1); 498 498 } else if (colorTypeDilution.isSelected()) { 499 Main.pref.putInt eger("draw.rawgps.colors"+layerNameDot, 2);499 Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 2); 500 500 } else if (colorTypeDirection.isSelected()) { 501 Main.pref.putInt eger("draw.rawgps.colors"+layerNameDot, 3);501 Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 3); 502 502 } else if (colorTypeTime.isSelected()) { 503 Main.pref.putInt eger("draw.rawgps.colors"+layerNameDot, 4);503 Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 4); 504 504 } else if (colorTypeHeatMap.isSelected()) { 505 Main.pref.putInt eger("draw.rawgps.colors"+layerNameDot, 5);505 Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 5); 506 506 } else { 507 Main.pref.putInt eger("draw.rawgps.colors"+layerNameDot, 0);508 } 509 Main.pref.put ("draw.rawgps.colors.dynamic"+layerNameDot, colorDynamic.isSelected());507 Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 0); 508 } 509 Main.pref.putBoolean("draw.rawgps.colors.dynamic"+layerNameDot, colorDynamic.isSelected()); 510 510 int ccti = colorTypeVelocityTune.getSelectedIndex(); 511 Main.pref.putInt eger("draw.rawgps.colorTracksTune"+layerNameDot, ccti == 2 ? 10 : (ccti == 1 ? 20 : 45));512 Main.pref.putInt eger("draw.rawgps.heatmap.colormap"+layerNameDot, colorTypeHeatMapTune.getSelectedIndex());513 Main.pref.put ("draw.rawgps.heatmap.use-points"+layerNameDot, colorTypeHeatMapPoints.isSelected());514 Main.pref.putInt eger("draw.rawgps.heatmap.gain"+layerNameDot, colorTypeHeatMapGain.getValue());515 Main.pref.putInt eger("draw.rawgps.heatmap.lower-limit"+layerNameDot, colorTypeHeatMapLowerLimit.getValue());511 Main.pref.putInt("draw.rawgps.colorTracksTune"+layerNameDot, ccti == 2 ? 10 : (ccti == 1 ? 20 : 45)); 512 Main.pref.putInt("draw.rawgps.heatmap.colormap"+layerNameDot, colorTypeHeatMapTune.getSelectedIndex()); 513 Main.pref.putBoolean("draw.rawgps.heatmap.use-points"+layerNameDot, colorTypeHeatMapPoints.isSelected()); 514 Main.pref.putInt("draw.rawgps.heatmap.gain"+layerNameDot, colorTypeHeatMapGain.getValue()); 515 Main.pref.putInt("draw.rawgps.heatmap.lower-limit"+layerNameDot, colorTypeHeatMapLowerLimit.getValue()); 516 516 517 517 return false; -
trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java
r12620 r12841 202 202 public boolean ok() { 203 203 boolean mod = false; 204 Main.pref.put ("draw.splashscreen", showSplashScreen.isSelected());205 Main.pref.put ("osm-primitives.showid", showID.isSelected());206 Main.pref.put ("osm-primitives.localize-name", showLocalizedName.isSelected());204 Main.pref.putBoolean("draw.splashscreen", showSplashScreen.isSelected()); 205 Main.pref.putBoolean("osm-primitives.showid", showID.isSelected()); 206 Main.pref.putBoolean("osm-primitives.localize-name", showLocalizedName.isSelected()); 207 207 MapFrame.MODELESS.put(modeless.isSelected()); 208 Main.pref.put (ToggleDialog.PROP_DYNAMIC_BUTTONS.getKey(), dynamicButtons.isSelected());209 Main.pref.put (DateUtils.PROP_ISO_DATES.getKey(), isoDates.isSelected());210 Main.pref.put (FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.getKey(), nativeFileChoosers.isSelected());208 Main.pref.putBoolean(ToggleDialog.PROP_DYNAMIC_BUTTONS.getKey(), dynamicButtons.isSelected()); 209 Main.pref.putBoolean(DateUtils.PROP_ISO_DATES.getKey(), isoDates.isSelected()); 210 Main.pref.putBoolean(FileChooserManager.PROP_USE_NATIVE_FILE_DIALOG.getKey(), nativeFileChoosers.isSelected()); 211 211 MapMover.PROP_ZOOM_REVERSE_WHEEL.put(zoomReverseWheel.isSelected()); 212 212 NavigatableComponent.PROP_ZOOM_INTERMEDIATE_STEPS.put(zoomIntermediateSteps.isSelected()); -
trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
r12649 r12841 105 105 @Override 106 106 public Collection<String> getInitialIconPathsList() { 107 return Main.pref.get Collection(ICONPREF, null);107 return Main.pref.getList(ICONPREF, null); 108 108 } 109 109 … … 170 170 @Override 171 171 public boolean ok() { 172 boolean reload = Main.pref.put ("mappaint.icon.enable-defaults", enableIconDefault.isSelected());172 boolean reload = Main.pref.putBoolean("mappaint.icon.enable-defaults", enableIconDefault.isSelected()); 173 173 reload |= sources.finish(); 174 174 if (reload) { -
trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
r12649 r12841 206 206 @Override 207 207 public Collection<String> getInitialIconPathsList() { 208 return Main.pref.get Collection(ICONPREF, null);208 return Main.pref.getList(ICONPREF, null); 209 209 } 210 210 … … 246 246 @Override 247 247 public boolean ok() { 248 boolean restart = Main.pref.put ("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null);248 boolean restart = Main.pref.putBoolean("taggingpreset.sortmenu", sortMenu.getSelectedObjects() != null); 249 249 restart |= sources.finish(); 250 250 -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
r12634 r12841 302 302 List<String> l = new LinkedList<>(model.getSelectedPluginNames()); 303 303 Collections.sort(l); 304 Main.pref.put Collection("plugins", l);304 Main.pref.putList("plugins", l); 305 305 if (!model.getNewlyDeactivatedPlugins().isEmpty()) 306 306 return true; … … 359 359 model.updateAvailablePlugins(task.getAvailablePlugins()); 360 360 pnlPluginPreferences.refreshView(); 361 Main.pref.putInt eger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030361 Main.pref.putInt("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030 362 362 }); 363 363 } -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java
r12620 r12841 40 40 public PluginPreferencesModel() { 41 41 currentActivePlugins = new HashSet<>(); 42 currentActivePlugins.addAll(Main.pref.get Collection("plugins", currentActivePlugins));42 currentActivePlugins.addAll(Main.pref.getList("plugins")); 43 43 } 44 44 … … 80 80 filterDisplayedPlugins(filterExpression); 81 81 Set<String> activePlugins = new HashSet<>(); 82 activePlugins.addAll(Main.pref.get Collection("plugins", activePlugins));82 activePlugins.addAll(Main.pref.getList("plugins")); 83 83 for (PluginInformation pi: availablePlugins) { 84 84 if (selectedPluginsMap.get(pi) == null && activePlugins.contains(pi.name)) { … … 230 230 */ 231 231 public void initFromPreferences() { 232 Collection<String> enabledPlugins = Main.pref.get Collection("plugins", null);232 Collection<String> enabledPlugins = Main.pref.getList("plugins", null); 233 233 if (enabledPlugins == null) { 234 234 this.selectedPluginsMap.clear(); -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java
r12620 r12841 196 196 } 197 197 if (days == 0) { 198 days = Main.pref.getInt eger("pluginmanager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL);198 days = Main.pref.getInt("pluginmanager.time-based-update.interval", PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL); 199 199 } 200 200 tfUpdateInterval.setText(Integer.toString(days)); … … 235 235 days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL; 236 236 } 237 Main.pref.putInt eger("pluginmanager.time-based-update.interval", days);237 Main.pref.putInt("pluginmanager.time-based-update.interval", days); 238 238 } 239 239 -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
r12620 r12841 72 72 } 73 73 }); 74 Collection<String> samples = Arrays.asList(74 List<String> samples = Arrays.asList( 75 75 "+proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90", 76 76 "+proj=tmerc +lat_0=0 +lon_0=9 +k_0=1 +x_0=3500000 +y_0=0 +ellps=bessel +nadgrids=BETA2007.gsb"); 77 List<String> inputHistory = new LinkedList<>(Main.pref.get Collection("projection.custom.value.history", samples));77 List<String> inputHistory = new LinkedList<>(Main.pref.getList("projection.custom.value.history", samples)); 78 78 Collections.reverse(inputHistory); 79 79 cbInput.setPossibleItems(inputHistory); … … 149 149 public void rememberHistory() { 150 150 cbInput.addCurrentItemToHistory(); 151 Main.pref.put Collection("projection.custom.value.history", cbInput.getHistory());151 Main.pref.putList("projection.custom.value.history", cbInput.getHistory()); 152 152 } 153 153 } -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java
r12786 r12841 28 28 import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager; 29 29 import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat; 30 import org.openstreetmap.josm.data.preferences. CollectionProperty;30 import org.openstreetmap.josm.data.preferences.ListProperty; 31 31 import org.openstreetmap.josm.data.preferences.StringProperty; 32 32 import org.openstreetmap.josm.data.projection.CustomProjection; … … 291 291 private static final StringProperty PROP_PROJECTION_DEFAULT = new StringProperty("projection.default", mercator.getId()); 292 292 private static final StringProperty PROP_COORDINATES = new StringProperty("coordinates", null); 293 private static final CollectionProperty PROP_SUB_PROJECTION_DEFAULT = new CollectionProperty("projection.default.sub", null);293 private static final ListProperty PROP_SUB_PROJECTION_DEFAULT = new ListProperty("projection.default.sub", null); 294 294 private static final String[] unitsValues = ALL_SYSTEMS.keySet().toArray(new String[ALL_SYSTEMS.size()]); 295 295 private static final String[] unitsValuesTr = new String[unitsValues.length]; … … 482 482 } 483 483 id = pc.getId(); 484 Main.pref.put Collection("projection.sub."+id, pref);484 Main.pref.putList("projection.sub."+id, pref == null ? null : new ArrayList<>(pref)); 485 485 if (makeDefault) { 486 486 PROP_PROJECTION_DEFAULT.put(id); 487 PROP_SUB_PROJECTION_DEFAULT.put(pref );487 PROP_SUB_PROJECTION_DEFAULT.put(pref == null ? null : new ArrayList<>(pref)); 488 488 } else { 489 489 projectionChoice = id; … … 560 560 */ 561 561 public static Collection<String> getSubprojectionPreference(String pcId) { 562 return Main.pref.get Collection("projection.sub."+pcId, null);562 return Main.pref.getList("projection.sub."+pcId, null); 563 563 } 564 564 -
trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java
r12707 r12841 196 196 if (enabled) { 197 197 for (Entry<PermissionPrefWithDefault, JCheckBox> p : prefs.entrySet()) { 198 Main.pref.put (p.getKey().pref, p.getValue().isSelected());199 } 200 Main.pref.put (RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected());201 Main.pref.put (RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected());198 Main.pref.putBoolean(p.getKey().pref, p.getValue().isSelected()); 199 } 200 Main.pref.putBoolean(RequestHandler.loadInNewLayerKey, loadInNewLayer.isSelected()); 201 Main.pref.putBoolean(RequestHandler.globalConfirmationKey, alwaysAskUserConfirm.isSelected()); 202 202 } 203 203 if (changed) { -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r12634 r12841 28 28 29 29 import org.openstreetmap.josm.Main; 30 import org.openstreetmap.josm.data.preferences. CollectionProperty;30 import org.openstreetmap.josm.data.preferences.ListProperty; 31 31 import org.openstreetmap.josm.gui.MainApplication; 32 32 import org.openstreetmap.josm.gui.help.HelpUtil; … … 58 58 /** indicates whether to use the default OSM URL or not */ 59 59 private JCheckBox cbUseDefaultServerUrl; 60 private final transient CollectionProperty SERVER_URL_HISTORY = new CollectionProperty("osm-server.url-history", Arrays.asList(60 private final transient ListProperty SERVER_URL_HISTORY = new ListProperty("osm-server.url-history", Arrays.asList( 61 61 "http://api06.dev.openstreetmap.org/api", "http://master.apis.dev.openstreetmap.org/api")); 62 62 -
trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java
r12649 r12841 97 97 @Override 98 98 public boolean ok() { 99 Collection<String> tests = new LinkedList<>();100 Collection<String> testsBeforeUpload = new LinkedList<>();99 List<String> tests = new LinkedList<>(); 100 List<String> testsBeforeUpload = new LinkedList<>(); 101 101 102 102 for (Test test : allTests) { … … 116 116 OsmValidator.initializeTests(testsToInitialize); 117 117 118 Main.pref.put Collection(ValidatorPrefHelper.PREF_SKIP_TESTS, tests);119 Main.pref.put Collection(ValidatorPrefHelper.PREF_SKIP_TESTS_BEFORE_UPLOAD, testsBeforeUpload);118 Main.pref.putList(ValidatorPrefHelper.PREF_SKIP_TESTS, tests); 119 Main.pref.putList(ValidatorPrefHelper.PREF_SKIP_TESTS_BEFORE_UPLOAD, testsBeforeUpload); 120 120 ValidatorPrefHelper.PREF_USE_IGNORE.put(prefUseIgnore.isSelected()); 121 121 ValidatorPrefHelper.PREF_OTHER.put(prefOther.isSelected()); -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
r12691 r12841 210 210 } 211 211 File arch = TaggingPresetReader.getZipIcons(); 212 final Collection<String> s = Main.pref.get Collection("taggingpreset.icon.sources", null);212 final Collection<String> s = Main.pref.getList("taggingpreset.icon.sources", null); 213 213 ImageProvider imgProv = new ImageProvider(iconName); 214 214 imgProv.setDirs(s); -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
r12835 r12841 127 127 128 128 protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) { 129 final Collection<String> s = Main.pref.get Collection("taggingpreset.icon.sources", null);129 final Collection<String> s = Main.pref.getList("taggingpreset.icon.sources", null); 130 130 ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true); 131 131 if (maxSize != null) { -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java
r12643 r12841 91 91 } 92 92 for (JMenu submenu : submenus.values()) { 93 if (submenu.getItemCount() >= Main.pref.getInt eger("taggingpreset.min-elements-for-scroller", 15)) {93 if (submenu.getItemCount() >= Main.pref.getInt("taggingpreset.min-elements-for-scroller", 15)) { 94 94 MenuScroller.setScrollerFor(submenu); 95 95 } -
trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
r12304 r12841 24 24 */ 25 25 public HistoryComboBox() { 26 int maxsize = Main.pref.getInt eger("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE);26 int maxsize = Main.pref.getInt("search.history-size", DEFAULT_SEARCH_HISTORY_SIZE); 27 27 model = new ComboBoxHistory(maxsize); 28 28 setModel(model);
Note:
See TracChangeset
for help on using the changeset viewer.