Index: trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java (revision 12682) +++ trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java (revision 12683) @@ -3,5 +3,7 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.ht; +import static org.openstreetmap.josm.tools.I18n.tr; +import java.awt.GridBagLayout; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; @@ -9,8 +11,20 @@ import java.util.Map; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; import javax.swing.TransferHandler.TransferSupport; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; +import org.openstreetmap.josm.gui.help.HelpUtil; +import org.openstreetmap.josm.gui.widgets.UrlLabel; +import org.openstreetmap.josm.io.XmlWriter; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.LanguageInfo.LocaleType; import org.openstreetmap.josm.tools.Logging; import org.openstreetmap.josm.tools.TextTagParser; +import org.openstreetmap.josm.tools.TextTagParser.TagWarningCallback; /** @@ -47,8 +61,8 @@ Map tags = getTagsImpl(support); if (tags.isEmpty()) { - TextTagParser.showBadBufferMessage(HELP); + showBadBufferMessage(HELP); throw new IOException("Invalid tags to paste."); } - if (!TextTagParser.validateTags(tags)) { + if (!TextTagParser.validateTags(tags, TextTagPaster::warning)) { throw new IOException("Tags to paste are not valid."); } @@ -59,3 +73,63 @@ return TextTagParser.readTagsFromText((String) support.getTransferable().getTransferData(df)); } + + /** + * Default {@link TagWarningCallback} implementation. + * Displays a warning about a problematic tag and ask user what to do about it. + * @param text Message to display + * @param data Tag key and/or value + * @param code to use with {@code ExtendedDialog#toggleEnable(String)} + * @return 1 to validate and display next warnings if any, 2 to cancel operation, 3 to clear buffer, 4 to paste tags + * @since 12683 + */ + public static int warning(String text, String data, String code) { + ExtendedDialog ed = new ExtendedDialog( + Main.parent, + tr("Do you want to paste these tags?"), + tr("Ok"), tr("Cancel"), tr("Clear buffer"), tr("Ignore warnings")); + ed.setButtonIcons("ok", "cancel", "dialogs/delete", "pastetags"); + ed.setContent(""+text + "

"+XmlWriter.encode(data, true)+""); + ed.setDefaultButton(2); + ed.setCancelButton(2); + ed.setIcon(JOptionPane.WARNING_MESSAGE); + ed.toggleEnable(code); + ed.showDialog(); + int r = ed.getValue(); + if (r == 0) r = 2; + // clean clipboard if user asked + if (r == 3) ClipboardUtils.copyString(""); + return r; + } + + /** + * Shows message that the buffer can not be pasted, allowing user to clean the buffer + * @param helpTopic the help topic of the parent action + * TODO: Replace by proper HelpAwareOptionPane instead of self-made help link + */ + public static void showBadBufferMessage(String helpTopic) { + String msg = tr("

Sorry, it is impossible to paste tags from buffer. It does not contain any JOSM object" + + " or suitable text.

"); + JPanel p = new JPanel(new GridBagLayout()); + p.add(new JLabel(msg), GBC.eop()); + String helpUrl = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(helpTopic, LocaleType.DEFAULT)); + if (helpUrl != null) { + p.add(new UrlLabel(helpUrl), GBC.eop()); + } + + ExtendedDialog ed = new ExtendedDialog( + Main.parent, + tr("Warning"), + tr("Ok"), tr("Clear buffer")) + .setButtonIcons("ok", "dialogs/delete") + .setContent(p) + .setDefaultButton(1) + .setCancelButton(1) + .setIcon(JOptionPane.WARNING_MESSAGE) + .toggleEnable("tags.paste.cleanbadbuffer"); + + ed.showDialog(); + + // clean clipboard if user asked + if (ed.getValue() == 2) ClipboardUtils.copyString(""); + } } Index: trunk/src/org/openstreetmap/josm/tools/TextTagParser.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 12682) +++ trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (revision 12683) @@ -5,5 +5,4 @@ import static org.openstreetmap.josm.tools.I18n.trn; -import java.awt.GridBagLayout; import java.util.Arrays; import java.util.HashMap; @@ -13,15 +12,5 @@ import java.util.regex.Pattern; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; - import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.ExtendedDialog; -import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; -import org.openstreetmap.josm.gui.help.HelpUtil; -import org.openstreetmap.josm.gui.widgets.UrlLabel; -import org.openstreetmap.josm.io.XmlWriter; -import org.openstreetmap.josm.tools.LanguageInfo.LocaleType; /** @@ -211,9 +200,11 @@ * Gets a list of tags that are in the given text * @param buf The text to parse + * @param callback warning callback * @return The tags or null if the tags are not valid - */ - public static Map getValidatedTagsFromText(String buf) { + * @since 12683 + */ + public static Map getValidatedTagsFromText(String buf, TagWarningCallback callback) { Map tags = readTagsFromText(buf); - return validateTags(tags) ? tags : null; + return validateTags(tags, callback) ? tags : null; } @@ -258,12 +249,14 @@ * Check tags for correctness and display warnings if needed * @param tags - map key->value to check + * @param callback warning callback * @return true if the tags should be pasted - */ - public static boolean validateTags(Map tags) { + * @since 12683 + */ + public static boolean validateTags(Map tags, TagWarningCallback callback) { int r; int s = tags.size(); if (s > MAX_KEY_COUNT) { // Use trn() even if for english it makes no sense, as s > 30 - r = warning(trn("There was {0} tag found in the buffer, it is suspicious!", + r = callback.warning(trn("There was {0} tag found in the buffer, it is suspicious!", "There were {0} tags found in the buffer, it is suspicious!", s, s), "", "tags.paste.toomanytags"); @@ -274,13 +267,13 @@ String value = entry.getValue(); if (key.length() > MAX_KEY_LENGTH) { - r = warning(tr("Key is too long (max {0} characters):", MAX_KEY_LENGTH), key+'='+value, "tags.paste.keytoolong"); + r = callback.warning(tr("Key is too long (max {0} characters):", MAX_KEY_LENGTH), key+'='+value, "tags.paste.keytoolong"); if (r == 2 || r == 3) return false; if (r == 4) return true; } if (!key.matches(KEY_PATTERN)) { - r = warning(tr("Suspicious characters in key:"), key, "tags.paste.keydoesnotmatch"); + r = callback.warning(tr("Suspicious characters in key:"), key, "tags.paste.keydoesnotmatch"); if (r == 2 || r == 3) return false; if (r == 4) return true; } if (value.length() > MAX_VALUE_LENGTH) { - r = warning(tr("Value is too long (max {0} characters):", MAX_VALUE_LENGTH), value, "tags.paste.valuetoolong"); + r = callback.warning(tr("Value is too long (max {0} characters):", MAX_VALUE_LENGTH), value, "tags.paste.valuetoolong"); if (r == 2 || r == 3) return false; if (r == 4) return true; } @@ -289,53 +282,18 @@ } - private static int warning(String text, String data, String code) { - ExtendedDialog ed = new ExtendedDialog( - Main.parent, - tr("Do you want to paste these tags?"), - tr("Ok"), tr("Cancel"), tr("Clear buffer"), tr("Ignore warnings")); - ed.setButtonIcons("ok", "cancel", "dialogs/delete", "pastetags"); - ed.setContent(""+text + "

"+XmlWriter.encode(data, true)+""); - ed.setDefaultButton(2); - ed.setCancelButton(2); - ed.setIcon(JOptionPane.WARNING_MESSAGE); - ed.toggleEnable(code); - ed.showDialog(); - int r = ed.getValue(); - if (r == 0) r = 2; - // clean clipboard if user asked - if (r == 3) ClipboardUtils.copyString(""); - return r; - } - - /** - * Shows message that the buffer can not be pasted, allowing user to clean the buffer - * @param helpTopic the help topic of the parent action - * TODO: Replace by proper HelpAwareOptionPane instead of self-made help link - */ - public static void showBadBufferMessage(String helpTopic) { - String msg = tr("

Sorry, it is impossible to paste tags from buffer. It does not contain any JOSM object" - + " or suitable text.

"); - JPanel p = new JPanel(new GridBagLayout()); - p.add(new JLabel(msg), GBC.eop()); - String helpUrl = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(helpTopic, LocaleType.DEFAULT)); - if (helpUrl != null) { - p.add(new UrlLabel(helpUrl), GBC.eop()); - } - - ExtendedDialog ed = new ExtendedDialog( - Main.parent, - tr("Warning"), - tr("Ok"), tr("Clear buffer")) - .setButtonIcons("ok", "dialogs/delete") - .setContent(p) - .setDefaultButton(1) - .setCancelButton(1) - .setIcon(JOptionPane.WARNING_MESSAGE) - .toggleEnable("tags.paste.cleanbadbuffer"); - - ed.showDialog(); - - // clean clipboard if user asked - if (ed.getValue() == 2) ClipboardUtils.copyString(""); + /** + * Called when a problematic tag is encountered. + * @since 12683 + */ + @FunctionalInterface + public interface TagWarningCallback { + /** + * Displays a warning about a problematic tag and ask user what to do about it. + * @param text Message to display + * @param data Tag key and/or value + * @param code to use with {@code ExtendedDialog#toggleEnable(String)} + * @return 1 to validate and display next warnings if any, 2 to cancel operation, 3 to clear buffer, 4 to paste tags + */ + int warning(String text, String data, String code); } }