Changeset 29187 in osm for applications

Timestamp:

2013-01-11T09:43:32+01:00 (12 years ago)

Author:

the111

Message:

Fix #josm8342 - some image references are package dependent

Location:

applications/viewer/jmapviewer

Files:

• releases/2013-01-11 (added)
• releases/2013-01-11/JMapViewer_2013-01-11.zip (added)
• src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (modified) (2 diffs)
• src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (2 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -144 +144 @@
         int size = 18;
         try {
-            ImageIcon icon = new ImageIcon(getClass().getResource("images/plus.png"));
+            ImageIcon icon = new ImageIcon(JMapViewer.class.getResource("images/plus.png"));
             zoomInButton = new JButton(icon);
         } catch (Exception e) {
@@ -160 +160 @@
         add(zoomInButton);
         try {
-            ImageIcon icon = new ImageIcon(getClass().getResource("images/minus.png"));
+            ImageIcon icon = new ImageIcon(JMapViewer.class.getResource("images/minus.png"));
             zoomOutButton = new JButton(icon);
         } catch (Exception e) {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -29 +29 @@
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.JMapViewer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
@@ -175 +176 @@
     public Image getAttributionImage() {
         try {
-            return ImageIO.read(getClass().getResourceAsStream("/org/openstreetmap/gui/jmapviewer/images/bing_maps.png"));
+            return ImageIO.read(JMapViewer.class.getResourceAsStream("images/bing_maps.png"));
         } catch (IOException e) {
             return null;