Ignore:
Timestamp:
2017-09-13T16:30:27+02:00 (7 years ago)
Author:
bastiK
Message:

see #15229 - fix deprecations caused by [12840]

Location:
trunk/src/org/openstreetmap/josm/gui/preferences
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

    r12825 r12841  
    423423
    424424            if (!iconPaths.isEmpty()) {
    425                 if (Main.pref.putCollection(iconPref, iconPaths)) {
     425                if (Main.pref.putList(iconPref, iconPaths)) {
    426426                    changed = true;
    427427                }
    428             } else if (Main.pref.putCollection(iconPref, null)) {
     428            } else if (Main.pref.putList(iconPref, null)) {
    429429                changed = true;
    430430            }

  • trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

    r12643 r12841  
    496496            @Override
    497497            public void actionPerformed(ActionEvent e) {
    498                 Collection<String> t = new LinkedList<>(getToolString());
     498                List<String> t = new LinkedList<>(getToolString());
    499499                ActionParser parser = new ActionParser(null);
    500500                // get text definition of current action
    … …  
    502502                // remove the button from toolbar preferences
    503503                t.remove(res);
    504                 Main.pref.putCollection("toolbar", t);
     504                Main.pref.putList("toolbar", t);
    505505                MainApplication.getToolbar().refreshToolbarControl();
    506506            }
    … …  
    532532            public void actionPerformed(ActionEvent e) {
    533533                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);
    536536            }
    537537        });
    … …  
    971971        @Override
    972972        public boolean ok() {
    973             Collection<String> t = new LinkedList<>();
     973            List<String> t = new LinkedList<>();
    974974            ActionParser parser = new ActionParser(null);
    975975            for (int i = 0; i < selected.size(); ++i) {
    … …  
    987987                t = Collections.singletonList(EMPTY_TOOLBAR_MARKER);
    988988            }
    989             Main.pref.putCollection("toolbar", t);
     989            Main.pref.putList("toolbar", t);
    990990            MainApplication.getToolbar().refreshToolbarControl();
    991991            return false;
    … …  
    10741074    public static Collection<String> getToolString() {
    10751075
    1076         Collection<String> toolStr = Main.pref.getCollection("toolbar", Arrays.asList(deftoolbar));
     1076        Collection<String> toolStr = Main.pref.getList("toolbar", Arrays.asList(deftoolbar));
    10771077        if (toolStr == null || toolStr.isEmpty()) {
    10781078            toolStr = Arrays.asList(deftoolbar);
    … …  
    12141214            }
    12151215        }
    1216         Main.pref.putCollection("toolbar", t);
     1216        Main.pref.putList("toolbar", t);
    12171217        MainApplication.getToolbar().refreshToolbarControl();
    12181218    }

  • trunk/src/org/openstreetmap/josm/gui/preferences/audio/AudioPreference.java

    r9778 r12841  
    133133    @Override
    134134    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());
    143143        Main.pref.put("audio.forwardbackamount", audioForwardBackAmount.getText());
    144144        Main.pref.put("audio.fastfwdmultiplier", audioFastForwardMultiplier.getText());

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

    r12400 r12841  
    109109        // virtual nodes
    110110        virtualNodes.setToolTipText(tr("Draw virtual nodes in select mode for easy way modification."));
    111         virtualNodes.setSelected(Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
     111        virtualNodes.setSelected(Main.pref.getInt("mappaint.node.virtual-size", 8) != 0);
    112112
    113113        // background layers in inactive color
    … …  
    195195    public boolean ok() {
    196196        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());
    210210        AutoFilterManager.PROP_AUTO_FILTER_ENABLED.put(autoFilters.isSelected());
    211211        AutoFilterManager.PROP_AUTO_FILTER_RULE.put(((AutoFilterRule) autoFilterRules.getSelectedItem()).getKey());
    212         int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
     212        int vn = Main.pref.getInt("mappaint.node.virtual-size", 8);
    213213        if (virtualNodes.isSelected()) {
    214214            if (vn < 1) {
    … …  
    218218            vn = 0;
    219219        }
    220         Main.pref.putInteger("mappaint.node.virtual-size", vn);
     220        Main.pref.putInt("mappaint.node.virtual-size", vn);
    221221        return restart;
    222222    }

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

    r12620 r12841  
    454454            layerNameDot = "";
    455455        }
    456         Main.pref.put("marker.makeautomarkers"+layerNameDot, makeAutoMarkers.isSelected());
     456        Main.pref.putBoolean("marker.makeautomarkers"+layerNameDot, makeAutoMarkers.isSelected());
    457457        if (drawRawGpsLinesGlobal.isSelected()) {
    458458            Main.pref.put("draw.rawgps.lines" + layerNameDot, null);
    … …  
    466466        } else {
    467467            if (layerName == null || !locLayer) {
    468                 Main.pref.put("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected());
     468                Main.pref.putBoolean("draw.rawgps.lines" + layerNameDot, drawRawGpsLinesAll.isSelected());
    469469                Main.pref.put("draw.rawgps.max-line-length" + layerNameDot, drawRawGpsMaxLineLength.getText());
    470470            }
    471471            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());
    473473                Main.pref.put("draw.rawgps.max-line-length.local" + layerNameDot, drawRawGpsMaxLineLengthLocal.getText());
    474474            }
    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());
    478478            Main.pref.put("draw.rawgps.min-arrow-distance"+layerNameDot, drawGpsArrowsMinDist.getText());
    479479        }
    480480
    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());
    483483        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());
    487487
    488488        TemplateEntryProperty.forMarker(layerName).put(waypointLabelPattern.getText());
    … …  
    495495            return false;
    496496        } else if (colorTypeVelocity.isSelected()) {
    497             Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 1);
     497            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 1);
    498498        } else if (colorTypeDilution.isSelected()) {
    499             Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 2);
     499            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 2);
    500500        } else if (colorTypeDirection.isSelected()) {
    501             Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 3);
     501            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 3);
    502502        } else if (colorTypeTime.isSelected()) {
    503             Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 4);
     503            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 4);
    504504        } else if (colorTypeHeatMap.isSelected()) {
    505             Main.pref.putInteger("draw.rawgps.colors"+layerNameDot, 5);
     505            Main.pref.putInt("draw.rawgps.colors"+layerNameDot, 5);
    506506        } else {
    507             Main.pref.putInteger("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());
    510510        int ccti = colorTypeVelocityTune.getSelectedIndex();
    511         Main.pref.putInteger("draw.rawgps.colorTracksTune"+layerNameDot, ccti == 2 ? 10 : (ccti == 1 ? 20 : 45));
    512         Main.pref.putInteger("draw.rawgps.heatmap.colormap"+layerNameDot, colorTypeHeatMapTune.getSelectedIndex());
    513         Main.pref.put("draw.rawgps.heatmap.use-points"+layerNameDot, colorTypeHeatMapPoints.isSelected());
    514         Main.pref.putInteger("draw.rawgps.heatmap.gain"+layerNameDot, colorTypeHeatMapGain.getValue());
    515         Main.pref.putInteger("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());
    516516
    517517        return false;

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

    r12620 r12841  
    202202    public boolean ok() {
    203203        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());
    207207        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());
    211211        MapMover.PROP_ZOOM_REVERSE_WHEEL.put(zoomReverseWheel.isSelected());
    212212        NavigatableComponent.PROP_ZOOM_INTERMEDIATE_STEPS.put(zoomIntermediateSteps.isSelected());

  • trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

    r12649 r12841  
    105105        @Override
    106106        public Collection<String> getInitialIconPathsList() {
    107             return Main.pref.getCollection(ICONPREF, null);
     107            return Main.pref.getList(ICONPREF, null);
    108108        }
    109109
    … …  
    170170    @Override
    171171    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());
    173173        reload |= sources.finish();
    174174        if (reload) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

    r12649 r12841  
    206206        @Override
    207207        public Collection<String> getInitialIconPathsList() {
    208             return Main.pref.getCollection(ICONPREF, null);
     208            return Main.pref.getList(ICONPREF, null);
    209209        }
    210210
    … …  
    246246    @Override
    247247    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);
    249249        restart |= sources.finish();
    250250

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java

    r12634 r12841  
    302302            List<String> l = new LinkedList<>(model.getSelectedPluginNames());
    303303            Collections.sort(l);
    304             Main.pref.putCollection("plugins", l);
     304            Main.pref.putList("plugins", l);
    305305            if (!model.getNewlyDeactivatedPlugins().isEmpty())
    306306                return true;
    … …  
    359359                        model.updateAvailablePlugins(task.getAvailablePlugins());
    360360                        pnlPluginPreferences.refreshView();
    361                         Main.pref.putInteger("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
     361                        Main.pref.putInt("pluginmanager.version", Version.getInstance().getVersion()); // fix #7030
    362362                    });
    363363                }

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

    r12620 r12841  
    4040    public PluginPreferencesModel() {
    4141        currentActivePlugins = new HashSet<>();
    42         currentActivePlugins.addAll(Main.pref.getCollection("plugins", currentActivePlugins));
     42        currentActivePlugins.addAll(Main.pref.getList("plugins"));
    4343    }
    4444
    … …  
    8080        filterDisplayedPlugins(filterExpression);
    8181        Set<String> activePlugins = new HashSet<>();
    82         activePlugins.addAll(Main.pref.getCollection("plugins", activePlugins));
     82        activePlugins.addAll(Main.pref.getList("plugins"));
    8383        for (PluginInformation pi: availablePlugins) {
    8484            if (selectedPluginsMap.get(pi) == null && activePlugins.contains(pi.name)) {
    … …  
    230230     */
    231231    public void initFromPreferences() {
    232         Collection<String> enabledPlugins = Main.pref.getCollection("plugins", null);
     232        Collection<String> enabledPlugins = Main.pref.getList("plugins", null);
    233233        if (enabledPlugins == null) {
    234234            this.selectedPluginsMap.clear();

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java

    r12620 r12841  
    196196        }
    197197        if (days == 0) {
    198             days = Main.pref.getInteger("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);
    199199        }
    200200        tfUpdateInterval.setText(Integer.toString(days));
    … …  
    235235            days = PluginHandler.DEFAULT_TIME_BASED_UPDATE_INTERVAL;
    236236        }
    237         Main.pref.putInteger("pluginmanager.time-based-update.interval", days);
     237        Main.pref.putInt("pluginmanager.time-based-update.interval", days);
    238238    }
    239239

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java

    r12620 r12841  
    7272                }
    7373            });
    74             Collection<String> samples = Arrays.asList(
     74            List<String> samples = Arrays.asList(
    7575                    "+proj=lonlat +ellps=WGS84 +datum=WGS84 +bounds=-180,-90,180,90",
    7676                    "+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.getCollection("projection.custom.value.history", samples));
     77            List<String> inputHistory = new LinkedList<>(Main.pref.getList("projection.custom.value.history", samples));
    7878            Collections.reverse(inputHistory);
    7979            cbInput.setPossibleItems(inputHistory);
    … …  
    149149        public void rememberHistory() {
    150150            cbInput.addCurrentItemToHistory();
    151             Main.pref.putCollection("projection.custom.value.history", cbInput.getHistory());
     151            Main.pref.putList("projection.custom.value.history", cbInput.getHistory());
    152152        }
    153153    }

  • trunk/src/org/openstreetmap/josm/gui/preferences/projection/ProjectionPreference.java

    r12786 r12841  
    2828import org.openstreetmap.josm.data.coor.conversion.CoordinateFormatManager;
    2929import org.openstreetmap.josm.data.coor.conversion.ICoordinateFormat;
    30 import org.openstreetmap.josm.data.preferences.CollectionProperty;
     30import org.openstreetmap.josm.data.preferences.ListProperty;
    3131import org.openstreetmap.josm.data.preferences.StringProperty;
    3232import org.openstreetmap.josm.data.projection.CustomProjection;
    … …  
    291291    private static final StringProperty PROP_PROJECTION_DEFAULT = new StringProperty("projection.default", mercator.getId());
    292292    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);
    294294    private static final String[] unitsValues = ALL_SYSTEMS.keySet().toArray(new String[ALL_SYSTEMS.size()]);
    295295    private static final String[] unitsValuesTr = new String[unitsValues.length];
    … …  
    482482        }
    483483        id = pc.getId();
    484         Main.pref.putCollection("projection.sub."+id, pref);
     484        Main.pref.putList("projection.sub."+id, pref == null ? null : new ArrayList<>(pref));
    485485        if (makeDefault) {
    486486            PROP_PROJECTION_DEFAULT.put(id);
    487             PROP_SUB_PROJECTION_DEFAULT.put(pref);
     487            PROP_SUB_PROJECTION_DEFAULT.put(pref == null ? null : new ArrayList<>(pref));
    488488        } else {
    489489            projectionChoice = id;
    … …  
    560560     */
    561561    public static Collection<String> getSubprojectionPreference(String pcId) {
    562         return Main.pref.getCollection("projection.sub."+pcId, null);
     562        return Main.pref.getList("projection.sub."+pcId, null);
    563563    }
    564564

  • trunk/src/org/openstreetmap/josm/gui/preferences/remotecontrol/RemoteControlPreference.java

    r12707 r12841  
    196196        if (enabled) {
    197197            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());
    202202        }
    203203        if (changed) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java

    r12634 r12841  
    2828
    2929import org.openstreetmap.josm.Main;
    30 import org.openstreetmap.josm.data.preferences.CollectionProperty;
     30import org.openstreetmap.josm.data.preferences.ListProperty;
    3131import org.openstreetmap.josm.gui.MainApplication;
    3232import org.openstreetmap.josm.gui.help.HelpUtil;
    … …  
    5858    /** indicates whether to use the default OSM URL or not */
    5959    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(
    6161            "http://api06.dev.openstreetmap.org/api", "http://master.apis.dev.openstreetmap.org/api"));
    6262

  • trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTestsPreference.java

    r12649 r12841  
    9797    @Override
    9898    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<>();
    101101
    102102        for (Test test : allTests) {
    … …  
    116116        OsmValidator.initializeTests(testsToInitialize);
    117117
    118         Main.pref.putCollection(ValidatorPrefHelper.PREF_SKIP_TESTS, tests);
    119         Main.pref.putCollection(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);
    120120        ValidatorPrefHelper.PREF_USE_IGNORE.put(prefUseIgnore.isSelected());
    121121        ValidatorPrefHelper.PREF_OTHER.put(prefOther.isSelected());
Note: See TracChangeset for help on using the changeset viewer.