Changeset 29854 in osm for applications/editors/josm/plugins/sds/src/org

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

Location:

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds

Files:

• SdsConnection.java (modified) (1 diff)
• SdsCredentialAgent.java (modified) (2 diffs)
• SdsDiskAccessAction.java (modified) (2 diffs)
• SdsLoadAction.java (modified) (3 diffs)
• SdsMenu.java (modified) (1 diff)
• SdsSaveAction.java (modified) (2 diffs)
• WritePostprocessor.java (modified) (1 diff)

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsConnection.java

@@ -2 +2 @@
 package org.openstreetmap.hot.sds;
 
+import java.net.Authenticator.RequestorType;
 import java.net.HttpURLConnection;
-import java.net.Authenticator.RequestorType;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java

@@ -5 +5 @@
 
 import java.awt.Component;
+import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
-import java.net.Authenticator.RequestorType;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 import javax.swing.text.html.HTMLEditorKit;
@@ -18 +18 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.io.auth.AbstractCredentialsAgent;
+import org.openstreetmap.josm.io.auth.CredentialsAgent;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.DiskAccessAction;
-import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -96 +95 @@
 
         File file = fc.getSelectedFile();
-        String fn = file.getPath();
 
         if (!confirmOverwrite(file))

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.FileInputStream;
@@ -16 +15 @@
 
 import javax.swing.JFileChooser;
-import javax.swing.filechooser.FileFilter;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.DiskAccessAction;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.io.OsmTransferException;
-import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -34 +29 @@
         private SeparateDataStorePlugin plugin;
 
-    @SuppressWarnings("deprecation")
-        public SdsLoadAction(SeparateDataStorePlugin p) {
-        super(tr("Load..."), "sds_load", tr("Load separate data store data from a file."),
-            null);
+    public SdsLoadAction(SeparateDataStorePlugin p) {
+        super(tr("Load..."), "sds_load", tr("Load separate data store data from a file."), null);
         plugin = p;
     }

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java

@@ -12 +12 @@
 
 import javax.swing.BorderFactory;
-import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.FileInputStream;
@@ -16 +15 @@
 import java.io.Writer;
 
-import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.SaveActionBase;
 import org.openstreetmap.josm.data.osm.IPrimitive;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.tools.Shortcut;
 
 @SuppressWarnings("serial")
 public class SdsSaveAction extends SdsDiskAccessAction {
 
-    @SuppressWarnings("deprecation")
-        public SdsSaveAction() {
+    public SdsSaveAction() {
         super(tr("Save..."), "sds_save", tr("Save the current separate data store information to a file."),
             null);

applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/WritePostprocessor.java

@@ -55 +55 @@
                 }
                 
+                sdsWriter.close();
+                
                 for (IPrimitive p : primitives) {
                         plugin.learn(p);