Changeset 11105 in josm for trunk/src


Ignore:
Timestamp:
2016-10-08T21:50:48+02:00 (3 years ago)
Author:
Don-vip
Message:

sonar - fix various issues

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r10957 r11105  
    108108    // For easy access when inherited
    109109    protected transient Insets contentInsets = new Insets(10, 5, 0, 5);
    110     protected List<JButton> buttons = new ArrayList<>();
     110    protected transient List<JButton> buttons = new ArrayList<>();
    111111
    112112    /**
  • trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

    r10717 r11105  
    1313import java.util.Collection;
    1414import java.util.Collections;
     15import java.util.EnumSet;
    1516import java.util.LinkedList;
    1617import java.util.List;
    17 import java.util.Set;
    1818import java.util.stream.Collectors;
    1919
     
    206206                    .collect(Collectors.joining(", "));
    207207            tfId.tryToPasteFrom(parsedText);
    208             final Set<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(Collectors.toSet());
     208            final EnumSet<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(
     209                    Collectors.toCollection(() -> EnumSet.noneOf(OsmPrimitiveType.class)));
    209210            if (types.size() == 1) {
    210211                // select corresponding type
Note: See TracChangeset for help on using the changeset viewer.