Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/OdConstants.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataTask.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenLinkAction.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenLinkAction.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenLinkAction.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/ViewLicenseAction.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/ViewLicenseAction.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/ViewLicenseAction.java (revision 36072) @@ -13,4 +13,5 @@ import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils; import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.Logging; public class ViewLicenseAction extends JosmAction { @@ -30,5 +31,5 @@ new ViewLicenseDialog(license).showDialog(); } catch (IOException ex) { - ex.printStackTrace(); + Logging.error(ex); } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/AbstractDataSetHandler.java (revision 36072) @@ -80,5 +80,5 @@ private ImageIcon menuIcon; - public AbstractDataSetHandler() { + protected AbstractDataSetHandler() { setShpHandler(new DefaultShpHandler()); setArchiveHandler(new DefaultArchiveHandler()); @@ -90,8 +90,8 @@ private boolean acceptsFilename(String filename, String[] expected, String ... extensions) { if (filename != null) { - for (String name : expected) { + for (String expectedName : expected) { for (String ext : extensions) { - if (Pattern.compile(name+"\\."+ext, Pattern.CASE_INSENSITIVE).matcher(filename).matches()) { - //if (filename.equalsIgnoreCase(name+"."+ext)) { + if (Pattern.compile(expectedName+"\\."+ext, Pattern.CASE_INSENSITIVE).matcher(filename).matches()) { + //if (filename.equalsIgnoreCase(expectedName+"."+ext)) { return true; } @@ -102,65 +102,65 @@ } - protected final boolean acceptsCsvFilename(String filename, String ... expected) { + protected final boolean acceptsCsvFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.CSV_EXT); } - protected final boolean acceptsXlsFilename(String filename, String ... expected) { + protected final boolean acceptsXlsFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.XLS_EXT); } - protected final boolean acceptsOdsFilename(String filename, String ... expected) { + protected final boolean acceptsOdsFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.ODS_EXT); } - protected final boolean acceptsShpFilename(String filename, String ... expected) { + protected final boolean acceptsShpFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.SHP_EXT); } - protected final boolean acceptsMifFilename(String filename, String ... expected) { + protected final boolean acceptsMifFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.MIF_EXT); } - protected final boolean acceptsMifTabFilename(String filename, String ... expected) { + protected final boolean acceptsMifTabFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.MIF_EXT, OdConstants.TAB_EXT); } - protected final boolean acceptsShpMifFilename(String filename, String ... expected) { + protected final boolean acceptsShpMifFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.SHP_EXT, OdConstants.MIF_EXT); } - protected final boolean acceptsKmlFilename(String filename, String ... expected) { + protected final boolean acceptsKmlFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.KML_EXT); } - protected final boolean acceptsKmzFilename(String filename, String ... expected) { + protected final boolean acceptsKmzFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.KMZ_EXT); } - protected final boolean acceptsKmzShpFilename(String filename, String ... expected) { + protected final boolean acceptsKmzShpFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.KMZ_EXT, OdConstants.SHP_EXT); } - protected final boolean acceptsKmzTabFilename(String filename, String ... expected) { + protected final boolean acceptsKmzTabFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.KMZ_EXT, OdConstants.TAB_EXT); } - protected final boolean acceptsZipFilename(String filename, String ... expected) { + protected final boolean acceptsZipFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.ZIP_EXT); } - protected final boolean accepts7ZipFilename(String filename, String ... expected) { + protected final boolean accepts7ZipFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.SEVENZIP_EXT); } - protected final boolean acceptsCsvKmzFilename(String filename, String ... expected) { + protected final boolean acceptsCsvKmzFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.CSV_EXT, OdConstants.KMZ_EXT); } - protected final boolean acceptsCsvKmzTabFilename(String filename, String ... expected) { + protected final boolean acceptsCsvKmzTabFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.CSV_EXT, OdConstants.KMZ_EXT, OdConstants.TAB_EXT); } - protected final boolean acceptsCsvXlsFilename(String filename, String ... expected) { + protected final boolean acceptsCsvXlsFilename(String filename, String... expected) { return acceptsFilename(filename, expected, OdConstants.CSV_EXT, OdConstants.XLS_EXT); } @@ -544,9 +544,9 @@ public final boolean addTool(JosmAction tool) { - return tool != null ? tools.add(tool) : false; + return tool != null && tools.add(tool); } public final boolean removeTool(JosmAction tool) { - return tool != null ? tools.remove(tool) : false; + return tool != null && tools.remove(tool); } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetCategory.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetCategory.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetCategory.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/NationalHandlers.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/NationalHandlers.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/NationalHandlers.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/SimpleDataSetHandler.java (revision 36072) @@ -33,9 +33,9 @@ private final boolean relevantUnion; - public SimpleDataSetHandler() { + protected SimpleDataSetHandler() { this.relevantUnion = false; } - public SimpleDataSetHandler(String relevantTag) { + protected SimpleDataSetHandler(String relevantTag) { addRelevantTag(relevantTag); this.relevantUnion = false; @@ -51,44 +51,44 @@ } - public SimpleDataSetHandler(boolean relevantUnion, String... relevantTags) { + protected SimpleDataSetHandler(boolean relevantUnion, String... relevantTags) { addRelevantTag(relevantTags); this.relevantUnion = relevantUnion; } - public SimpleDataSetHandler(String... relevantTags) { + protected SimpleDataSetHandler(String... relevantTags) { this(false, relevantTags); } - public SimpleDataSetHandler(Tag relevantTag) { + protected SimpleDataSetHandler(Tag relevantTag) { addRelevantTag(relevantTag); this.relevantUnion = false; } - public SimpleDataSetHandler(boolean relevantUnion, Tag ... relevantTags) { + protected SimpleDataSetHandler(boolean relevantUnion, Tag ... relevantTags) { addRelevantTag(relevantTags); this.relevantUnion = relevantUnion; } - public SimpleDataSetHandler(Tag ... relevantTags) { + protected SimpleDataSetHandler(Tag... relevantTags) { this(false, relevantTags); } - public void addRelevantTag(String ... relevantTags) { + public void addRelevantTag(String... relevantTags) { addTags(this.relevantTags, relevantTags); } - public void addRelevantTag(Tag ... relevantTags) { + public void addRelevantTag(Tag... relevantTags) { addTags(this.relevantTags, relevantTags); } - public void addForbiddenTag(String ... forbiddenTags) { + public void addForbiddenTag(String... forbiddenTags) { addTags(this.forbiddenTags, forbiddenTags); } - public void addForbiddenTag(Tag ... forbiddenTags) { + public void addForbiddenTag(Tag... forbiddenTags) { addTags(this.forbiddenTags, forbiddenTags); } - private void addTags(final List list, String ... tags) { + private static void addTags(final List list, String... tags) { if (tags != null) { for (String tag : tags) { @@ -105,5 +105,5 @@ } - private void addTags(final List list, Tag ... tags) { + private static void addTags(final List list, Tag... tags) { if (tags != null) { for (Tag tag : tags) { @@ -133,8 +133,5 @@ } } - if (isForbidden(p)) { - return false; - } - return true; + return !isForbidden(p); } @@ -166,7 +163,5 @@ String[] mpconditions = new String[conditions.length+1]; mpconditions[0] = OverpassApi.hasKey("type", "multipolygon"); - for (int i = 0; i < conditions.length; i++) { - mpconditions[i+1] = conditions[i]; - } + System.arraycopy(conditions, 0, mpconditions, 1, conditions.length); return OverpassApi.query(bbox, NODE, conditions) + "\n" + // Nodes OverpassApi.recurse(NODE_RELATION, RELATION_WAY, WAY_NODE) + "\n" + @@ -194,13 +189,13 @@ @Override protected Collection getOsmXapiRequests(String bbox) { - String relevantTags = ""; - for (Tag tag : this.relevantTags) { - relevantTags += "["+tag.getKey()+"="+(tag.getValue() == null ? "*" : tag.getValue())+"]"; - } - String forbiddenTags = ""; + StringBuilder relevantTagsSB = new StringBuilder(); + for (Tag tag : this.relevantTags) { + relevantTagsSB.append("[").append(tag.getKey()).append("=").append(tag.getValue() == null ? "*" : tag.getValue()).append("]"); + } + StringBuilder forbiddenTagsSB = new StringBuilder(); for (Tag tag : this.forbiddenTags) { - forbiddenTags += "[not("+tag.getKey()+"="+(tag.getValue() == null ? "*" : tag.getValue())+")]"; - } - return Collections.singleton("*[bbox="+bbox+"]"+relevantTags+forbiddenTags+"[@meta]"); + forbiddenTagsSB.append("[not(").append(tag.getKey()).append("=").append(tag.getValue() == null ? "*" : tag.getValue()).append(")]"); + } + return Collections.singleton("*[bbox="+bbox+"]"+relevantTagsSB+forbiddenTagsSB+"[@meta]"); } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java (revision 36072) @@ -33,5 +33,5 @@ } - protected static Way getTargetWay(Collection combinedWays) { + private static Way getTargetWay(Collection combinedWays) { // init with an arbitrary way Way targetWay = combinedWays.iterator().next(); Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianConstants.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianConstants.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianConstants.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianGmlHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianGmlHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/at/AustrianGmlHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianConstants.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianConstants.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianConstants.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java (revision 36072) @@ -12,6 +12,8 @@ import org.openstreetmap.josm.plugins.opendata.core.OdConstants; import org.openstreetmap.josm.plugins.opendata.core.datasets.SimpleDataSetHandler; +import org.openstreetmap.josm.plugins.opendata.core.io.tabular.CsvHandler; import org.openstreetmap.josm.plugins.opendata.core.io.tabular.DefaultCsvHandler; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.Logging; public abstract class BelgianDataSetHandler extends SimpleDataSetHandler implements BelgianConstants { @@ -52,19 +54,19 @@ } - public BelgianDataSetHandler() { + protected BelgianDataSetHandler() { init(); } - public BelgianDataSetHandler(String relevantTag) { + protected BelgianDataSetHandler(String relevantTag) { super(relevantTag); init(); } - public BelgianDataSetHandler(boolean relevantUnion, String[] relevantTags) { + protected BelgianDataSetHandler(boolean relevantUnion, String[] relevantTags) { super(relevantUnion, relevantTags); init(); } - public BelgianDataSetHandler(boolean relevantUnion, Tag[] relevantTags) { + protected BelgianDataSetHandler(boolean relevantUnion, Tag[] relevantTags) { super(relevantUnion, relevantTags); init(); @@ -85,5 +87,8 @@ protected final void setSingleProjection(Projection singleProjection) { this.singleProjection = singleProjection; - getCsvHandler().setHandlesProjection(singleProjection != null); + final CsvHandler handler = getCsvHandler(); + if (handler != null) { + handler.setHandlesProjection(singleProjection != null); + } } @@ -108,5 +113,5 @@ return new URL(BELGIAN_PORTAL.replace(OdConstants.PATTERN_LANG, lang.substring(0, 2))+nationalPortalPath); //FIXME } catch (MalformedURLException e) { - e.printStackTrace(); + Logging.error(e); } return null; Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchAdministrativeUnit.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchAdministrativeUnit.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchAdministrativeUnit.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchConstants.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java (revision 36072) @@ -18,4 +18,5 @@ import org.openstreetmap.josm.plugins.opendata.core.datasets.SimpleDataSetHandler; import org.openstreetmap.josm.plugins.opendata.core.io.tabular.DefaultCsvHandler; +import org.openstreetmap.josm.tools.Logging; public abstract class FrenchDataSetHandler extends SimpleDataSetHandler implements FrenchConstants { @@ -71,19 +72,19 @@ } - public FrenchDataSetHandler() { - init(); - } - - public FrenchDataSetHandler(String relevantTag) { + protected FrenchDataSetHandler() { + init(); + } + + protected FrenchDataSetHandler(String relevantTag) { super(relevantTag); init(); } - public FrenchDataSetHandler(boolean relevantUnion, String[] relevantTags) { + protected FrenchDataSetHandler(boolean relevantUnion, String[] relevantTags) { super(relevantUnion, relevantTags); init(); } - public FrenchDataSetHandler(boolean relevantUnion, Tag[] relevantTags) { + protected FrenchDataSetHandler(boolean relevantUnion, Tag[] relevantTags) { super(relevantUnion, relevantTags); init(); @@ -110,5 +111,5 @@ } } catch (MalformedURLException e) { - e.printStackTrace(); + Logging.error(e); } return null; @@ -125,5 +126,5 @@ } - protected static final LatLon getLatLonByDptCode(EastNorth en, String dpt, boolean useCC9) { + protected static LatLon getLatLonByDptCode(EastNorth en, String dpt, boolean useCC9) { // CHECKSTYLE.OFF: LineLength if (dpt.equals("971") || dpt.equals("972") || dpt.equals("977") || dpt.equals("978")) { // Antilles @@ -161,5 +162,5 @@ } - private void replaceFaxPhone(OsmPrimitive p, String dataKey, String osmKey) { + private static void replaceFaxPhone(OsmPrimitive p, String dataKey, String osmKey) { String phone = p.get(dataKey); if (phone != null) { @@ -204,12 +205,12 @@ Matcher m2 = Pattern.compile(dayGroup+"(?:"+sep+dayGroup+")+").matcher(range); if (m2.matches()) { - String replacement = ""; + StringBuilder replacement = new StringBuilder(); for (int i = 0; i < m2.groupCount(); i++) { if (i > 0) { - replacement += sep; + replacement.append(sep); } - replacement += getEnDay(m2.group(i+1)); + replacement.append(getEnDay(m2.group(i + 1))); } - hours = hours.replace(range, replacement); + hours = hours.replace(range, replacement.toString()); } } else { @@ -223,5 +224,5 @@ } - private String getEnDay(String frDay) { + private static String getEnDay(String frDay) { for (int i = 0; i < dayFrSplit.length; i++) { if (dayFrSplit[i].equals(frDay)) { Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchShpHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchShpHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchShpHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/AskLicenseAgreementDialog.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/AskLicenseAgreementDialog.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/AskLicenseAgreementDialog.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ChooserLauncher.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ChooserLauncher.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ChooserLauncher.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/DialogPrompter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/DialogPrompter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/DialogPrompter.java (revision 36072) @@ -2,9 +2,6 @@ package org.openstreetmap.josm.plugins.opendata.core.gui; -import java.lang.reflect.InvocationTargetException; - -import javax.swing.SwingUtilities; - import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.util.GuiHelper; public class DialogPrompter implements Runnable { @@ -41,15 +38,5 @@ public final DialogPrompter promptInEdt() { - if (SwingUtilities.isEventDispatchThread()) { - run(); - } else { - try { - SwingUtilities.invokeAndWait(this); - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } + GuiHelper.runInEDTAndWait(this); return this; } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModuleListPanel.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModuleListPanel.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModuleListPanel.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreference.java (revision 36072) @@ -17,5 +17,4 @@ import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -101,5 +100,5 @@ * by the user */ - private boolean modulePreferencesActivated = false; + private boolean modulePreferencesActivated; protected JPanel buildSearchFieldPanel() { @@ -116,5 +115,6 @@ gc.gridx = 1; gc.weightx = 1.0; - pnl.add(tfFilter = new JTextField(), gc); + this.tfFilter = new JTextField(); + pnl.add(this.tfFilter, gc); tfFilter.setToolTipText(tr("Enter a search expression")); SelectAllOnFocusGainedDecorator.decorate(tfFilter); @@ -332,5 +332,5 @@ model.refreshLocalModuleVersion(moduleDownloadTask.getDownloadedModules()); model.clearPendingModules(moduleDownloadTask.getDownloadedModules()); - GuiHelper.runInEDT(() -> pnlModulePreferences.refreshView()); + GuiHelper.runInEDT(pnlModulePreferences::refreshView); }; @@ -343,11 +343,5 @@ // select modules which actually have to be updated // - Iterator it = toUpdate.iterator(); - while (it.hasNext()) { - ModuleInformation pi = it.next(); - if (!pi.isUpdateRequired()) { - it.remove(); - } - } + toUpdate.removeIf(pi -> !pi.isUpdateRequired()); if (toUpdate.isEmpty()) { alertNothingToUpdate(); @@ -387,5 +381,5 @@ */ class ModulePreferenceActivationListener implements ChangeListener { - private Component pane; + private final Component pane; ModulePreferenceActivationListener(Component preferencesPane) { pane = preferencesPane; @@ -409,5 +403,5 @@ public void filter() { String expr = tfFilter.getText().trim(); - if (expr.equals("")) { + if ("".equals(expr)) { expr = null; } @@ -514,5 +508,5 @@ ret.add(model.get(i)); } - return ret; + return Collections.unmodifiableList(ret); } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreferencesModel.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreferencesModel.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ModulePreferencesModel.java (revision 36072) @@ -160,5 +160,4 @@ return displayedModules; } - /** Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java (revision 36072) @@ -57,5 +57,5 @@ } - private class SelectAction extends JosmAction { + private static class SelectAction extends JosmAction { SelectAction() { super(marktr("Select"), "dialogs/select", @@ -69,5 +69,5 @@ } - private class DiffAction extends JosmAction { + private static class DiffAction extends JosmAction { DiffAction() { super(marktr("Diff"), "dialogs/diff", tr("Perform diff between current data set and existing OSM data."), null, false); @@ -80,5 +80,5 @@ } - private class ToolsAction extends JosmAction { + private static class ToolsAction extends JosmAction { ToolsAction() { super(marktr("Tools"), "dialogs/utils", tr("Open tools menu for this data."), null, false); @@ -96,10 +96,10 @@ KeyEvent.VK_A, Shortcut.ALT_CTRL_SHIFT), 150, false, OdPreferenceSetting.class); - this.buttons = Arrays.asList(new SideButton[] { - /*selectButton =*/ new SideButton(new SelectAction()), - downloadButton = new SideButton(new DownloadAction()), - diffButton = new SideButton(new DiffAction()), - toolsButton = new SideButton(new ToolsAction()) - }); + this.downloadButton = new SideButton(new DownloadAction()); + this.diffButton = new SideButton(new DiffAction()); + this.toolsButton = new SideButton(new ToolsAction()); + this.buttons = Arrays.asList(/*selectButton =*/ new SideButton(new SelectAction()), + this.downloadButton, this.diffButton, this.toolsButton); + this.toolsButton.addMouseListener(new MouseAdapter() { Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdPreferenceSetting.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdPreferenceSetting.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdPreferenceSetting.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ProjectionChooser.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ViewLicenseDialog.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ViewLicenseDialog.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/ViewLicenseDialog.java (revision 36072) @@ -9,5 +9,4 @@ import java.io.IOException; -import javax.swing.Icon; import javax.swing.JEditorPane; import javax.swing.JOptionPane; @@ -18,4 +17,5 @@ import org.openstreetmap.josm.plugins.opendata.core.licenses.License; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.Logging; public class ViewLicenseDialog extends ExtendedDialog { @@ -45,13 +45,10 @@ scrollPane.setPreferredSize(new Dimension(800, 600)); - setButtonIcons(new Icon[] { - ImageProvider.get("ok"), + setButtonIcons(ImageProvider.get("ok"), ImageProvider.get("agreement24"), - ImageProvider.get("cancel"), - }); - setToolTipTexts(new String[] { - null, + ImageProvider.get("cancel")); + setToolTipTexts(null, tr("View the full text of this license"), - null}); + null); if (license.getIcon() != null) { setIcon(license.getIcon()); @@ -76,5 +73,5 @@ } } catch (IOException e) { - e.printStackTrace(); + Logging.error(e); } summary = !summary; Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/AbstractImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/InputStreamReaderUnbuffered.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/InputStreamReaderUnbuffered.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/InputStreamReaderUnbuffered.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/LambertCC9ZonesProjectionPatterns.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/LambertCC9ZonesProjectionPatterns.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/LambertCC9ZonesProjectionPatterns.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NetworkReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OsmDownloader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OsmDownloader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OsmDownloader.java (revision 36072) @@ -25,5 +25,5 @@ MainApplication.getMenu().openLocation.openUrl(false, oapiServer+"data="+oapiReqEnc); } catch (UnsupportedEncodingException e) { - e.printStackTrace(); + Logging.error(e); } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OverpassApi.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OverpassApi.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/OverpassApi.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/ProjectionPatterns.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/ProjectionPatterns.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/ProjectionPatterns.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/XmlImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ArchiveReader.java (revision 36072) @@ -48,5 +48,5 @@ private File file; - public ArchiveReader(AbstractDataSetHandler handler, ArchiveHandler archiveHandler, boolean promptUser) { + protected ArchiveReader(AbstractDataSetHandler handler, ArchiveHandler archiveHandler, boolean promptUser) { this.handler = handler; this.archiveHandler = archiveHandler; @@ -123,5 +123,5 @@ } } catch (IllegalArgumentException e) { - Logging.error(e.getMessage()); + Logging.error(e); } finally { OdUtils.deleteDir(temp); @@ -149,37 +149,39 @@ Logging.info("Parsing file "+f.getName()); DataSet from = null; - FileInputStream in = new FileInputStream(f); - ProgressMonitor instance = null; - if (progressMonitor != null) { - instance = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false); - } - if (f.getName().toLowerCase().endsWith(OdConstants.CSV_EXT)) { - from = CsvReader.parseDataSet(in, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.KML_EXT)) { - from = KmlReader.parseDataSet(in, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.KMZ_EXT)) { - from = KmzReader.parseDataSet(in, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.XLS_EXT)) { - from = XlsReader.parseDataSet(in, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.ODS_EXT)) { - from = OdsReader.parseDataSet(in, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.SHP_EXT)) { - from = ShpReader.parseDataSet(in, f, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.MIF_EXT)) { - from = MifReader.parseDataSet(in, f, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.TAB_EXT)) { - from = TabReader.parseDataSet(in, f, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.GML_EXT)) { - from = GmlReader.parseDataSet(in, handler, instance); - } else if (f.getName().toLowerCase().endsWith(OdConstants.XML_EXT)) { - if (OdPlugin.getInstance().xmlImporter.acceptFile(f)) { - from = NeptuneReader.parseDataSet(in, handler, instance); + try (FileInputStream in = new FileInputStream(f)) { + ProgressMonitor instance = null; + if (progressMonitor != null) { + instance = progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false); + } + final String lowerCaseName = f.getName().toLowerCase(); + if (lowerCaseName.endsWith(OdConstants.CSV_EXT)) { + from = CsvReader.parseDataSet(in, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.KML_EXT)) { + from = KmlReader.parseDataSet(in, instance); + } else if (lowerCaseName.endsWith(OdConstants.KMZ_EXT)) { + from = KmzReader.parseDataSet(in, instance); + } else if (lowerCaseName.endsWith(OdConstants.XLS_EXT)) { + from = XlsReader.parseDataSet(in, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.ODS_EXT)) { + from = OdsReader.parseDataSet(in, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.SHP_EXT)) { + from = ShpReader.parseDataSet(in, f, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.MIF_EXT)) { + from = MifReader.parseDataSet(in, f, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.TAB_EXT)) { + from = TabReader.parseDataSet(in, f, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.GML_EXT)) { + from = GmlReader.parseDataSet(in, handler, instance); + } else if (lowerCaseName.endsWith(OdConstants.XML_EXT)) { + if (OdPlugin.getInstance().xmlImporter.acceptFile(f)) { + from = NeptuneReader.parseDataSet(in, handler, instance); + } else { + Logging.warn("Unsupported XML file: " + f.getName()); + } } else { - Logging.warn("Unsupported XML file: "+f.getName()); - } - } else { - Logging.warn("Unsupported file extension: "+f.getName()); - } - return from; + Logging.warn("Unsupported file extension: " + f.getName()); + } + return from; + } } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java (revision 36072) @@ -33,5 +33,5 @@ } - private class Renderer extends DefaultListCellRenderer { + private static class Renderer extends DefaultListCellRenderer { @Override Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/DefaultArchiveHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/DefaultArchiveHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/DefaultArchiveHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/SevenZipReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/AbstractMapInfoReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/AbstractMapInfoReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/AbstractMapInfoReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGeographicHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGeographicHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGeographicHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGmlHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGmlHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGmlHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultMifHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultMifHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultMifHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultShpHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultShpHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultShpHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeoCrsException.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeoCrsException.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeoCrsException.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeoMathTransformException.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeoMathTransformException.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeoMathTransformException.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GeographicReader.java (revision 36072) @@ -22,5 +22,4 @@ import javax.json.JsonReader; import javax.json.spi.JsonProvider; -import javax.swing.Icon; import javax.swing.JOptionPane; @@ -39,5 +38,4 @@ import org.opengis.referencing.FactoryException; import org.opengis.referencing.IdentifiedObject; -import org.opengis.referencing.NoSuchAuthorityCodeException; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.crs.ProjectedCRS; @@ -80,8 +78,6 @@ try { wgs84 = CRS.decode("EPSG:4326"); - } catch (NoSuchAuthorityCodeException e) { - e.printStackTrace(); } catch (FactoryException e) { - e.printStackTrace(); + Logging.error(e); } } @@ -97,5 +93,5 @@ private static final Map esriWkid = new TreeMap<>(); - public GeographicReader(GeographicHandler handler, GeographicHandler[] defaultHandlers) { + protected GeographicReader(GeographicHandler handler, GeographicHandler[] defaultHandlers) { this.nodes = new HashMap<>(); this.handler = handler; @@ -225,5 +221,5 @@ } - protected final void addWayToMp(Relation r, String role, Way w) { + protected static void addWayToMp(Relation r, String role, Way w) { r.addMember(new RelationMember(role, w)); } @@ -233,5 +229,5 @@ * want to continue */ - protected static final boolean warnLenientMethod(final Component parent, final CoordinateReferenceSystem crs) { + protected static boolean warnLenientMethod(final Component parent, final CoordinateReferenceSystem crs) { return new DialogPrompter() { @Override @@ -239,5 +235,5 @@ final ExtendedDialog dlg = new ExtendedDialog(parent, tr("Cannot transform to WGS84"), - new String[] {tr("Cancel"), tr("Continue")}); + tr("Cancel"), tr("Continue")); // CHECKSTYLE.OFF: LineLength dlg.setContent("" + @@ -247,11 +243,9 @@ ""); // CHECKSTYLE.ON: LineLength - dlg.setButtonIcons(new Icon[] { - new ImageProvider("cancel").setMaxSize(ImageSizes.LARGEICON).get(), + dlg.setButtonIcons(new ImageProvider("cancel").setMaxSize(ImageSizes.LARGEICON).get(), new ImageProvider("ok").setMaxSize(ImageSizes.LARGEICON).addOverlay( - new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0)).get()}); - dlg.setToolTipTexts(new String[] { - tr("Cancel"), - tr("Try lenient method")}); + new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0)).get()); + dlg.setToolTipTexts(tr("Cancel"), + tr("Try lenient method")); dlg.setIcon(JOptionPane.WARNING_MESSAGE); dlg.setCancelButton(1); Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReader.java (revision 36072) @@ -9,5 +9,4 @@ import java.util.Map; -import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; @@ -35,4 +34,5 @@ import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.UserCancelException; +import org.openstreetmap.josm.tools.XmlUtils; /** @@ -59,5 +59,5 @@ private int dim; - private final class CrsData { + private static final class CrsData { public CoordinateReferenceSystem crs; public MathTransform transform; @@ -81,5 +81,5 @@ throws IOException, XMLStreamException { InputStreamReader ir = UTFInputStreamReader.create(in, OdConstants.UTF8); - XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(ir); + XMLStreamReader parser = XmlUtils.newSafeXMLInputFactory().createXMLStreamReader(ir); try { return new GmlReader(parser, handler != null ? handler.getGmlHandler() : null).parseDoc(instance); @@ -98,11 +98,10 @@ while (parser.hasNext()) { int event = parser.next(); - if (event == XMLStreamConstants.START_ELEMENT) { - if (isElement(GML_FEATURE_MEMBER)) { - try { - parseFeatureMember(parent); - } catch (UserCancelException e) { - return ds; - } + if (event == XMLStreamConstants.START_ELEMENT && isElement(GML_FEATURE_MEMBER)) { + try { + parseFeatureMember(parent); + } catch (UserCancelException e) { + Logging.trace(e); + return ds; } } @@ -132,8 +131,6 @@ try { findCRS(srs); - } catch (NoSuchAuthorityCodeException e) { - e.printStackTrace(); } catch (FactoryException e) { - e.printStackTrace(); + Logging.error(e); } if (crs == null) { @@ -172,6 +169,6 @@ String[] tab = parser.getElementText().split(" "); for (int i = 0; i < tab.length; i += dim) { - Point p = geometryFactory.createPoint(new Coordinate(Double.valueOf(tab[i]), Double.valueOf(tab[i+1]))); - node = createOrGetNode(p, dim > 2 && !tab[i+2].equals("0") ? tab[i+2] : null); + Point p = geometryFactory.createPoint(new Coordinate(Double.parseDouble(tab[i]), Double.parseDouble(tab[i+1]))); + node = createOrGetNode(p, dim > 2 && !"0".equals(tab[i+2]) ? tab[i+2] : null); if (way != null) { way.addNode(node); @@ -182,5 +179,5 @@ } else if (isElement(GML_COORDINATES)) { String[] tab = parser.getElementText().trim().split(","); - Point p = geometryFactory.createPoint(new Coordinate(Double.valueOf(tab[0]), Double.valueOf(tab[1]))); + Point p = geometryFactory.createPoint(new Coordinate(Double.parseDouble(tab[0]), Double.parseDouble(tab[1]))); node = createOrGetNode(p); if (way == null) { @@ -207,6 +204,6 @@ } if (prim != null) { - for (String k : tags.keySet()) { - prim.put(k, tags.get(k).toString()); + for (Map.Entry entry : tags.entrySet()) { + prim.put(entry.getKey(), entry.getValue().toString()); } } Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlKmzImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlKmzImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlKmzImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmzReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmzReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmzReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifDatum.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifDatum.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifDatum.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifEllipsoid.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifEllipsoid.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifEllipsoid.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifProjection.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifProjection.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifProjection.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifTabImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifTabImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifTabImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifUnit.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifUnit.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifUnit.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/DefaultCsvHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/DefaultCsvHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/DefaultCsvHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/DefaultSpreadSheetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/DefaultSpreadSheetHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/DefaultSpreadSheetHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsDocument.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsDocument.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsDocument.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsImporter.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsImporter.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsImporter.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReader.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReader.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReader.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdLayer.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdLayer.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdLayer.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdOsmDataLayer.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdOsmDataLayer.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdOsmDataLayer.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/LOOL.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/LOOL.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/LOOL.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/ODbL.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/ODbL.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/ODbL.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/AbstractModule.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/Module.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/Module.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/Module.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleDownloadException.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleDownloadException.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleDownloadException.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleDownloadTask.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleDownloadTask.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleDownloadTask.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleException.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleException.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleException.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParseException.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParseException.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParseException.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java (revision 36072) Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java =================================================================== --- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java (revision 36071) +++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java (revision 36072) Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java (revision 36071) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java (revision 36072) Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java (revision 36071) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipReaderTest.java (revision 36072) Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 36071) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 36072) Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java (revision 36071) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java (revision 36072) Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (revision 36071) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (revision 36072) Index: applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java =================================================================== --- applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (revision 36071) +++ applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (revision 36072)