Changeset 12841 in josm for trunk/src/org/openstreetmap/josm/gui/io

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/io

Files:

• BasicUploadSettingsPanel.java (modified) (3 diffs)
• ChangesetManagementPanel.java (modified) (1 diff)
• CustomConfigurator.java (modified) (2 diffs)
• RecentlyOpenedFilesMenu.java (modified) (2 diffs)
• UploadDialog.java (modified) (1 diff)
• UploadStrategySelectionPanel.java (modified) (2 diffs)
• importexport/GpxExporter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -78 +78 @@
         hcbUploadComment.setToolTipText(tr("Enter an upload comment"));
         hcbUploadComment.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
-        List<String> cmtHistory = new LinkedList<>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
+        List<String> cmtHistory = new LinkedList<>(Main.pref.getList(HISTORY_KEY, new LinkedList<String>()));
         Collections.reverse(cmtHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         hcbUploadComment.setPossibleItems(cmtHistory);
@@ -100 +100 @@
         hcbUploadSource.setToolTipText(tr("Enter a source"));
         hcbUploadSource.setMaxTextLength(Changeset.MAX_CHANGESET_TAG_LENGTH);
-        List<String> sourceHistory = new LinkedList<>(Main.pref.getCollection(SOURCE_HISTORY_KEY, getDefaultSources()));
+        List<String> sourceHistory = new LinkedList<>(Main.pref.getList(SOURCE_HISTORY_KEY, getDefaultSources()));
         Collections.reverse(sourceHistory); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement()
         hcbUploadSource.setPossibleItems(sourceHistory);
@@ -166 +166 @@
         // store the history of comments
         hcbUploadComment.addCurrentItemToHistory();
-        Main.pref.putCollection(HISTORY_KEY, hcbUploadComment.getHistory());
-        Main.pref.putInteger(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
+        Main.pref.putList(HISTORY_KEY, hcbUploadComment.getHistory());
+        Main.pref.putInt(HISTORY_LAST_USED_KEY, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
         // store the history of sources
         hcbUploadSource.addCurrentItemToHistory();
-        Main.pref.putCollection(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());
+        Main.pref.putList(SOURCE_HISTORY_KEY, hcbUploadSource.getHistory());
     }
 

trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java

@@ -256 +256 @@
             case ItemEvent.SELECTED:
                 firePropertyChange(CLOSE_CHANGESET_AFTER_UPLOAD, false, true);
-                Main.pref.put("upload.changeset.close", true);
+                Main.pref.putBoolean("upload.changeset.close", true);
                 break;
             case ItemEvent.DESELECTED:
                 firePropertyChange(CLOSE_CHANGESET_AFTER_UPLOAD, true, false);
-                Main.pref.put("upload.changeset.close", false);
+                Main.pref.putBoolean("upload.changeset.close", false);
                 break;
             default: // Do nothing

trunk/src/org/openstreetmap/josm/gui/io/CustomConfigurator.java

@@ -400 +400 @@
                         MainApplication.worker.submit(pluginDownloadTask);
                     }
-                    Collection<String> pls = new ArrayList<>(Main.pref.getCollection("plugins"));
+                    List<String> pls = new ArrayList<>(Main.pref.getList("plugins"));
                     for (PluginInformation pi2: toInstallPlugins) {
                         if (!pls.contains(pi2.name)) {
@@ -413 +413 @@
                         new File(Main.pref.getPluginsDirectory(), pi4.name+".jar").deleteOnExit();
                     }
-                    Main.pref.putCollection("plugins", pls);
+                    Main.pref.putList("plugins", pls);
                 });
             }

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -58 +58 @@
     private void rebuild() {
         removeAll();
-        Collection<String> fileHistory = Main.pref.getCollection("file-open.history");
+        Collection<String> fileHistory = Main.pref.getList("file-open.history");
 
         for (final String file : fileHistory) {
@@ -101 +101 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            Main.pref.putCollection("file-open.history", null);
+            Main.pref.putList("file-open.history", null);
         }
     }

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -653 +653 @@
 
     private static String getLastChangesetTagFromHistory(String historyKey, List<String> def) {
-        Collection<String> history = Main.pref.getCollection(historyKey, def);
-        int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInteger(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
+        Collection<String> history = Main.pref.getList(historyKey, def);
+        int age = (int) (System.currentTimeMillis() / 1000 - Main.pref.getInt(BasicUploadSettingsPanel.HISTORY_LAST_USED_KEY, 0));
         if (history != null && age < Main.pref.getLong(BasicUploadSettingsPanel.HISTORY_MAX_AGE_KEY, TimeUnit.HOURS.toMillis(4))
                 && !history.isEmpty()) {

trunk/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java

@@ -323 +323 @@
         UploadStrategy strategy = UploadStrategy.getFromPreferences();
         rbStrategy.get(strategy).setSelected(true);
-        int chunkSize = Main.pref.getInteger("osm-server.upload-strategy.chunk-size", 1);
+        int chunkSize = Main.pref.getInt("osm-server.upload-strategy.chunk-size", 1);
         tfChunkSize.setText(Integer.toString(chunkSize));
         updateNumRequestsLabels();
@@ -337 +337 @@
         try {
             chunkSize = Integer.parseInt(tfChunkSize.getText().trim());
-            Main.pref.putInteger("osm-server.upload-strategy.chunk-size", chunkSize);
+            Main.pref.putInt("osm-server.upload-strategy.chunk-size", chunkSize);
         } catch (NumberFormatException e) {
             // don't save invalid value to preferences

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -162 +162 @@
         setCanceled(false);
 
-        Main.pref.put("lastAddAuthor", author.isSelected());
+        Main.pref.putBoolean("lastAddAuthor", author.isSelected());
         if (!authorName.getText().isEmpty()) {
             Main.pref.put("lastAuthorName", authorName.getText());