modules) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder(150);
sb.append("");
sb.append(trn(
@@ -447,9 +449,11 @@
} catch (ExecutionException e) {
Logging.warn(tr("Warning: failed to download module information list"));
- e.printStackTrace();
+ Logging.debug(e);
// don't abort in case of error, continue with downloading modules below
} catch (InterruptedException e) {
Logging.warn(tr("Warning: failed to download module information list"));
- e.printStackTrace();
+ Logging.debug(e);
+ Thread.currentThread().interrupt();
+ return Collections.emptyList();
// don't abort in case of error, continue with downloading modules below
}
@@ -477,10 +481,11 @@
future.get();
} catch (ExecutionException e) {
- e.printStackTrace();
+ Logging.debug(e);
alertFailedModuleUpdate(parent, modulesToUpdate);
return modules;
} catch (InterruptedException e) {
- e.printStackTrace();
+ Logging.debug(e);
alertFailedModuleUpdate(parent, modulesToUpdate);
+ Thread.currentThread().interrupt();
return modules;
}
@@ -540,46 +545,42 @@
* Installs downloaded modules. Moves files with the suffix ".jar.new" to the corresponding
* ".jar" files.
- *
- * If {@code dowarn} is true, this methods emits warning messages on the console if a downloaded
- * but not yet installed module .jar can't be be installed. If {@code dowarn} is false, the
- * installation of the respective module is sillently skipped.
- *
- * @param dowarn if true, warning messages are displayed; false otherwise
- */
- public static void installDownloadedModules(boolean dowarn) {
+ *
+ * If {@code doWarn} is true, this method emits warning messages on the console if a downloaded
+ * but not yet installed module .jar can't be installed. If {@code doWarn} is false, the
+ * installation of the respective module is silently skipped.
+ *
+ * @param doWarn if true, warning messages are displayed; false otherwise
+ */
+ public static void installDownloadedModules(boolean doWarn) {
File moduleDir = OdPlugin.getInstance().getModulesDirectory();
if (!moduleDir.exists() || !moduleDir.isDirectory() || !moduleDir.canWrite())
return;
- final File[] files = moduleDir.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.endsWith(".jar.new");
- } });
-
- for (File updatedModule : files) {
- final String filePath = updatedModule.getPath();
- File module = new File(filePath.substring(0, filePath.length() - 4));
- String moduleName = updatedModule.getName().substring(0, updatedModule.getName().length() - 8);
- // CHECKSTYLE.OFF: LineLength
- if (module.exists()) {
- if (!module.delete() && dowarn) {
+ final File[] files = moduleDir.listFiles((dir, name) -> name.endsWith(".jar.new"));
+
+ if (files != null) {
+ for (File updatedModule : files) {
+ final String filePath = updatedModule.getPath();
+ File module = new File(filePath.substring(0, filePath.length() - 4));
+ String moduleName = updatedModule.getName().substring(0, updatedModule.getName().length() - 8);
+ if (module.exists() && !module.delete() && doWarn) {
Logging.warn(tr("Warning: failed to delete outdated module ''{0}''.", module.toString()));
- Logging.warn(tr("Warning: failed to install already downloaded module ''{0}''. Skipping installation. JOSM is still going to load the old module version.", moduleName));
+ Logging.warn(tr("Warning: failed to install already downloaded module ''{0}''. Skipping installation." +
+ "JOSM is still going to load the old module version.", moduleName));
continue;
}
- }
- if (!updatedModule.renameTo(module) && dowarn) {
- Logging.warn(tr("Warning: failed to install module ''{0}'' from temporary download file ''{1}''. Renaming failed.", module.toString(), updatedModule.toString()));
- Logging.warn(tr("Warning: failed to install already downloaded module ''{0}''. Skipping installation. JOSM is still going to load the old module version.", moduleName));
- }
- // CHECKSTYLE.ON: LineLength
- }
- return;
+ if (!updatedModule.renameTo(module) && doWarn) {
+ Logging.warn(tr("Warning: failed to install module ''{0}'' from temporary download file ''{1}''. Renaming failed.",
+ module.toString(), updatedModule.toString()));
+ Logging.warn(tr("Warning: failed to install already downloaded module ''{0}''. Skipping installation." +
+ "JOSM is still going to load the old module version.", moduleName));
+ }
+ }
+ }
}
private static class UpdateModulesMessagePanel extends JPanel {
private JMultilineLabel lblMessage;
- private JCheckBox cbDontShowAgain;
+ private JCheckBox cbDoNotShowAgain;
protected void build() {
@@ -591,5 +592,6 @@
gc.weighty = 1.0;
gc.insets = new Insets(5, 5, 5, 5);
- add(lblMessage = new JMultilineLabel(""), gc);
+ lblMessage = new JMultilineLabel("");
+ add(lblMessage, gc);
lblMessage.setFont(lblMessage.getFont().deriveFont(Font.PLAIN));
@@ -597,7 +599,8 @@
gc.fill = GridBagConstraints.HORIZONTAL;
gc.weighty = 0.0;
- add(cbDontShowAgain = new JCheckBox(
- tr("Do not ask again and remember my decision (go to Preferences->Modules to change it later)")), gc);
- cbDontShowAgain.setFont(cbDontShowAgain.getFont().deriveFont(Font.PLAIN));
+ cbDoNotShowAgain = new JCheckBox(
+ tr("Do not ask again and remember my decision (go to Preferences->Modules to change it later)"));
+ add(cbDoNotShowAgain, gc);
+ cbDoNotShowAgain.setFont(cbDoNotShowAgain.getFont().deriveFont(Font.PLAIN));
}
@@ -612,10 +615,10 @@
public void initDontShowAgain(String preferencesKey) {
String policy = Config.getPref().get(preferencesKey, "ask");
- policy = policy.trim().toLowerCase();
- cbDontShowAgain.setSelected(!policy.equals("ask"));
+ policy = policy.trim().toLowerCase(Locale.ROOT);
+ cbDoNotShowAgain.setSelected(!"ask".equals(policy));
}
public boolean isRememberDecision() {
- return cbDontShowAgain.isSelected();
+ return cbDoNotShowAgain.isSelected();
}
}
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 36172)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 36173)
@@ -10,4 +10,5 @@
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -16,4 +17,5 @@
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
@@ -38,13 +40,13 @@
*/
public class ModuleInformation {
- public File file = null;
- public String name = null;
- public String className = null;
- public String link = null;
- public String description = null;
- public String author = null;
- public String version = null;
- public String localversion = null;
- public String downloadlink = null;
+ public File file;
+ public String name;
+ public String className;
+ public String link;
+ public String description;
+ public String author;
+ public String version;
+ public String localversion;
+ public String downloadlink;
public String iconPath;
public ImageIcon icon;
@@ -52,5 +54,5 @@
public final Map attr = new TreeMap<>();
- /**
+ /*
* Creates a module information object by reading the module information from
* the manifest in the module jar.
@@ -78,5 +80,5 @@
try (
FileInputStream fis = new FileInputStream(file);
- JarInputStream jar = new JarInputStream(fis);
+ JarInputStream jar = new JarInputStream(fis)
) {
Manifest manifest = jar.getManifest();
@@ -139,12 +141,11 @@
}
- @SuppressWarnings("unused")
private void scanManifest(Manifest manifest) {
String lang = LanguageInfo.getLanguageCodeManifest();
- Attributes attr = manifest.getMainAttributes();
- className = attr.getValue("Module-Class");
- String s = attr.getValue(lang+"Module-Link");
+ Attributes manifestMainAttributes = manifest.getMainAttributes();
+ className = manifestMainAttributes.getValue("Module-Class");
+ String s = manifestMainAttributes.getValue(lang+"Module-Link");
if (s == null) {
- s = attr.getValue("Module-Link");
+ s = manifestMainAttributes.getValue("Module-Link");
}
if (s != null) {
@@ -157,7 +158,7 @@
}
link = s;
- s = attr.getValue(lang+"Module-Description");
+ s = manifestMainAttributes.getValue(lang+"Module-Description");
if (s == null) {
- s = attr.getValue("Module-Description");
+ s = manifestMainAttributes.getValue("Module-Description");
if (s != null) {
s = tr(s);
@@ -165,7 +166,7 @@
}
description = s;
- version = attr.getValue("Module-Version");
- author = attr.getValue("Author");
- iconPath = attr.getValue("Module-Icon");
+ version = manifestMainAttributes.getValue("Module-Version");
+ author = manifestMainAttributes.getValue("Author");
+ iconPath = manifestMainAttributes.getValue("Module-Icon");
if (iconPath != null && file != null) {
// extract icon from the module jar file
@@ -180,5 +181,5 @@
}
- String classPath = attr.getValue(Attributes.Name.CLASS_PATH);
+ String classPath = manifestMainAttributes.getValue(Attributes.Name.CLASS_PATH);
if (classPath != null) {
for (String entry : classPath.split(" ")) {
@@ -193,6 +194,6 @@
}
}
- for (Object o : attr.keySet()) {
- this.attr.put(o.toString(), attr.getValue(o.toString()));
+ for (Object o : manifestMainAttributes.keySet()) {
+ this.attr.put(o.toString(), manifestMainAttributes.getValue(o.toString()));
}
}
@@ -205,5 +206,5 @@
*/
public String getDescriptionAsHtml() {
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder(32);
sb.append("");
sb.append(description == null ? tr("no description available") : description);
@@ -212,5 +213,5 @@
}
if (downloadlink != null && !downloadlink.startsWith(OdConstants.OSM_SITE+"dist/")) {
- sb.append("
"+tr("Module provided by an external source: {0}", downloadlink)+"
");
+ sb.append("
").append(tr("Module provided by an external source: {0}", downloadlink)).append("
");
}
sb.append("");
@@ -228,5 +229,5 @@
try {
return klass.getConstructor(ModuleInformation.class).newInstance(this);
- } catch (Exception t) {
+ } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException t) {
throw new ModuleException(name, t);
}
@@ -246,5 +247,5 @@
try {
return (Class) Class.forName(className, true, classLoader);
- } catch (Exception t) {
+ } catch (ClassNotFoundException t) {
throw new ModuleException(name, t);
}
@@ -282,11 +283,9 @@
if (this.version == null && referenceVersion != null)
return true;
- if (this.version != null && !this.version.equals(referenceVersion))
- return true;
- return false;
- }
-
- /**
- * Replies true if this this module should be updated/downloaded because either
+ return this.version != null && !this.version.equals(referenceVersion);
+ }
+
+ /**
+ * Replies true if this module should be updated/downloaded because either
* it is not available locally (its local version is null) or its local version is
* older than the available version on the server.
@@ -303,5 +302,5 @@
if (filter == null) return true;
if (value == null) return false;
- return value.toLowerCase().contains(filter.toLowerCase());
+ return value.toLowerCase(Locale.ROOT).contains(filter.toLowerCase(Locale.ROOT));
}
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 36172)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleListParser.java (revision 36173)
@@ -9,5 +9,5 @@
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.List;
@@ -15,5 +15,5 @@
/**
* A parser for the module list provided by an opendata Module Download Site.
- *
+ *
* See OSM SVN
* for a sample of the document. The format is a custom format, kind of mix of CSV and RFC822 style
@@ -35,10 +35,8 @@
try {
return new ModuleInformation(
- new ByteArrayInputStream(manifest.getBytes("utf-8")),
+ new ByteArrayInputStream(manifest.getBytes(StandardCharsets.UTF_8)),
name.substring(0, name.length() - 4),
url
);
- } catch (UnsupportedEncodingException e) {
- throw new ModuleListParseException(tr("Failed to create module information from manifest for module ''{0}''", name), e);
} catch (ModuleException e) {
throw new ModuleListParseException(tr("Failed to create module information from manifest for module ''{0}''", name), e);
@@ -48,5 +46,5 @@
/**
* Parses a module information document and replies a list of module information objects.
- *
+ *
* See OSM SVN
* for a sample of the document. The format is a custom format, kind of mix of CSV and RFC822 style
@@ -59,7 +57,7 @@
public List parse(InputStream in) throws ModuleListParseException {
List ret = new LinkedList<>();
- BufferedReader r = null;
+ BufferedReader r;
try {
- r = new BufferedReader(new InputStreamReader(in, "utf-8"));
+ r = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
String name = null;
String url = null;
@@ -78,5 +76,5 @@
line = line.substring(1);
if (line.length() > 70) {
- manifest.append(line.substring(0, 70)).append("\n");
+ manifest.append(line, 0, 70).append("\n");
line = " " + line.substring(70);
}
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 36172)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadLocalModuleInformationTask.java (revision 36173)
@@ -6,5 +6,4 @@
import java.io.File;
import java.io.FileInputStream;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
@@ -25,5 +24,5 @@
* This is an asynchronous task for reading module information from the files
* in the local module repositories.
- *
+ *
* It scans the files in the local modules repository (see {@link OdPlugin#getModulesDirectory()}
* and extracts module information from three kind of files:
@@ -36,5 +35,5 @@
*/
public class ReadLocalModuleInformationTask extends PleaseWaitRunnable {
- private Map availableModules;
+ private final Map availableModules;
private boolean canceled;
@@ -78,11 +77,6 @@
protected void scanSiteCacheFiles(ProgressMonitor monitor, File modulesDirectory) {
File[] siteCacheFiles = modulesDirectory.listFiles(
- new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.matches("^([0-9]+-)?site.*\\.txt$");
- }
- }
- );
+ (dir, name) -> name.matches("^([0-9]+-)?site.*\\.txt$")
+ );
if (siteCacheFiles == null || siteCacheFiles.length == 0)
return;
@@ -96,5 +90,5 @@
} catch (ModuleListParseException e) {
Logging.warn(tr("Warning: Failed to scan file ''{0}'' for module information. Skipping.", fname));
- e.printStackTrace();
+ Logging.debug(e);
}
monitor.worked(1);
@@ -104,11 +98,6 @@
protected void scanIconCacheFiles(ProgressMonitor monitor, File modulesDirectory) {
File[] siteCacheFiles = modulesDirectory.listFiles(
- new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.matches("^([0-9]+-)?site.*modules-icons\\.zip$");
- }
- }
- );
+ (dir, name) -> name.matches("^([0-9]+-)?site.*modules-icons\\.zip$")
+ );
if (siteCacheFiles == null || siteCacheFiles.length == 0)
return;
@@ -133,11 +122,6 @@
protected void scanModuleFiles(ProgressMonitor monitor, File modulesDirectory) {
File[] moduleFiles = modulesDirectory.listFiles(
- new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.endsWith(".jar") || name.endsWith(".jar.new");
- }
- }
- );
+ (dir, name) -> name.endsWith(".jar") || name.endsWith(".jar.new")
+ );
if (moduleFiles == null || moduleFiles.length == 0)
return;
@@ -157,5 +141,5 @@
} catch (ModuleException e) {
Logging.warn(tr("Warning: Failed to scan file ''{0}'' for module information. Skipping.", fname));
- e.printStackTrace();
+ Logging.debug(e);
}
monitor.worked(1);
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 36172)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ReadRemoteModuleInformationTask.java (revision 36173)
@@ -7,6 +7,4 @@
import java.io.ByteArrayInputStream;
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
@@ -15,8 +13,9 @@
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Arrays;
import java.util.Collection;
@@ -157,5 +156,5 @@
connection.setRequestProperty("Accept-Charset", "utf-8");
}
- try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"))) {
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
String line;
while ((line = in.readLine()) != null) {
@@ -164,11 +163,7 @@
return sb.toString();
}
- } catch (MalformedURLException e) {
- if (canceled) return null;
- e.printStackTrace();
- return null;
} catch (IOException e) {
if (canceled) return null;
- e.printStackTrace();
+ Logging.debug(e);
return null;
} finally {
@@ -205,5 +200,5 @@
try (
InputStream in = connection.getInputStream();
- OutputStream out = new FileOutputStream(destFile)
+ OutputStream out = Files.newOutputStream(destFile.toPath())
) {
byte[] buffer = new byte[8192];
@@ -212,11 +207,7 @@
}
}
- } catch (MalformedURLException e) {
- if (canceled) return;
- e.printStackTrace();
- return;
} catch (IOException e) {
if (canceled) return;
- e.printStackTrace();
+ Logging.debug(e);
return;
} finally {
@@ -249,13 +240,12 @@
try {
File moduleDir = OdPlugin.getInstance().getModulesDirectory();
- if (!moduleDir.exists()) {
- if (!moduleDir.mkdirs()) {
- Logging.warn(tr("Warning: failed to create module directory ''{0}''. Cannot cache module list from module site ''{1}''.",
- moduleDir.toString(), site));
- }
+ if (!moduleDir.exists() && !moduleDir.mkdirs()) {
+ Logging.warn(tr("Warning: failed to create module directory ''{0}''. Cannot cache module list from module site ''{1}''.",
+ moduleDir.toString(), site));
}
File cacheFile = createSiteCacheFile(moduleDir, site, CacheType.PLUGIN_LIST);
getProgressMonitor().subTask(tr("Writing module list to local cache ''{0}''", cacheFile.toString()));
- try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), "utf-8"))) {
+ try (OutputStream fileOutputStream = Files.newOutputStream(cacheFile.toPath());
+ PrintWriter writer = new PrintWriter(new OutputStreamWriter(fileOutputStream, StandardCharsets.UTF_8))) {
writer.write(list);
}
@@ -275,12 +265,9 @@
try {
getProgressMonitor().subTask(tr("Parsing module list from site ''{0}''", site));
- InputStream in = new ByteArrayInputStream(doc.getBytes("UTF-8"));
+ InputStream in = new ByteArrayInputStream(doc.getBytes(StandardCharsets.UTF_8));
availableModules.addAll(new ModuleListParser().parse(in));
- } catch (UnsupportedEncodingException e) {
- Logging.error(tr("Failed to parse module list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
- e.printStackTrace();
} catch (ModuleListParseException e) {
Logging.error(tr("Failed to parse module list document from site ''{0}''. Skipping site. Exception was: {1}", site, e.toString()));
- e.printStackTrace();
+ Logging.debug(e);
}
}
@@ -296,12 +283,7 @@
for (String location : ModuleInformation.getModuleLocations()) {
File[] f = new File(location).listFiles(
- new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.matches("^([0-9]+-)?site.*\\.txt$") ||
- name.matches("^([0-9]+-)?site.*-icons\\.zip$");
- }
- }
- );
+ (dir, name) -> name.matches("^([0-9]+-)?site.*\\.txt$") ||
+ name.matches("^([0-9]+-)?site.*-icons\\.zip$")
+ );
if (f != null && f.length > 0) {
siteCacheFiles.addAll(Arrays.asList(f));
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 36172)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/NamesFrUtils.java (revision 36173)
@@ -5,7 +5,9 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
@@ -21,15 +23,15 @@
public abstract class NamesFrUtils {
- private static Map dictionary = initDictionary();
-
- public static final String checkDictionary(String value) {
- String result = "";
+ private static final Map dictionary = initDictionary();
+
+ public static String checkDictionary(String value) {
+ StringBuilder result = new StringBuilder();
for (String word : value.split(" ")) {
- if (!result.isEmpty()) {
- result += " ";
+ if (result.length() != 0) {
+ result.append(' ');
}
- result += dictionary.containsKey(word) ? dictionary.get(word) : word;
- }
- return result;
+ result.append(dictionary.getOrDefault(word, word));
+ }
+ return result.toString();
}
@@ -37,5 +39,5 @@
Map result = new HashMap<>();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(
- SimpleDataSetHandler.class.getResourceAsStream(OdConstants.DICTIONARY_FR), OdConstants.UTF8))) {
+ SimpleDataSetHandler.class.getResourceAsStream(OdConstants.DICTIONARY_FR), StandardCharsets.UTF_8))) {
String line = reader.readLine(); // Skip first line
Logging.trace(line);
@@ -50,10 +52,10 @@
}
- public static final String getStreetLabel(String label) {
+ public static String getStreetLabel(String label) {
if (label == null) {
- return label;
+ return null;
} else if (label.startsWith("All")) {
return "Allée";
- } else if (label.equals("Autoroute")) {
+ } else if ("Autoroute".equals(label)) {
return label;
} else if (label.startsWith("Anc")) {
@@ -63,15 +65,15 @@
} else if (label.startsWith("Barr")) {
return "Barrière";
- } else if (label.equals("Bd") || label.equals("Boulevard")) {
+ } else if ("Bd".equals(label) || "Boulevard".equals(label)) {
return "Boulevard";
} else if (label.startsWith("Bret")) {
return "Bretelle";
- } else if (label.equals("Bre")) {
+ } else if ("Bre".equals(label)) {
return "Bré";
- } else if (label.equals("Caminot")) {
- return label;
- } else if (label.equals("Carrefour")) {
- return label;
- } else if (label.equals("Carré")) {
+ } else if ("Caminot".equals(label)) {
+ return label;
+ } else if ("Carrefour".equals(label)) {
+ return label;
+ } else if ("Carré".equals(label)) {
return label;
} else if (label.startsWith("Chemine")) {
@@ -81,9 +83,9 @@
} else if (label.startsWith("Cit")) {
return "Cité";
- } else if (label.equals("Clos")) {
- return label;
- } else if (label.equals("Cote") || label.equals("Côte")) {
+ } else if ("Clos".equals(label)) {
+ return label;
+ } else if ("Cote".equals(label) || "Côte".equals(label)) {
return "Côte";
- } else if (label.equals("Cours")) {
+ } else if ("Cours".equals(label)) {
return label;
} else if (label.startsWith("Dep") || label.startsWith("Dép")) {
@@ -91,88 +93,88 @@
} else if (label.startsWith("Dom")) {
return "Domaine";
- } else if (label.equals("Dsc") || label.startsWith("Desc")) {
+ } else if ("Dsc".equals(label) || label.startsWith("Desc")) {
return "Descente";
- } else if (label.equals("Esp") || label.startsWith("Espl")) {
+ } else if ("Esp".equals(label) || label.startsWith("Espl")) {
return "Esplanade";
} else if (label.startsWith("Espa")) {
return "Espace";
- } else if (label.equals("Giratoire")) {
- return label;
- } else if (label.equals("Grande-rue")) {
- return label;
- } else if (label.equals("Hameau")) {
- return label;
- } else if (label.startsWith("Imp") || label.equals("Ipasse")) {
+ } else if ("Giratoire".equals(label)) {
+ return label;
+ } else if ("Grande-rue".equals(label)) {
+ return label;
+ } else if ("Hameau".equals(label)) {
+ return label;
+ } else if (label.startsWith("Imp") || "Ipasse".equals(label)) {
return "Impasse";
} else if (label.startsWith("Itin")) {
return "Itinéraire";
- } else if (label.equals("Jardin")) {
- return label;
- } else if (label.startsWith("L'") || label.equals("La") || label.equals("Le") || label.equals("Les") ||
- label.equals("Saint")) { // Lieux-dits
+ } else if ("Jardin".equals(label)) {
+ return label;
+ } else if (label.startsWith("L'") || "La".equals(label) || "Le".equals(label) || "Les".equals(label) ||
+ "Saint".equals(label)) { // Lieux-dits
return label;
} else if (label.startsWith("Lot")) {
return "Lotissement";
- } else if (label.equals("Mail")) {
- return label;
- } else if (label.equals("Mas")) {
+ } else if ("Mail".equals(label)) {
+ return label;
+ } else if ("Mas".equals(label)) {
return label;
} else if (label.startsWith("Nat")) {
return "Nationale";
- } else if (label.equals("Parc")) {
- return label;
- } else if (label.equals("Passerelle")) {
+ } else if ("Parc".equals(label)) {
+ return label;
+ } else if ("Passerelle".equals(label)) {
return label;
} else if (label.startsWith("Pas")) {
return "Passage";
- } else if (label.equals("Pch") || label.startsWith("Petit-chem")) {
+ } else if ("Pch".equals(label) || label.startsWith("Petit-chem")) {
return "Petit-chemin";
- } else if (label.equals("Petit") || label.equals("Petite")) {
- return label;
- } else if (label.equals("Petite-allée")) {
- return label;
- } else if (label.equals("Petite-rue")) {
- return label;
- } else if (label.equals("Plan")) {
+ } else if ("Petit".equals(label) || "Petite".equals(label)) {
+ return label;
+ } else if ("Petite-allée".equals(label)) {
+ return label;
+ } else if ("Petite-rue".equals(label)) {
+ return label;
+ } else if ("Plan".equals(label)) {
return label;
} else if (label.startsWith("Pl")) {
return "Place";
- } else if (label.equals("Pont")) {
- return label;
- } else if (label.equals("Port")) {
- return label;
- } else if (label.equals("Porte")) {
+ } else if ("Pont".equals(label)) {
+ return label;
+ } else if ("Port".equals(label)) {
+ return label;
+ } else if ("Porte".equals(label)) {
return label;
} else if (label.startsWith("Prom")) {
return "Promenade";
- } else if (label.equals("Prv") || label.startsWith("Parv")) {
+ } else if ("Prv".equals(label) || label.startsWith("Parv")) {
return "Parvis";
} else if (label.startsWith("Qu")) {
return "Quai";
- } else if (label.equals("Rampe")) {
+ } else if ("Rampe".equals(label)) {
return label;
} else if (label.startsWith("Res") || label.startsWith("Rés")) {
return "Résidence";
- } else if (label.equals("Rocade")) {
- return label;
- } else if (label.equals("Rpt") || label.startsWith("Ron")) {
+ } else if ("Rocade".equals(label)) {
+ return label;
+ } else if ("Rpt".equals(label) || label.startsWith("Ron")) {
return "Rond-Point";
- } else if (label.equals("Rte") || label.equals("Route")) {
+ } else if ("Rte".equals(label) || "Route".equals(label)) {
return "Route";
- } else if (label.equals("Rue") || label.equals("Rued")) {
+ } else if ("Rue".equals(label) || "Rued".equals(label)) {
return "Rue";
- } else if (label.equals("Sentier")) {
+ } else if ("Sentier".equals(label)) {
return label;
} else if (label.startsWith("Sq")) {
return "Square";
- } else if (label.equals("Théâtre")) {
+ } else if ("Théâtre".equals(label)) {
return "Théâtre";
} else if (label.startsWith("Tra")) {
return "Traverse";
- } else if (label.equals("Vieux")) {
- return label;
- } else if (label.equals("Voie")) {
- return label;
- } else if (label.equals("Zone")) {
+ } else if ("Vieux".equals(label)) {
+ return label;
+ } else if ("Voie".equals(label)) {
+ return label;
+ } else if ("Zone".equals(label)) {
return label;
} else {
@@ -182,5 +184,5 @@
}
- public static final String checkStreetName(OsmPrimitive p, String key) {
+ public static String checkStreetName(OsmPrimitive p, String key) {
String value = null;
if (p != null) {
@@ -189,9 +191,9 @@
value = WordUtils.capitalizeFully(value);
// Cas particuliers
- if (value.equals("Boulingrin")) { // square Boulingrin, mal formé
+ if ("Boulingrin".equals(value)) { // square Boulingrin, mal formé
value = "Sq Boulingrin";
} else if (value.matches("A[0-9]+")) { // Autoroutes sans le mot "Autoroute"
value = "Autoroute "+value;
- } else if (value.equals("All A61")) { // A61 qualifiée d'Allée ?
+ } else if ("All A61".equals(value)) { // A61 qualifiée d'Allée ?
value = "Autoroute A61";
} else if (value.startsWith("Che Vieux Che")) { // "Che" redondant
@@ -210,66 +212,67 @@
String[] words = value.split(" ");
if (words.length > 0) {
- value = "";
+ final StringBuilder stringBuilder = new StringBuilder();
List list = Arrays.asList(words);
words[0] = getStreetLabel(words[0]);
- if (words[0].equals("Ancien") && words.length > 1 && words[1].equals("Che")) {
+ if ("Ancien".equals(words[0]) && words.length > 1 && "Che".equals(words[1])) {
words[1] = "Chemin";
}
for (int i = 0; i < words.length; i++) {
if (i > 0) {
- value += " ";
+ stringBuilder.append(' ');
// Prénoms/Noms propres abrégés
- if (words[i].equals("A") && list.contains("Bernard")) {
+ if ("A".equals(words[i]) && list.contains("Bernard")) {
words[i] = "Arnaud";
- } else if (words[i].equals("A") && list.contains("Passerieu")) {
+ } else if ("A".equals(words[i]) && list.contains("Passerieu")) {
words[i] = "Ariste";
- } else if (words[i].equals("A") && list.contains("Bougainville")) {
+ } else if ("A".equals(words[i]) && list.contains("Bougainville")) {
words[i] = "Antoine";
- } else if (words[i].equals("Ch") && list.contains("Leconte")) {
+ } else if ("Ch".equals(words[i]) && list.contains("Leconte")) {
words[i] = "Charles";
- } else if (words[i].equals("Frs") && list.contains("Dugua")) {
+ } else if ("Frs".equals(words[i]) && list.contains("Dugua")) {
words[i] = "François";
- } else if (words[i].equals("G") && list.contains("Latecoere")) {
+ } else if ("G".equals(words[i]) && list.contains("Latecoere")) {
words[i] = "Georges";
- } else if (words[i].equals("H") && list.contains("Lautrec")) {
+ } else if ("H".equals(words[i]) && list.contains("Lautrec")) {
words[i] = "Henri";
- } else if (words[i].equals("J") && list.contains("Dieulafoy")) {
+ } else if ("J".equals(words[i]) && list.contains("Dieulafoy")) {
words[i] = "Jane";
- } else if (words[i].equals("J") && (list.contains("Champollion") || list.contains("Stanislas"))) {
+ } else if ("J".equals(words[i]) && (list.contains("Champollion") || list.contains("Stanislas"))) {
words[i] = "Jean";
- } else if (words[i].equals("L") && list.contains("Zamenhof")) {
+ } else if ("L".equals(words[i]) && list.contains("Zamenhof")) {
words[i] = "Ludwik";
- } else if (words[i].equals("L") && list.contains("Sacha")) {
+ } else if ("L".equals(words[i]) && list.contains("Sacha")) {
words[i] = "Lucien";
if (!list.contains("Et")) {
words[i] += " et";
}
- } else if (words[i].equals("L") && (list.contains("Vauquelin") || list.contains("Bougainville"))) {
+ } else if ("L".equals(words[i]) && (list.contains("Vauquelin") || list.contains("Bougainville"))) {
words[i] = "Louis";
- } else if (words[i].equals("M") && list.contains("Dieulafoy")) {
+ } else if ("M".equals(words[i]) && list.contains("Dieulafoy")) {
words[i] = "Marcel";
- } else if (words[i].equals("M") && list.contains("Arifat")) {
+ } else if ("M".equals(words[i]) && list.contains("Arifat")) {
words[i] = "Marie";
- } else if (words[i].equals("N") && list.contains("Djamena")) {
+ } else if ("N".equals(words[i]) && list.contains("Djamena")) {
words[i] = "N'";
- } else if (words[i].equals("Oo")) {
+ } else if ("Oo".equals(words[i])) {
words[i] = "Oô";
- } else if (words[i].equals("Ph") && list.contains("Ravary")) {
+ } else if ("Ph".equals(words[i]) && list.contains("Ravary")) {
words[i] = "Philippe";
- } else if (words[i].equals("R") && list.contains("Folliot")) {
+ } else if ("R".equals(words[i]) && list.contains("Folliot")) {
words[i] = "Raphaël";
- } else if (words[i].equals("W") && list.contains("Booth")) {
+ } else if ("W".equals(words[i]) && list.contains("Booth")) {
words[i] = "William";
// Mots de liaison non couverts par le dictionnaire
- } else if (words[i].equals("A")) {
+ } else if ("A".equals(words[i])) {
words[i] = "à";
- } else if (words[i].equals("D") || words[i].equals("L")) {
- words[i] = words[i].toLowerCase()+"'";
- } else if (words[i].equals("La") || words[i].equals("Le")) {
- words[i] = words[i].toLowerCase();
+ } else if ("D".equals(words[i]) || "L".equals(words[i])) {
+ words[i] = words[i].toLowerCase(Locale.FRENCH)+"'";
+ } else if ("La".equals(words[i]) || "Le".equals(words[i])) {
+ words[i] = words[i].toLowerCase(Locale.FRENCH);
}
}
- value += words[i];
+ stringBuilder.append(words[i]);
}
+ value = stringBuilder.toString();
}
// Ponctuation
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 36172)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/util/OdUtils.java (revision 36173)
@@ -3,5 +3,4 @@
import java.io.File;
-import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.file.Files;
@@ -24,9 +23,9 @@
private static final String TEMP_DIR_PREFIX = "josm_opendata_temp_";
- public static final boolean isMultipolygon(OsmPrimitive p) {
- return p instanceof Relation && ((Relation) p).isMultipolygon();
+ public static boolean isMultipolygon(OsmPrimitive p) {
+ return p instanceof Relation && p.isMultipolygon();
}
- public static final String[] stripQuotesAndExtraChars(String[] split, String sep) {
+ public static String[] stripQuotesAndExtraChars(String[] split, String sep) {
List result = new ArrayList<>();
boolean append = false;
@@ -37,10 +36,10 @@
append = false;
}
- result.set(index, result.get(index)+sep+split[i].replaceAll("\"", ""));
+ result.set(index, result.get(index)+sep+split[i].replace("\"", ""));
} else if (split[i].startsWith("\"")) {
if (!(split[i].endsWith("\"") && StringUtils.countMatches(split[i], "\"") % 2 == 0)) {
append = true;
}
- result.add(split[i].replaceAll("\"", ""));
+ result.add(split[i].replace("\"", ""));
} else {
result.add(split[i]);
@@ -54,21 +53,21 @@
}
- public static final ImageIcon getImageIcon(String iconName) {
+ public static ImageIcon getImageIcon(String iconName) {
return getImageIcon(iconName, false);
}
- public static final ImageIcon getImageIcon(String iconName, boolean optional) {
+ public static ImageIcon getImageIcon(String iconName, boolean optional) {
return getImageProvider(iconName, optional).get();
}
- public static final ImageProvider getImageProvider(String iconName) {
+ public static ImageProvider getImageProvider(String iconName) {
return getImageProvider(iconName, false);
}
- public static final ImageProvider getImageProvider(String iconName, boolean optional) {
+ public static ImageProvider getImageProvider(String iconName, boolean optional) {
return new ImageProvider(iconName).setOptional(optional);
}
- public static final String getJosmLanguage() {
+ public static String getJosmLanguage() {
String lang = Config.getPref().get("language");
if (lang == null || lang.isEmpty()) {
@@ -78,17 +77,17 @@
}
- public static final double convertMinuteSecond(double minute, double second) {
+ public static double convertMinuteSecond(double minute, double second) {
return (minute/60.0) + (second/3600.0);
}
- public static final double convertDegreeMinuteSecond(double degree, double minute, double second) {
+ public static double convertDegreeMinuteSecond(double degree, double minute, double second) {
return degree + convertMinuteSecond(minute, second);
}
- public static final File createTempDir() throws IOException {
+ public static File createTempDir() throws IOException {
return Files.createTempDirectory(TEMP_DIR_PREFIX).toFile();
}
- public static final void deleteDir(File dir) {
+ public static void deleteDir(File dir) {
for (File file : dir.listFiles()) {
if (!file.delete()) {
@@ -101,13 +100,8 @@
}
- public static final void deletePreviousTempDirs() {
+ public static void deletePreviousTempDirs() {
File tmpDir = new File(System.getProperty("java.io.tmpdir"));
if (tmpDir.exists() && tmpDir.isDirectory()) {
- for (File dir : tmpDir.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.startsWith(TEMP_DIR_PREFIX);
- }
- })) {
+ for (File dir : tmpDir.listFiles((dir, name) -> name.startsWith(TEMP_DIR_PREFIX))) {
deleteDir(dir);
}
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 36172)
+++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReaderTest.java (revision 36173)
@@ -47,5 +47,5 @@
File file = new File(TestUtils.getRegressionDataFile(9592, "bg.mif"));
try (InputStream is = new FileInputStream(file)) {
- NonRegFunctionalTests.testGeneric("#9592", MifReader.parseDataSet(is, file, newHandler("EPSG:32635"), null));
+ NonRegFunctionalTests.testGeneric("#9592", MifReader.parseDataSet(is, file, newHandler("EPSG:32635")));
}
}