Changeset 10801 in josm

Timestamp:

2016-08-15T13:25:30+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13341 - refactor construction of data flavors, specify classloader to use

Location:

trunk/src/org/openstreetmap/josm/gui/datatransfer

Files:

• ClipboardUtils.java (modified) (1 diff)
• LayerTransferable.java (modified) (1 diff)
• data/LayerTransferData.java (modified) (2 diffs)
• data/OsmLayerTransferData.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java

@@ -148 +148 @@
         });
     }
+
+    /**
+     * Returns a new {@link DataFlavor} for the given class and human-readable name.
+     * @param c class
+     * @param humanPresentableName the human-readable string used to identify this flavor
+     * @return a new {@link DataFlavor} for the given class and human-readable name
+     * @since 10801
+     */
+    public static DataFlavor newDataFlavor(Class<?> c, String humanPresentableName) {
+        try {
+            return new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType + ";class=" + c.getName(),
+                    humanPresentableName, c.getClassLoader());
+        } catch (ClassNotFoundException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/datatransfer/LayerTransferable.java

@@ -63 +63 @@
      * Data flavor for {@link Layer}s which are wrapped in {@link Data}.
      */
-    public static final DataFlavor LAYER_DATA = new DataFlavor(
-            DataFlavor.javaJVMLocalObjectMimeType + ";class=" + Data.class.getName(), "Layers");
+    public static final DataFlavor LAYER_DATA = ClipboardUtils.newDataFlavor(Data.class, "Layers");
 
     private final Data data;

trunk/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java

@@ -7 +7 @@
 import java.util.List;
 
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.datatransfer.LayerTransferable;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -20 +21 @@
      * This is a data flavor for all layer types
      */
-    public static final DataFlavor FLAVOR = new DataFlavor(
-            DataFlavor.javaJVMLocalObjectMimeType + ";class=" + LayerTransferData.class.getName(), "Layer");
+    public static final DataFlavor FLAVOR = ClipboardUtils.newDataFlavor(LayerTransferData.class, "Layer");
 
     /**

trunk/src/org/openstreetmap/josm/gui/datatransfer/data/OsmLayerTransferData.java

@@ -7 +7 @@
 import java.util.List;
 
+import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
 import org.openstreetmap.josm.gui.datatransfer.LayerTransferable;
 import org.openstreetmap.josm.gui.layer.LayerManager;
@@ -23 +24 @@
      * @see #FLAVORS
      */
-    public static final DataFlavor OSM_FLAVOR = new DataFlavor(
-            DataFlavor.javaJVMLocalObjectMimeType + ";class=" + LayerTransferData.class.getName(), "Layer");
+    public static final DataFlavor OSM_FLAVOR = ClipboardUtils.newDataFlavor(OsmLayerTransferData.class, "Layer");
 
     /**