Changeset 32738 in osm for applications/editors

Timestamp:

2016-07-28T23:12:29+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 10657

Location:

applications/editors/josm/plugins/FastDraw

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (3 diffs)

applications/editors/josm/plugins/FastDraw/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="[josm_fastdraw] Fix incorrect settings saving-2"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="10657"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.TextTagParser;
-import org.openstreetmap.josm.tools.Utils;
 
 public class FastDrawConfigDialog extends ExtendedDialog {
@@ -57 +57 @@
             @Override
             public void actionPerformed(ActionEvent e) {
-                String s = Utils.getClipboardContent();
+                String s = ClipboardUtils.getClipboardStringContent();
                 if (TextTagParser.getValidatedTagsFromText(s) != null) {
                     addTags.setText(s);

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

@@ -8 +8 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38 +40 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -578 +582 @@
             Set<OsmPrimitive> ts = new HashSet<>();
             ts.add(w);
-            TagPaster tp = new TagPaster(Main.pasteBuffer.getDirectlyAdded(), ts);
-            List<Tag> execute = tp.execute();
-            for (Tag t : execute) {
-                w.put(t.getKey(), t.getValue());
+            try {
+                PrimitiveTransferData data = (PrimitiveTransferData) ClipboardUtils.getClipboard().getData(PrimitiveTransferData.DATA_FLAVOR);
+                for (Tag t : new TagPaster(data.getDirectlyAdded(), ts).execute()) {
+                    w.put(t.getKey(), t.getValue());
+                }
+            } catch (UnsupportedFlavorException | IOException e) {
+                Main.error(e);
             }
         }