Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java (revision 34553) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/ParametrizedString.java (revision 35260) @@ -9,4 +9,5 @@ import org.openstreetmap.josm.plugins.roadsigns.javacc.ParseException; import org.openstreetmap.josm.plugins.roadsigns.javacc.TokenMgrError; +import org.openstreetmap.josm.tools.Logging; /** @@ -76,10 +77,10 @@ List tmp = null; tmp = ParamStringScanner.parseIt(input); - StringBuffer curString = new StringBuffer(); + StringBuilder curString = new StringBuilder(); for (StringOrParameter sp : tmp) { if (sp instanceof Prm) { if (curString.length() > 0) { token.add(new Str(curString.toString())); - curString = new StringBuffer(); + curString = new StringBuilder(); } token.add(sp); @@ -105,5 +106,5 @@ String val = env.get(((Prm) t).ident); if (val == null) { - System.err.println("Warning: Parameter not in environment: "+((Prm) t).ident+" ("+this.toString()+")"); + Logging.warn("Parameter not in environment: "+((Prm) t).ident+" ("+this.toString()+")"); Thread.dumpStack(); val = ""; Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (revision 34553) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (revision 35260) @@ -11,5 +11,4 @@ import java.awt.Rectangle; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -59,5 +58,4 @@ import javax.swing.event.DocumentListener; import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; import javax.swing.table.AbstractTableModel; @@ -119,5 +117,5 @@ this.signs = RoadSignsPlugin.signs; sel = new SignSelection(); - setButtonIcons(new String[] {"ok.png", "cancel.png"}); + setButtonIcons("ok.png", "cancel.png"); final JTabbedPane tabs = new JTabbedPane(); tabs.add(tr("signs"), buildSignsPanel()); @@ -247,12 +245,9 @@ info.setText(" "); info.setBackground(this.getBackground()); - info.addHyperlinkListener(new HyperlinkListener() { - @Override - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e == null || e.getURL() == null) - return; - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - OpenBrowser.displayUrl(e.getURL().toString()); - } + info.addHyperlinkListener(e -> { + if (e == null || e.getURL() == null) + return; + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + OpenBrowser.displayUrl(e.getURL().toString()); } }); @@ -594,10 +589,5 @@ addTrafficSignTag = new JCheckBox(tr("{0} tag", "traffic_sign")); addTrafficSignTag.setSelected(Config.getPref().getBoolean("plugin.roadsigns.addTrafficSignTag")); - addTrafficSignTag.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - previewModel.update(); - } - }); + addTrafficSignTag.addActionListener(e -> previewModel.update()); previewPanel.add(scroll, GBC.eol().fill()); @@ -720,5 +710,5 @@ TagEvaluater te = tags.get(t.tag_ref); if (te == null) { - System.err.println(String.format("warning: referenced tag with ident '%s' not found for appending tag %s.", + Logging.warn(String.format("referenced tag with ident '%s' not found for appending tag %s.", t.tag_ref, t.toString())); } else { @@ -728,5 +718,5 @@ TagEvaluater te = tags.get(t.tag_ref); if (te == null) { - System.err.println(String.format("warning: referenced tag with ident '%s' not found for condition tag %s.", + Logging.warn(String.format("referenced tag with ident '%s' not found for condition tag %s.", t.tag_ref, t.toString())); } else { @@ -734,5 +724,5 @@ } } else { - System.err.println(String.format("warning: found tag_ref but neither append_value nor condition for tag %s.", + Logging.warn(String.format("found tag_ref but neither append_value nor condition for tag %s.", t.toString())); } @@ -742,5 +732,5 @@ if (tags.get(t.ident) != null) { - System.err.println(String.format("warning: tag identifier %s for %s already in use. ", t.ident, t.toString())); + Logging.warn(String.format("tag identifier %s for %s already in use. ", t.ident, t.toString())); } tags.put(t.ident, new TagEvaluater(t)); @@ -793,10 +783,5 @@ info.setText(longText()); /* scroll up again */ - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - scrollInfo.getVerticalScrollBar().setValue(0); - } - }); + SwingUtilities.invokeLater(() -> scrollInfo.getVerticalScrollBar().setValue(0)); sel.add(sign); } Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java =================================================================== --- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (revision 34553) +++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (revision 35260) @@ -35,4 +35,5 @@ import org.openstreetmap.josm.plugins.roadsigns.RoadSignInputDialog.SettingsPanel; import org.openstreetmap.josm.spi.preferences.Config; +import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.Shortcut; import org.openstreetmap.josm.tools.Utils; @@ -48,4 +49,6 @@ public static final PresetMetaData PRESET_BE = new PresetMetaData( "BE", tr("Belgium"), "resource://data/roadsignpresetBE.xml", "resource://images/BE/"); + public static final PresetMetaData PRESET_CZ = new PresetMetaData( + "CZ", tr("Czech Republic"), "resource://data/roadsignpresetCZ.xml", "resource://images/CZ/"); public static final PresetMetaData PRESET_ES = new PresetMetaData( "ES", tr("Spain"), "resource://data/roadsignpresetES.xml", "resource://images/ES/"); @@ -56,5 +59,6 @@ public static final PresetMetaData PRESET_SK = new PresetMetaData( "SK", tr("Slovakia"), "resource://data/roadsignpresetSK.xml", "resource://images/SK/"); - public static final Collection DEFAULT_PRESETS = Arrays.asList(PRESET_BE, PRESET_ES, PRESET_DE, PRESET_PL, PRESET_SK); + public static final Collection DEFAULT_PRESETS = Arrays.asList( + PRESET_BE, PRESET_CZ, PRESET_ES, PRESET_DE, PRESET_PL, PRESET_SK); public RoadSignsPlugin(PluginInformation info) { @@ -93,6 +97,6 @@ String code = Config.getPref().get("plugin.roadsigns.preset.selection", null); if (code == null) { - ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(), tr("Settings"), new String[] {tr("Ok"), tr("Cancel")}); - ed.setButtonIcons(new String[] {"ok", "cancel"}); + ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(), tr("Settings"), tr("Ok"), tr("Cancel")); + ed.setButtonIcons("ok", "cancel"); SettingsPanel settings = new SettingsPanel(true, null); ed.setContent(settings); @@ -195,6 +199,5 @@ customIconDirs.add("resource://images/"); } - PresetMetaData custom = new PresetMetaData("custom", tr("custom"), customFile, Utils.join(",", customIconDirs)); - presetsData.add(custom); + presetsData.add(new PresetMetaData("custom", tr("custom"), customFile, Utils.join(",", customIconDirs))); } else { Config.getPref().put("plugin.roadsigns.sources.last", null); @@ -230,5 +233,5 @@ } catch (IOException ex) { - ex.printStackTrace(); + Logging.error(ex); JOptionPane.showMessageDialog( MainApplication.getMainFrame(), @@ -239,5 +242,5 @@ throw ex; } catch (SAXException ex) { - ex.printStackTrace(); + Logging.error(ex); JOptionPane.showMessageDialog( MainApplication.getMainFrame(),