Ticket #22832: josm_22832_general.patch

File josm_22832_general.patch, 18.4 KB (added by gaben, 2 years ago)

  • src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java 

    Subject: [PATCH] General
---
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java
    a b  
    130130            } else if (o instanceof Exception) {
    131131                return ExceptionUtil.explainException((Exception) o).replace("<html>", "").replace("</html>", "");
    132132            } else {
    133                 return (String) null;
     133                return null;
    134134            }
    135135        }).filter(Objects::nonNull).collect(Collectors.toList());
    136136    }

  • src/org/openstreetmap/josm/actions/AddImageryLayerAction.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java b/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
    a b  
    291291
    292292        final String url = wms.buildGetMapUrl(
    293293                selection.layers.stream().map(LayerDetails::getName).collect(Collectors.toList()),
    294                 (List<String>) null,
     294                null,
    295295                selection.format,
    296296                selection.transparent
    297297                );

  • src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java
    a b  
    292292    public AbstractMapRenderer createActiveRenderer(Graphics2D g, NavigatableComponent viewport, boolean isInactiveMode) {
    293293        try {
    294294            Constructor<?> c = activeRenderer.getConstructor(Graphics2D.class, NavigatableComponent.class, boolean.class);
    295             return AbstractMapRenderer.class.cast(c.newInstance(g, viewport, isInactiveMode));
     295            return (AbstractMapRenderer) c.newInstance(g, viewport, isInactiveMode);
    296296        } catch (ReflectiveOperationException | IllegalArgumentException e) {
    297297            throw new MapRendererFactoryException(e);
    298298        }

  • src/org/openstreetmap/josm/data/ImageData.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/data/ImageData.java b/src/org/openstreetmap/josm/data/ImageData.java
    a b  
    247247     */
    248248    public void removeImageToSelection(ImageEntry image) {
    249249        int index = data.indexOf(image);
    250         selectedImagesIndex.remove(selectedImagesIndex.indexOf(index));
     250        selectedImagesIndex.remove((Integer) index);
    251251        if (selectedImagesIndex.isEmpty()) {
    252252            selectedImagesIndex.add(-1);
    253253        }

  • src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
    a b  
    417417        this.data.mergeFrom(l.getImageData());
    418418
    419419        setName(l.getName());
    420         thumbsLoaded &= l.thumbsLoaded;
     420        synchronized (l) {
     421            thumbsLoaded &= l.thumbsLoaded;
     422        }
    421423    }
    422424
    423425    private static Dimension scaledDimension(Image thumb) {

  • src/org/openstreetmap/josm/gui/layer/AutosaveTask.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java b/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java
    a b  
    394394    public List<File> getUnsavedLayersFiles() {
    395395        List<File> result = new ArrayList<>();
    396396        try {
    397             File[] files = autosaveDir.listFiles((FileFilter)
     397            File[] files = autosaveDir.listFiles(
    398398                    pathname -> OsmImporter.FILE_FILTER.accept(pathname) || NoteImporter.FILE_FILTER.accept(pathname));
    399399            if (files == null)
    400400                return result;

  • src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
    a b  
    829829         * @return {@code true} if the object is an unclosed multipolygon
    830830         */
    831831        static boolean unclosed_multipolygon(Environment e) {
    832             return e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() &&
     832            return e.osm instanceof Relation && e.osm.isMultipolygon() &&
    833833                    !e.osm.isIncomplete() && !((Relation) e.osm).hasIncompleteMembers() &&
    834834                    !MultipolygonCache.getInstance().get((Relation) e.osm).getOpenEnds().isEmpty();
    835835        }

  • src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
    a b  
    453453        public Object evaluate(final Environment env) {
    454454            List<?> l = Cascade.convertTo(args.get(0).evaluate(env), List.class);
    455455            if (args.size() != 1 || l == null)
    456                 l = Utils.transform(args, (Function<Expression, Object>) x -> x.evaluate(env));
     456                l = Utils.transform(args, x -> x.evaluate(env));
    457457            return aggregateList(l);
    458458        }
    459459    }

  • src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java
    a b  
    155155        if (wms != null && wms.buildRootUrl() != null) {
    156156            wmsUrl.setText(wms.buildGetMapUrl(
    157157                    tree.getSelectedLayers().stream().map(LayerDetails::getName).collect(Collectors.toList()),
    158                     (List<String>) null,
     158                    null,
    159159                    (String) formats.getSelectedItem(),
    160160                    true // TODO: ask user about transparency
    161161                )

  • src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/GaussKruegerProjectionChoice.java
    a b  
    2626
    2727    @Override
    2828    public String getCurrentCode() {
    29         return "EPSG:"+Integer.toString(31466 + index);
     29        return "EPSG:"+ (31466 + index);
    3030    }
    3131
    3232    @Override

  • src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
    a b  
    5656
    5757    @Override
    5858    public String getCurrentCode() {
    59         return "EPSG:" + Integer.toString(3942+index); //CC42 is EPSG:3942 (up to EPSG:3950 for CC50)
     59        return "EPSG:" + (3942 + index); //CC42 is EPSG:3942 (up to EPSG:3950 for CC50)
    6060    }
    6161
    6262    @Override

  • src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java b/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
    a b  
    5151
    5252    @Override
    5353    public String getCurrentCode() {
    54         return "EPSG:" + Integer.toString(27561+index);
     54        return "EPSG:" + (27561 + index);
    5555    }
    5656
    5757    @Override

  • src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java b/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
    a b  
    1414import java.util.Map.Entry;
    1515import java.util.Objects;
    1616import java.util.Set;
    17 import java.util.function.Function;
    1817import java.util.stream.Collectors;
    1918
    2019import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    4140import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    4241import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
    4342import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
    44 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
    4543import org.openstreetmap.josm.tools.CheckParameterUtil;
    4644import org.openstreetmap.josm.tools.MultiMap;
    4745import org.openstreetmap.josm.tools.Utils;
    … …  
    293291        if (r != null && !Utils.isEmpty(presets)) {
    294292            for (TaggingPreset tp : presets) {
    295293                if (tp.roles != null) {
    296                     list.add(Utils.transform(tp.roles.roles, (Function<Role, String>) x -> x.key), AutoCompletionPriority.IS_IN_STANDARD);
     294                    list.add(Utils.transform(tp.roles.roles, x -> x.key), AutoCompletionPriority.IS_IN_STANDARD);
    297295                }
    298296            }
    299297            list.add(r.getMemberRoles(), AutoCompletionPriority.IS_IN_DATASET);

  • src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
    a b  
    7878        List<String> keys = new ArrayList<>();
    7979        keys.add(key);
    8080        if (alternative_autocomplete_keys != null) {
    81             for (String k : alternative_autocomplete_keys.split(",", -1)) {
    82                 keys.add(k);
    83             }
     81            Collections.addAll(keys, alternative_autocomplete_keys.split(",", -1));
    8482        }
    8583        getAllForKeys(keys).forEach(model::addElement);
    8684

  • src/org/openstreetmap/josm/tools/HiDPISupport.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/tools/HiDPISupport.java b/src/org/openstreetmap/josm/tools/HiDPISupport.java
    a b  
    223223            return processor.apply(imgs);
    224224        }
    225225        List<List<Image>> allVars = imgs.stream().map(HiDPISupport::getResolutionVariants).collect(Collectors.toList());
    226         int maxVariants = allVars.stream().mapToInt(List<Image>::size).max().getAsInt();
     226        int maxVariants = allVars.stream().mapToInt(List::size).max().getAsInt();
    227227        if (maxVariants == 1)
    228228            return processor.apply(imgs);
    229229        List<Image> imgsProcessed = IntStream.range(0, maxVariants)

  • src/org/openstreetmap/josm/tools/Territories.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/src/org/openstreetmap/josm/tools/Territories.java b/src/org/openstreetmap/josm/tools/Territories.java
    a b  
    199199                if (event == Event.START_OBJECT) {
    200200                    for (JsonValue feature : json.getObject().getJsonArray("features")) {
    201201                        ofNullable(feature.asJsonObject().getJsonObject("properties")).ifPresent(props ->
    202                         ofNullable(props.getJsonObject("urls")).ifPresent(urls ->
    203                         ofNullable(urls.getString(TAGINFO)).ifPresent(taginfo -> {
     202                        ofNullable(props.getJsonObject("urls")).flatMap(urls ->
     203                        ofNullable(urls.getString(TAGINFO))).ifPresent(taginfo -> {
    204204                            JsonArray iso1 = props.getJsonArray(ISO3166_1_LC);
    205205                            JsonArray iso2 = props.getJsonArray(ISO3166_2_LC);
    206206                            if (iso1 != null) {
    … …  
    208208                            } else if (iso2 != null) {
    209209                                readExternalTaginfo(taginfoGeofabrikCache, taginfo, iso2, source);
    210210                            }
    211                         })));
     211                        }));
    212212                    }
    213213                }
    214214            }

  • test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java b/test/unit/org/openstreetmap/josm/testutils/mockers/ExtendedDialogMocker.java
    a b  
    1212import java.util.Optional;
    1313import java.util.WeakHashMap;
    1414
     15import mockit.Invocation;
     16import mockit.Mock;
    1517import org.junit.platform.commons.util.ReflectionUtils;
    1618import org.openstreetmap.josm.TestUtils;
    1719import org.openstreetmap.josm.gui.ExtendedDialog;
    1820import org.openstreetmap.josm.tools.Logging;
    1921
    20 import mockit.Invocation;
    21 import mockit.Mock;
    22 
    2322/**
    2423 * MockUp for {@link ExtendedDialog} allowing a test to pre-seed uses of {@link ExtendedDialog}
    2524 * with mock "responses". This works best with {@link ExtendedDialog}s which have their contents set
    … …  
    214213        final ExtendedDialog retval = invocation.proceed(message);
    215214        // must set this *after* the regular invocation else that will fall through to
    216215        // setContent(Component, boolean) which would overwrite it (with null)
    217         this.simpleStringContentMemo.put((ExtendedDialog) invocation.getInvokedInstance(), message);
     216        this.simpleStringContentMemo.put(invocation.getInvokedInstance(), message);
    218217        return retval;
    219218    }
    220219
    221220    @Mock
    222221    private ExtendedDialog setContent(final Invocation invocation, final Component content, final boolean placeContentInScrollPane) {
    223         this.simpleStringContentMemo.put((ExtendedDialog) invocation.getInvokedInstance(), null);
     222        this.simpleStringContentMemo.put(invocation.getInvokedInstance(), null);
    224223        return invocation.proceed(content, placeContentInScrollPane);
    225224    }
    226225}