Changeset 12058 in josm


Ignore:
Timestamp:
2017-05-04T09:53:02+02:00 (22 months ago)
Author:
Don-vip
Message:

fix Java/PMD/Checkstyle warnings

Location:
trunk/src/org/openstreetmap/josm
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java

    r12048 r12058  
    2929     * @since 12048
    3030     */
    31     public interface SelectionChangeEvent {
     31    interface SelectionChangeEvent {
    3232        /**
    3333         * Gets the previous selection
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r12057 r12058  
    12451245        beginUpdate();
    12461246        try {
    1247             Collection<OsmPrimitive> toCleanUp = getPrimitives(primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
     1247            Collection<OsmPrimitive> toCleanUp = getPrimitives(
     1248                    primitive -> primitive.isDeleted() && (!primitive.isVisible() || primitive.isNew()));
    12481249            if (!toCleanUp.isEmpty()) {
    12491250                clearSelection(toCleanUp.stream().map(OsmPrimitive::getPrimitiveId));
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r12054 r12058  
    143143         */
    144144        private static long floatToFixed(double number, int totalBits, int afterDecimalBits) {
    145             long value = (long) (number * (1l << afterDecimalBits));
    146             long highestBitMask = 1l << totalBits - 1;
     145            long value = (long) (number * (1L << afterDecimalBits));
     146            long highestBitMask = 1L << totalBits - 1;
    147147            long valueMask = highestBitMask - 1;
    148148            long signBit = number < 0 ? 0 : highestBitMask;
  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

    r12047 r12058  
    330330    }
    331331
    332     private final class EmptyFillRow extends AbstractMergePanel.MergeRow {
     332    private static final class EmptyFillRow extends AbstractMergePanel.MergeRow {
    333333        @Override
    334334        protected JComponent merged() {
  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresets.java

    r12042 r12058  
    115115            KeyedItem ki = (KeyedItem) item;
    116116            if (ki.key != null && ki.getValues() != null) {
    117                 try {
    118                     PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
    119                 } catch (NullPointerException e) {
    120                     Main.error(e, p + ": Unable to cache " + ki);
    121                 }
     117                PRESET_TAG_CACHE.putAll(ki.key, ki.getValues());
    122118            }
    123119        } else if (item instanceof Roles) {
Note: See TracChangeset for help on using the changeset viewer.