relations, ProgressMonitor pm)
+ throws SdsTransferException {
StringBuilder request = new StringBuilder();
@@ -268,13 +268,12 @@
}
- return sendRequest("POST", "collectshadows", request.toString(), pm ,true);
-
+ return sendRequest("POST", "collectshadows", request.toString(), pm, true);
}
private void sleepAndListen(int retry, ProgressMonitor monitor) throws SdsTransferException {
System.out.print(tr("Waiting 10 seconds ... "));
- for(int i=0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
if (monitor != null) {
- monitor.setCustomText(tr("Starting retry {0} of {1} in {2} seconds ...", getMaxRetries() - retry,getMaxRetries(), 10-i));
+ monitor.setCustomText(tr("Starting retry {0} of {1} in {2} seconds ...", getMaxRetries() - retry, getMaxRetries(), 10-i));
}
if (cancel)
@@ -282,5 +281,7 @@
try {
Thread.sleep(1000);
- } catch (InterruptedException ex) {}
+ } catch (InterruptedException ex) {
+ Main.trace(ex);
+ }
}
System.out.println(tr("OK - trying again."));
@@ -294,5 +295,5 @@
protected int getMaxRetries() {
int ret = Main.pref.getInteger("osm-server.max-num-retries", DEFAULT_MAX_NUM_RETRIES);
- return Math.max(ret,0);
+ return Math.max(ret, 0);
}
@@ -301,5 +302,6 @@
}
- private String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor, boolean doAuth) throws SdsTransferException {
+ private String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor, boolean doAuth)
+ throws SdsTransferException {
return sendRequest(requestMethod, urlSuffix, requestBody, monitor, doAuth, false);
}
@@ -334,14 +336,15 @@
* been exhausted), or rewrapping a Java exception.
*/
- private String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor, boolean doAuthenticate, boolean fastFail) throws SdsTransferException {
+ private String sendRequest(String requestMethod, String urlSuffix, String requestBody, ProgressMonitor monitor,
+ boolean doAuthenticate, boolean fastFail) throws SdsTransferException {
StringBuffer responseBody = new StringBuffer();
int retries = getMaxRetries();
- while(true) { // the retry loop
+ while (true) { // the retry loop
try {
URL url = new URL(new URL(getBaseUrl()), urlSuffix);
System.out.print(requestMethod + " " + url + "... ");
- activeConnection = (HttpURLConnection)url.openConnection();
- activeConnection.setConnectTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.connect",15)*1000);
+ activeConnection = (HttpURLConnection) url.openConnection();
+ activeConnection.setConnectTimeout(fastFail ? 1000 : Main.pref.getInteger("socket.timeout.connect", 15)*1000);
activeConnection.setRequestMethod(requestMethod);
if (doAuthenticate) {
@@ -375,5 +378,5 @@
if (retries-- > 0) {
sleepAndListen(retries, monitor);
- System.out.println(tr("Starting retry {0} of {1}.", getMaxRetries() - retries,getMaxRetries()));
+ System.out.println(tr("Starting retry {0} of {1}.", getMaxRetries() - retries, getMaxRetries()));
continue;
}
@@ -398,5 +401,5 @@
BufferedReader in = new BufferedReader(new InputStreamReader(i));
String s;
- while((s = in.readLine()) != null) {
+ while ((s = in.readLine()) != null) {
responseBody.append(s);
responseBody.append("\n");
@@ -408,11 +411,11 @@
errorHeader = activeConnection.getHeaderField("Error");
System.err.println("Error header: " + errorHeader);
- } else if (retCode != 200 && responseBody.length()>0) {
+ } else if (retCode != 200 && responseBody.length() > 0) {
System.err.println("Error body: " + responseBody);
}
activeConnection.disconnect();
- errorHeader = errorHeader == null? null : errorHeader.trim();
- String errorBody = responseBody.length() == 0? null : responseBody.toString().trim();
+ errorHeader = errorHeader == null ? null : errorHeader.trim();
+ String errorBody = responseBody.length() == 0 ? null : responseBody.toString().trim();
switch(retCode) {
case HttpURLConnection.HTTP_OK:
@@ -435,7 +438,7 @@
}
throw new SdsTransferException(e);
- } catch(IOException e){
+ } catch (IOException e) {
throw new SdsTransferException(e);
- } catch(SdsTransferException e) {
+ } catch (SdsTransferException e) {
throw e;
}
@@ -449,10 +452,10 @@
try {
url = new URL(urlStr.replace(" ", "%20"));
- } catch(MalformedURLException e) {
+ } catch (MalformedURLException e) {
throw new SdsTransferException(e);
}
try {
- activeConnection = (HttpURLConnection)url.openConnection();
- } catch(Exception e) {
+ activeConnection = (HttpURLConnection) url.openConnection();
+ } catch (Exception e) {
throw new SdsTransferException(tr("Failed to open connection to API {0}.", url.toExternalForm()), e);
}
@@ -470,5 +473,5 @@
}
- activeConnection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
+ activeConnection.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect", 15)*1000);
try {
@@ -481,5 +484,5 @@
try {
if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
- throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED,null,null);
+ throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED, null, null);
if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_PROXY_AUTH)
@@ -490,17 +493,15 @@
String errorHeader = activeConnection.getHeaderField("Error");
StringBuilder errorBody = new StringBuilder();
- try
- {
+ try {
InputStream i = FixEncoding(activeConnection.getErrorStream(), encoding);
if (i != null) {
BufferedReader in = new BufferedReader(new InputStreamReader(i));
String s;
- while((s = in.readLine()) != null) {
+ while ((s = in.readLine()) != null) {
errorBody.append(s);
errorBody.append("\n");
}
}
- }
- catch(Exception e) {
+ } catch (Exception e) {
errorBody.append(tr("Reading error text failed."));
}
@@ -510,7 +511,7 @@
return FixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
- } catch(Exception e) {
+ } catch (Exception e) {
if (e instanceof SdsTransferException)
- throw (SdsTransferException)e;
+ throw (SdsTransferException) e;
else
throw new SdsTransferException(e);
@@ -522,15 +523,11 @@
}
- private InputStream FixEncoding(InputStream stream, String encoding) throws IOException
- {
+ private InputStream FixEncoding(InputStream stream, String encoding) throws IOException {
if (encoding != null && encoding.equalsIgnoreCase("gzip")) {
stream = new GZIPInputStream(stream);
- }
- else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
+ } else if (encoding != null && encoding.equalsIgnoreCase("deflate")) {
stream = new InflaterInputStream(stream, new Inflater(true));
}
return stream;
}
-
-
}
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsConnection.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsConnection.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsConnection.java (revision 32703)
@@ -1,3 +1,3 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -7,4 +7,5 @@
import java.util.Base64;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
@@ -13,13 +14,13 @@
* Base class that handles common things like authentication for the reader and writer
* to the SDS server.
- *
+ *
* Modeled after JOSM's OsmConnection class.
*/
public class SdsConnection {
-
+
protected boolean cancel = false;
protected HttpURLConnection activeConnection;
private SdsCredentialAgent credAgent = new SdsCredentialAgent();
-
+
/**
* Initialize the http defaults and the authenticator.
@@ -44,4 +45,5 @@
Thread.sleep(100);
} catch (InterruptedException ex) {
+ Main.trace(ex);
}
@@ -63,5 +65,6 @@
String token;
try {
- response = credAgent.getCredentials(RequestorType.SERVER, con.getURL().getHost(), false /* don't know yet whether the credentials will succeed */);
+ response = credAgent.getCredentials(RequestorType.SERVER, con.getURL().getHost(),
+ false /* don't know yet whether the credentials will succeed */);
} catch (CredentialsAgentException e) {
throw new SdsTransferException(e);
@@ -73,5 +76,5 @@
return;
} else {
- String username= response.getUsername() == null ? "" : response.getUsername();
+ String username = response.getUsername() == null ? "" : response.getUsername();
String password = response.getPassword() == null ? "" : String.valueOf(response.getPassword());
token = username + ":" + password;
@@ -88,5 +91,4 @@
*
* @return true if this connection is canceled
- * @return
*/
public boolean isCanceled() {
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialAgent.java (revision 32703)
@@ -23,5 +23,5 @@
/**
- * Factored after JOSM's JosmPreferencesCredentialAgent.
+ * Factored after JOSM's JosmPreferencesCredentialAgent.
*/
public class SdsCredentialAgent extends AbstractCredentialsAgent {
@@ -33,5 +33,5 @@
*/
@Override
- public PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException{
+ public PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException {
if (requestorType == null)
return null;
@@ -101,6 +101,8 @@
public Component getPreferencesDecorationPanel() {
HtmlPanel pnlMessage = new HtmlPanel();
- HTMLEditorKit kit = (HTMLEditorKit)pnlMessage.getEditorPane().getEditorKit();
- kit.getStyleSheet().addRule(".warning-body {background-color:rgb(253,255,221);padding: 10pt; border-color:rgb(128,128,128);border-style: solid;border-width: 1px;}");
+ HTMLEditorKit kit = (HTMLEditorKit) pnlMessage.getEditorPane().getEditorKit();
+ kit.getStyleSheet().addRule(
+ ".warning-body {background-color:rgb(253,255,221);padding: 10pt; " +
+ "border-color:rgb(128,128,128);border-style: solid;border-width: 1px;}");
pnlMessage.setText(
tr(
@@ -114,5 +116,5 @@
return pnlMessage;
}
-
+
@Override
public String getSaveUsernameAndPasswordCheckboxText() {
@@ -124,12 +126,13 @@
throws CredentialsAgentException {
// no-op
-
- }
-
- @Override
- public CredentialsAgentResponse getCredentials(RequestorType requestorType, String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
+
+ }
+
+ @Override
+ public CredentialsAgentResponse getCredentials(RequestorType requestorType, String host, boolean noSuccessWithLastResponse)
+ throws CredentialsAgentException {
if (requestorType == null)
return null;
- PasswordAuthentication credentials = lookup(requestorType, host);
+ PasswordAuthentication credentials = lookup(requestorType, host);
String username = (credentials == null || credentials.getUserName() == null) ? "" : credentials.getUserName();
String password = (credentials == null || credentials.getPassword() == null) ? "" : String.valueOf(credentials.getPassword());
@@ -158,6 +161,10 @@
CredentialDialog dialog = null;
switch(requestorType) {
- case SERVER: dialog = SdsCredentialDialog.getSdsApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
- case PROXY: dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
+ case SERVER:
+ dialog = SdsCredentialDialog.getSdsApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
+ break;
+ case PROXY:
+ dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
+ break;
}
dialog.setVisible(true);
@@ -190,4 +197,4 @@
return response;
}
-
+
}
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialDialog.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialDialog.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsCredentialDialog.java (revision 32703)
@@ -11,5 +11,6 @@
public class SdsCredentialDialog extends CredentialDialog {
- static public SdsCredentialDialog getSdsApiCredentialDialog(String username, String password, String host, String saveUsernameAndPasswordCheckboxText) {
+ public static SdsCredentialDialog getSdsApiCredentialDialog(String username, String password, String host,
+ String saveUsernameAndPasswordCheckboxText) {
SdsCredentialDialog dialog = new SdsCredentialDialog(saveUsernameAndPasswordCheckboxText);
dialog.prepareForSdsApiCredentials(username, password);
@@ -23,5 +24,5 @@
super(saveUsernameAndPasswordCheckboxText);
}
-
+
public void prepareForSdsApiCredentials(String username, String password) {
setTitle(tr("Enter credentials for Separate Data Store API"));
@@ -30,5 +31,5 @@
validate();
}
-
+
private static class SdsApiCredentialsPanel extends CredentialPanel {
@@ -44,9 +45,8 @@
}
- public SdsApiCredentialsPanel(SdsCredentialDialog owner) {
+ SdsApiCredentialsPanel(SdsCredentialDialog owner) {
super(owner);
build();
}
}
-
- }
+}
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsDiskAccessAction.java (revision 32703)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -16,5 +17,5 @@
@SuppressWarnings("serial")
public abstract class SdsDiskAccessAction extends DiskAccessAction {
-
+
public SdsDiskAccessAction(String name, String iconName, String tooltip,
Shortcut shortcut) {
@@ -35,9 +36,16 @@
fc.setMultiSelectionEnabled(multiple);
fc.setAcceptAllFileFilterUsed(false);
-
+
fc.setFileFilter(new FileFilter() {
- public boolean accept(File pathname) { return pathname.getName().endsWith(".sds") || pathname.isDirectory(); }
- public String getDescription() { return (tr("SDS data file")); }
- });
+ @Override
+ public boolean accept(File pathname) {
+ return pathname.getName().endsWith(".sds") || pathname.isDirectory();
+ }
+
+ @Override
+ public String getDescription() {
+ return (tr("SDS data file"));
+ }
+ });
int answer = open ? fc.showOpenDialog(Main.parent) : fc.showSaveDialog(Main.parent);
@@ -81,10 +89,17 @@
fc.setMultiSelectionEnabled(false);
fc.setAcceptAllFileFilterUsed(false);
-
+
fc.setFileFilter(new FileFilter() {
- public boolean accept(File pathname) { return pathname.getName().endsWith(".sds") || pathname.isDirectory(); }
- public String getDescription() { return (tr("SDS data file")); }
- });
-
+ @Override
+ public boolean accept(File pathname) {
+ return pathname.getName().endsWith(".sds") || pathname.isDirectory();
+ }
+
+ @Override
+ public String getDescription() {
+ return (tr("SDS data file"));
+ }
+ });
+
int answer = fc.showSaveDialog(Main.parent);
if (answer != JFileChooser.APPROVE_OPTION)
@@ -101,5 +116,5 @@
return file;
}
-
+
public static boolean confirmOverwrite(File file) {
if (file == null || (file.exists())) {
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsLoadAction.java (revision 32703)
@@ -1,3 +1,3 @@
-//License: GPL.
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -26,5 +26,5 @@
@SuppressWarnings("serial")
public class SdsLoadAction extends SdsDiskAccessAction {
-
+
private SeparateDataStorePlugin plugin;
@@ -33,5 +33,6 @@
plugin = p;
}
-
+
+ @Override
public void actionPerformed(ActionEvent e) {
SwingFileChooser fc = createAndOpenFileChooser(true, true, null);
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java (revision 32703)
@@ -1,3 +1,3 @@
-//License: GPL. See README for details.
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -52,5 +52,5 @@
aboutItem = new JMenuItem(new SdsAboutAction());
menu.add(aboutItem);
-
+
Main.getLayerManager().addLayerChangeListener(this);
Main.getLayerManager().addActiveLayerChangeListener(this);
@@ -63,7 +63,9 @@
saveItem.setEnabled(en);
}
-
+
@Override
- public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) { setEnabledState(); }
+ public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
+ setEnabledState();
+ }
@Override
@@ -71,15 +73,20 @@
@Override
- public void layerAdded(LayerAddEvent e) { setEnabledState(); }
+ public void layerAdded(LayerAddEvent e) {
+ setEnabledState();
+ }
@Override
- public void layerRemoving(LayerRemoveEvent e) { setEnabledState(); }
+ public void layerRemoving(LayerRemoveEvent e) {
+ setEnabledState();
+ }
private class SdsAboutAction extends JosmAction {
- public SdsAboutAction() {
+ SdsAboutAction() {
super(tr("About"), "sds", tr("Information about SDS."), null, true);
}
+ @Override
public void actionPerformed(ActionEvent e) {
JPanel about = new JPanel();
@@ -89,22 +96,25 @@
l.setWrapStyleWord(true);
l.setEditable(false);
- l.setText("Separate Data Store\n\nThis plugin provides access to a \"Separate Data Store\" server. " +
- "Whenever data is loaded from the OSM API, it queries the SDS for additional tags that have been stored for the objects just loaded, " +
- "and adds these tags. When you upload data to JOSM, SDS tags will again be separated and, instead of sending them to OSM, they will be uplaoded to SDS." +
- "\n\n" +
- "This depends on SDS tags starting with a special prefix, which can be configured in the SDS preferences." +
- "\n\n" +
- "Using the SDS server will usually require an account to be set up there, which is completely independent of your OSM account.");
-
- l.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+ l.setText(
+ "Separate Data Store\n\nThis plugin provides access to a \"Separate Data Store\" server. " +
+ "Whenever data is loaded from the OSM API, " +
+ "it queries the SDS for additional tags that have been stored for the objects just loaded, " +
+ "and adds these tags. When you upload data to JOSM, SDS tags will again be separated and, " +
+ "instead of sending them to OSM, they will be uploaded to SDS." +
+ "\n\n" +
+ "This depends on SDS tags starting with a special prefix, which can be configured in the SDS preferences." +
+ "\n\n" +
+ "Using the SDS server will usually require an account to be set up there, which is completely independent of your OSM account.");
+
+ l.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
l.setOpaque(false);
- l.setPreferredSize(new Dimension(500,300));
+ l.setPreferredSize(new Dimension(500, 300));
JScrollPane sp = new JScrollPane(l);
sp.setBorder(null);
sp.setOpaque(false);
-
+
about.add(sp);
-
- about.setPreferredSize(new Dimension(500,300));
+
+ about.setPreferredSize(new Dimension(500, 300));
JOptionPane.showMessageDialog(Main.parent, about, tr("About SDS..."),
@@ -112,6 +122,6 @@
}
}
-
- private class SdsPreferencesAction extends JosmAction implements Runnable {
+
+ private final class SdsPreferencesAction extends JosmAction implements Runnable {
private SdsPreferencesAction() {
@@ -124,11 +134,13 @@
* Launch the preferences dialog.
*/
+ @Override
public void actionPerformed(ActionEvent e) {
run();
}
+ @Override
public void run() {
PreferenceDialog pd = new PreferenceDialog(Main.parent);
- // unusual reflection mechanism to cater for older JOSM versions where
+ // unusual reflection mechanism to cater for older JOSM versions where
// the selectPreferencesTabByName method was not public
try {
@@ -136,10 +148,8 @@
sptbn.invoke(pd, "sds");
} catch (Exception ex) {
- // ignore
+ Main.trace(ex);
}
pd.setVisible(true);
}
}
-
-
}
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsOsmWriter.java (revision 32703)
@@ -1,3 +1,3 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -17,9 +17,9 @@
* sure that special tags are never written to JOSM's standard
* output channels.
- *
+ *
* In the context of HOT's separate data store, this is very
* important as otherwise private/confidential information could
* end up on public servers.
- *
+ *
* @author Frederik Ramm
*
@@ -28,5 +28,5 @@
private SeparateDataStorePlugin plugin;
-
+
public SdsOsmWriter(SeparateDataStorePlugin plugin, PrintWriter out, boolean osmConform, String version) {
super(out, osmConform, version);
@@ -45,5 +45,5 @@
String key = e.getKey();
if (!(osm instanceof Changeset) && ("created_by".equals(key))) continue;
- if (key.startsWith(plugin.getIgnorePrefix())) continue;
+ if (key.startsWith(plugin.getIgnorePrefix())) continue;
out.println(" ");
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsParser.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsParser.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsParser.java (revision 32703)
@@ -11,5 +11,5 @@
/**
* Parser for answers from SDS. These anwers look like this:
- *
+ *
*
@@ -24,11 +24,10 @@
* @author Frederik Ramm
*/
-public class SdsParser extends DefaultHandler
-{
+public class SdsParser extends DefaultHandler {
private DataSet dataSet;
private OsmPrimitive currentPrimitive;
private SeparateDataStorePlugin plugin;
private boolean ensureMatch;
-
+
public SdsParser(DataSet ds, SeparateDataStorePlugin p, boolean ensureMatch) {
this.dataSet = ds;
@@ -36,11 +35,10 @@
this.ensureMatch = ensureMatch;
}
-
+
public SdsParser(DataSet ds, SeparateDataStorePlugin p) {
this(ds, p, true);
}
-
- @Override public void endElement(String namespaceURI, String localName, String qName)
- {
+
+ @Override public void endElement(String namespaceURI, String localName, String qName) {
// after successfully reading a full set of tags from the separate data store,
// update it in our cache so we can determine changes later.
@@ -49,17 +47,14 @@
}
}
- @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException
- {
- if ("osm_shadow".equals(qName))
- {
+
+ @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+ if ("osm_shadow".equals(qName)) {
String type = atts.getValue("osm_type");
- String id = atts.getValue("osm_id");
+ String id = atts.getValue("osm_id");
currentPrimitive = dataSet.getPrimitiveById(Long.parseLong(id), OsmPrimitiveType.fromApiTypeName(type));
if (currentPrimitive == null && ensureMatch) {
throw new SAXException("unexpected object in response");
}
- }
- else if ("tag".equals(qName))
- {
+ } else if ("tag".equals(qName)) {
String v = atts.getValue("v");
String k = atts.getValue("k");
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsPluginPreferences.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsPluginPreferences.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsPluginPreferences.java (revision 32703)
@@ -1,2 +1,3 @@
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -33,12 +34,13 @@
private final JPasswordField password = new JPasswordField(8);
private final JTextField prefix = new JTextField(8);
-
+
public SdsPluginPreferences() {
super("sds", tr("Separate Data Store"), tr("Configures access to the Separate Data Store."));
}
+
@Override
public void addGui(final PreferenceTabbedPane gui) {
final JPanel tab = gui.createPreferenceTab(this);
-
+
final JPanel access = new JPanel(new GridBagLayout());
access.setBorder(BorderFactory.createTitledBorder(tr("Server")));
@@ -54,23 +56,24 @@
access.add(new JLabel(tr("SDS server URL")), GBC.std());
- access.add(server, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+ access.add(server, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
access.add(new JLabel(tr("SDS username")), GBC.std());
- access.add(username, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+ access.add(username, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
access.add(new JLabel(tr("SDS password")), GBC.std());
- access.add(password, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+ access.add(password, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
JButton test = new JButton(tr("Test credentials now"));
- access.add(test, GBC.eol().anchor(GBC.EAST).insets(5,0,0,5));
+ access.add(test, GBC.eol().anchor(GBC.EAST).insets(5, 0, 0, 5));
tab.add(access, GBC.eol().fill(GBC.HORIZONTAL));
tab.add(new JLabel(tr("SDS tag prefix")), GBC.std());
- tab.add(prefix, GBC.eol().fill(GBC.HORIZONTAL).insets(5,0,0,5));
+ tab.add(prefix, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 0, 0, 5));
tab.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.VERTICAL));
test.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ev) {
SdsApi api = new SdsApi(server.getText());
@@ -87,13 +90,13 @@
JOptionPane.PLAIN_MESSAGE
);
- } catch(Exception ex) {
+ } catch (Exception ex) {
JOptionPane.showMessageDialog(
Main.parent,
- tr("Cannot connect to SDS server: ") + ex.getMessage(),
+ tr("Cannot connect to SDS server: ") + ex.getMessage(),
tr("Error"),
JOptionPane.ERROR_MESSAGE
);
}
- // restore old credentials even if successful; user might still
+ // restore old credentials even if successful; user might still
// choose to press cancel!
Main.pref.put(SDS_USERNAME, olduser);
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java (revision 32703)
@@ -1,3 +1,3 @@
-//License: GPL.
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsWriter.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsWriter.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsWriter.java (revision 32703)
@@ -1,3 +1,3 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -24,9 +24,10 @@
out.print("");
}
+
public void footer() {
out.println("");
}
- public void write(IPrimitive what, Map tags) {
+ public void write(IPrimitive what, Map tags) {
out.print("");
-
+
if (tags != null) {
- for(Entry e : tags.entrySet()) {
+ for (Entry e : tags.entrySet()) {
out.println(" ");
}
}
-
+
out.println("");
}
+ @Override
public void close() {
out.close();
Index: /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java
===================================================================
--- /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java (revision 32702)
+++ /applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SeparateDataStorePlugin.java (revision 32703)
@@ -1,3 +1,3 @@
-// License: GPL. See LICENSE file for details.
+// License: GPL. For details, see LICENSE file.
package org.openstreetmap.hot.sds;
@@ -24,27 +24,37 @@
* Plugin that loads extra data from HOT separate data store.
*
- * @author Frederik Ramm
+ * @author Frederik Ramm <frederik.ramm@geofabrik.de>
*/
-public class SeparateDataStorePlugin extends Plugin
-{
+public class SeparateDataStorePlugin extends Plugin {
public HashMap originalNodes = new HashMap<>();
public HashMap originalWays = new HashMap<>();
public HashMap originalRelations = new HashMap<>();
-
+
public ArrayList uploadQueue = new ArrayList<>();
-
+
private PrimitiveVisitor learnVisitor = new PrimitiveVisitor() {
- public void visit(INode i) { originalNodes.put(i.getId(), i); }
- public void visit(IWay i) { originalWays.put(i.getId(), i); }
- public void visit(IRelation i) { originalRelations.put(i.getId(), i); }
+ @Override
+ public void visit(INode i) {
+ originalNodes.put(i.getId(), i);
+ }
+
+ @Override
+ public void visit(IWay i) {
+ originalWays.put(i.getId(), i);
+ }
+
+ @Override
+ public void visit(IRelation i) {
+ originalRelations.put(i.getId(), i);
+ }
};
-
+
class QueueItem {
public IPrimitive primitive;
- public HashMap tags;
+ public HashMap tags;
public boolean sdsOnly;
public boolean processed;
- public QueueItem(IPrimitive p, HashMap t, boolean s) {
+ QueueItem(IPrimitive p, HashMap t, boolean s) {
primitive = p;
tags = t;
@@ -53,23 +63,22 @@
}
}
-
+
/**
* Creates the plugin
*/
- public SeparateDataStorePlugin(PluginInformation info)
- {
+ public SeparateDataStorePlugin(PluginInformation info) {
super(info);
System.out.println("initializing SDS plugin");
-
+
// this lets us see what JOSM load from the server, and augment it with our data:
OsmReader.registerPostprocessor(new ReadPostprocessor(this));
-
+
// this makes sure that our data is never written to the OSM server on a low level;
OsmWriterFactory.theFactory = new SdsOsmWriterFactory(this);
-
+
// this lets us see what JOSM is planning to upload, and prepare our own uploads
// accordingly
UploadAction.registerUploadHook(new DetermineSdsModificationsUploadHook(this));
-
+
// this lets us perform our own uploads after JOSM has succeeded:
OsmServerWriter.registerPostprocessor(new WritePostprocessor(this));
@@ -82,5 +91,5 @@
return Main.pref.get("sds-server.tag-prefix", "hot:");
}
-
+
public IPrimitive getOriginalPrimitive(IPrimitive other) {
switch (other.getType()) {
@@ -89,24 +98,23 @@
case RELATION: return originalRelations.get(other.getId());
}
- return null;
+ return null;
}
-
+
protected void enqueueForUpload(IPrimitive prim, HashMap tags, boolean onlySds) {
uploadQueue.add(new QueueItem(prim, tags, onlySds));
}
-
- /**
+
+ /**
* Stores the given primitive in the plugin's cache in order to
* determine changes later.
- * @param prim
*/
protected void learn(IPrimitive prim) {
if (prim instanceof OsmPrimitive) {
- ((OsmPrimitive)prim).save().accept(learnVisitor);
+ ((OsmPrimitive) prim).save().accept(learnVisitor);
} else {
prim.accept(learnVisitor);
}
}
-
+
/**
* removes all elements from the upload queue that have the processed flag set.
@@ -119,5 +127,5 @@
uploadQueue = newQueue;
}
-
+
/**
* reset the processed flag for all elements of the queue.
@@ -129,4 +137,5 @@
}
+ @Override
public PreferenceSetting getPreferenceSetting() {
return new SdsPluginPreferences();