[Git][debian-gis-team/jmapviewer][upstream] New upstream version 2.15+dfsg
Bas Couwenberg
gitlab at salsa.debian.org
Wed Mar 17 04:54:45 GMT 2021
Bas Couwenberg pushed to branch upstream at Debian GIS Project / jmapviewer
Commits:
f1fb7935 by Bas Couwenberg at 2021-03-17T05:47:30+01:00
New upstream version 2.15+dfsg
- - - - -
12 changed files:
- Readme.txt
- src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
- src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
- src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
- src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java
- src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
- src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java
- src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
- src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
- src/org/openstreetmap/gui/jmapviewer/Tile.java
- src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
- src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
Changes:
=====================================
Readme.txt
=====================================
@@ -10,7 +10,7 @@ JMapViewer
(c) 2010-2011, Michael Vigovsky
(c) 2011-2017, Paul Hartmann
(c) 2011-2016, Gleb Smirnoff
-(c) 2011-2020, Vincent Privat
+(c) 2011-2021, Vincent Privat
(c) 2011, Jason Huntley
(c) 2012-2016, Simon Legner
(c) 2012, Teemu Koskinen
=====================================
src/org/openstreetmap/gui/jmapviewer/JMapViewer.java
=====================================
@@ -88,7 +88,7 @@ public class JMapViewer extends JPanel implements TileLoaderListener {
protected JButton zoomOutButton;
/**
- * Apparence of zoom controls.
+ * Appearance of zoom controls.
*/
public enum ZOOM_BUTTON_STYLE {
/** Zoom buttons are displayed horizontally (default) */
=====================================
src/org/openstreetmap/gui/jmapviewer/JMapViewerTree.java
=====================================
@@ -27,10 +27,10 @@ public class JMapViewerTree extends JPanel {
/** Serial Version UID */
private static final long serialVersionUID = 3050203054402323972L;
- private JMapViewer map;
- private CheckBoxTree tree;
- private JPanel treePanel;
- private JSplitPane splitPane;
+ private final JMapViewer map;
+ private final CheckBoxTree tree;
+ private final JPanel treePanel;
+ private final JSplitPane splitPane;
public JMapViewerTree(String name) {
this(name, false);
=====================================
src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java
=====================================
@@ -21,8 +21,8 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
public class MapMarkerCircle extends MapObjectImpl implements MapMarker {
private Coordinate coord;
- private double radius;
- private STYLE markerStyle;
+ private final double radius;
+ private final STYLE markerStyle;
/**
* Constructs a new {@code MapMarkerCircle}.
=====================================
src/org/openstreetmap/gui/jmapviewer/MapObjectImpl.java
=====================================
@@ -91,11 +91,11 @@ public abstract class MapObjectImpl {
}
private boolean isVisibleLayer() {
- return layer == null || layer.isVisible() == null ? true : layer.isVisible();
+ return layer == null || layer.isVisible() == null || layer.isVisible();
}
public boolean isVisible() {
- return visible == null ? isVisibleLayer() : visible.booleanValue();
+ return visible == null ? isVisibleLayer() : visible;
}
public void setVisible(Boolean visible) {
=====================================
src/org/openstreetmap/gui/jmapviewer/MapPolygonImpl.java
=====================================
@@ -19,7 +19,7 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapPolygon;
public class MapPolygonImpl extends MapObjectImpl implements MapPolygon {
- private List<? extends ICoordinate> points;
+ private final List<? extends ICoordinate> points;
public MapPolygonImpl(ICoordinate... points) {
this(null, null, points);
=====================================
src/org/openstreetmap/gui/jmapviewer/MapRectangleImpl.java
=====================================
@@ -12,8 +12,8 @@ import org.openstreetmap.gui.jmapviewer.interfaces.MapRectangle;
public class MapRectangleImpl extends MapObjectImpl implements MapRectangle {
- private Coordinate topLeft;
- private Coordinate bottomRight;
+ private final Coordinate topLeft;
+ private final Coordinate bottomRight;
public MapRectangleImpl(Coordinate topLeft, Coordinate bottomRight) {
this(null, null, topLeft, bottomRight);
=====================================
src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
=====================================
@@ -124,7 +124,7 @@ public class MemoryTileCache implements TileCache {
* {@link #next} and {@link #prev} item in the list.
*/
protected static class CacheEntry {
- private Tile tile;
+ private final Tile tile;
private CacheEntry next;
private CacheEntry prev;
=====================================
src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java
=====================================
@@ -166,7 +166,7 @@ public class OsmTileLoader implements TileLoader {
try {
str = urlConn.getHeaderField("Cache-Control");
if (str != null) {
- for (String token: str.split(",")) {
+ for (String token: str.split(",", -1)) {
if (token.startsWith("max-age=")) {
lng = Long.parseLong(token.substring(8)) * 1000 +
System.currentTimeMillis();
=====================================
src/org/openstreetmap/gui/jmapviewer/Tile.java
=====================================
@@ -90,7 +90,7 @@ public class Tile {
private static class CachedCallable<V> implements Callable<V> {
private V result;
- private Callable<V> callable;
+ private final Callable<V> callable;
/**
* Wraps callable so it is evaluated only once
=====================================
src/org/openstreetmap/gui/jmapviewer/checkBoxTree/CheckBoxTree.java
=====================================
@@ -3,6 +3,7 @@ package org.openstreetmap.gui.jmapviewer.checkBoxTree;
import java.awt.BorderLayout;
import java.awt.event.MouseAdapter;
+import java.util.Objects;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
@@ -150,7 +151,11 @@ public class CheckBoxTree extends JTree {
private static void setChildrens(DefaultMutableTreeNode node, Boolean value) {
for (int i = 0; i < node.getChildCount(); i++) {
DefaultMutableTreeNode childNode = node(node.getChildAt(i));
- if (!data(childNode).isSelected().equals(data(node).isSelected())) {
+ // Fix NPE from #20557
+ final CheckBoxNodeData childData = data(childNode);
+ final CheckBoxNodeData nodeData = data(node);
+ if (childData != null && nodeData != null &&
+ !Objects.equals(childData.isSelected(), nodeData.isSelected())) {
data(childNode).setSelected(data(node).isSelected());
setChildrens(childNode, value);
}
=====================================
src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java
=====================================
@@ -95,7 +95,7 @@ public class TemplatedTMSTileSource extends TMSTileSource implements TemplatedTi
Matcher m = PATTERN_SWITCH.matcher(baseUrl);
if (m.find()) {
rand = new Random();
- randomParts = m.group(1).split(",");
+ randomParts = m.group(1).split(",", -1);
}
// Capturing group pattern on header values
replacePattern((matcher, output) -> {
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/commit/f1fb7935d3ad7d719c417c2413d10dbb5eb262fc
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jmapviewer/-/commit/f1fb7935d3ad7d719c417c2413d10dbb5eb262fc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210317/55f7623b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list