Changeset 10737 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
- Timestamp:
- 2016-08-05T20:09:55+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java
r10604 r10737 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.gui.datatransfer.importers; 3 4 import static org.openstreetmap.josm.gui.help.HelpUtil.ht; 3 5 4 6 import java.awt.datatransfer.DataFlavor; … … 18 20 */ 19 21 public final class TextTagPaster extends AbstractTagPaster { 22 private static final String help = ht("/Action/PasteTags"); 20 23 21 24 /** … … 29 32 public boolean supports(TransferSupport support) { 30 33 try { 31 return super.supports(support) && getTags(support) != null;34 return super.supports(support) && containsValidTags(support); 32 35 } catch (UnsupportedFlavorException | IOException e) { 33 36 Main.warn(e); … … 36 39 } 37 40 41 private boolean containsValidTags(TransferSupport support) throws UnsupportedFlavorException, IOException { 42 Map<String, String> tags = getTagsImpl(support); 43 return tags != null && !tags.isEmpty(); 44 } 45 38 46 @Override 39 47 protected Map<String, String> getTags(TransferSupport support) throws UnsupportedFlavorException, IOException { 48 Map<String, String> tags = getTagsImpl(support); 49 if (tags == null || tags.isEmpty()) { 50 TextTagParser.showBadBufferMessage(help); 51 throw new IOException("Invalid tags to paste."); 52 } 53 if (!TextTagParser.validateTags(tags)) { 54 throw new IOException("Tags to paste are not valid."); 55 } 56 return tags; 57 } 58 59 private Map<String, String> getTagsImpl(TransferSupport support) throws UnsupportedFlavorException, IOException { 40 60 return TextTagParser.readTagsFromText((String) support.getTransferable().getTransferData(df)); 41 61 }
Note:
See TracChangeset
for help on using the changeset viewer.