Changeset 9711 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

Timestamp:

2016-02-01T23:47:27+01:00 (8 years ago)

Author:

simon04

Message:

see #12300 - Provide wrapper classes for transfer data to avoid unchecked casts

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java

@@ -64 +64 @@
     protected void importRelationMemberData(TransferSupport support, final MemberTable destination, int insertRow)
             throws UnsupportedFlavorException, IOException {
-        //noinspection unchecked
-        @SuppressWarnings("unchecked")
-        final Collection<RelationMemberData> memberData = (Collection<RelationMemberData>)
+        final RelationMemberTransferable.Data memberData = (RelationMemberTransferable.Data)
                 support.getTransferable().getTransferData(RelationMemberTransferable.RELATION_MEMBER_DATA);
-        importData(destination, insertRow, memberData, new Function<RelationMemberData, RelationMember>() {
+        importData(destination, insertRow, memberData.getRelationMemberData(), new Function<RelationMemberData, RelationMember>() {
             @Override
             public RelationMember apply(RelationMemberData member) {
@@ -84 +82 @@
     protected void importPrimitiveData(TransferSupport support, final MemberTable destination, int insertRow)
             throws UnsupportedFlavorException, IOException {
-        //noinspection unchecked
-        @SuppressWarnings("unchecked")
-        final Collection<PrimitiveData> data = (Collection<PrimitiveData>)
+        final PrimitiveTransferable.Data data = (PrimitiveTransferable.Data)
                 support.getTransferable().getTransferData(PrimitiveTransferable.PRIMITIVE_DATA);
-        importData(destination, insertRow, data, new Function<PrimitiveData, RelationMember>() {
+        importData(destination, insertRow, data.getPrimitiveData(), new Function<PrimitiveData, RelationMember>() {
             @Override
             public RelationMember apply(PrimitiveData data) {