Index: /applications/editors/josm/plugins/livegps/.classpath =================================================================== --- /applications/editors/josm/plugins/livegps/.classpath (revision 18596) +++ /applications/editors/josm/plugins/livegps/.classpath (revision 18597) @@ -2,5 +2,5 @@ - + Index: /applications/editors/josm/plugins/livegps/build.xml =================================================================== --- /applications/editors/josm/plugins/livegps/build.xml (revision 18596) +++ /applications/editors/josm/plugins/livegps/build.xml (revision 18597) @@ -26,5 +26,5 @@ - + Index: /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java =================================================================== --- /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java (revision 18596) +++ /applications/editors/josm/plugins/livegps/src/livegps/LiveGpsLayer.java (revision 18597) @@ -4,5 +4,5 @@ import java.awt.Color; -import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Point; import java.beans.PropertyChangeEvent; @@ -14,4 +14,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.gpx.GpxData; @@ -20,5 +21,4 @@ import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.layer.GpxLayer; -import org.openstreetmap.josm.tools.ColorHelper; public class LiveGpsLayer extends GpxLayer implements PropertyChangeListener { @@ -101,10 +101,10 @@ } - @Override public void paint(Graphics g, MapView mv) + @Override public void paint(Graphics2D g, MapView mv, Bounds bounds) { //System.out.println("in paint"); synchronized (LiveGpsLock.class) { //System.out.println("in synced paint"); - super.paint(g, mv); + super.paint(g, mv, bounds); // int statusHeight = 50; // Rectangle mvs = mv.getBounds(); Index: /applications/editors/josm/plugins/openlayers/build.xml =================================================================== --- /applications/editors/josm/plugins/openlayers/build.xml (revision 18596) +++ /applications/editors/josm/plugins/openlayers/build.xml (revision 18597) @@ -37,5 +37,5 @@ - + Index: /applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java =================================================================== --- /applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (revision 18596) +++ /applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (revision 18597) @@ -1,13 +1,18 @@ package org.openstreetmap.josm.plugins.openLayers; -import java.awt.*; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Graphics2D; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import javax.swing.*; +import javax.swing.Icon; +import javax.swing.JMenuItem; +import javax.swing.JSeparator; import org.mozilla.javascript.NativeArray; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.RenameLayerAction; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; import org.openstreetmap.josm.data.coor.LatLon; @@ -51,5 +56,5 @@ */ @Override - public void paint(Graphics g, MapView mv) { + public void paint(Graphics2D g, MapView mv, Bounds bounds) { setSize(Main.map.mapView.getSize()); browser.paint(g); Index: /applications/editors/josm/plugins/piclayer/.classpath =================================================================== --- /applications/editors/josm/plugins/piclayer/.classpath (revision 18597) +++ /applications/editors/josm/plugins/piclayer/.classpath (revision 18597) @@ -0,0 +1,7 @@ + + + + + + + Index: /applications/editors/josm/plugins/piclayer/.project =================================================================== --- /applications/editors/josm/plugins/piclayer/.project (revision 18597) +++ /applications/editors/josm/plugins/piclayer/.project (revision 18597) @@ -0,0 +1,17 @@ + + + JOSM-piclayer + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + Index: /applications/editors/josm/plugins/piclayer/build.xml =================================================================== --- /applications/editors/josm/plugins/piclayer/build.xml (revision 18596) +++ /applications/editors/josm/plugins/piclayer/build.xml (revision 18597) @@ -81,5 +81,5 @@ - + Index: /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java =================================================================== --- /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (revision 18596) +++ /applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (revision 18597) @@ -37,7 +37,8 @@ import javax.swing.JSeparator; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.coor.EastNorth; import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.MapView; import org.openstreetmap.josm.gui.layer.Layer; @@ -70,5 +71,5 @@ // Layer icon private Icon m_layericon = null; - + // Keys for saving in Properties private final String INITIAL_POS_X = "INITIAL_POS_X"; @@ -186,7 +187,7 @@ @Override - public void paint(Graphics arg0, MapView arg1) { - - if ( m_image != null && arg0 instanceof Graphics2D) { + public void paint(Graphics2D g2, MapView mv, Bounds bounds) { + + if ( m_image != null && g2 instanceof Graphics2D) { // Position image at the right graphical place @@ -200,5 +201,5 @@ // Let's use Graphics 2D - Graphics2D g = (Graphics2D)arg0.create(); + Graphics2D g = (Graphics2D)g2.create(); // Move g.translate( pic_offset_x, pic_offset_y ); @@ -294,5 +295,5 @@ props.put(ANGLE, "" + m_angle); } - + /** * Loads calibration data from properties structure Index: /applications/editors/josm/plugins/routes/build.xml =================================================================== --- /applications/editors/josm/plugins/routes/build.xml (revision 18596) +++ /applications/editors/josm/plugins/routes/build.xml (revision 18597) @@ -35,5 +35,5 @@ - + Index: /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java =================================================================== --- /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (revision 18596) +++ /applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (revision 18597) @@ -3,5 +3,4 @@ import java.awt.Color; import java.awt.Component; -import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Stroke; @@ -12,4 +11,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Relation; @@ -95,5 +95,5 @@ @Override - public void paint(Graphics g, MapView mv) { + public void paint(Graphics2D g, MapView mv, Bounds bounds) { DataSet dataset = Main.main.getCurrentDataSet(); @@ -121,10 +121,10 @@ } - Stroke stroke = ((Graphics2D)g).getStroke(); + Stroke stroke = g.getStroke(); Color color = g.getColor(); for (ConvertedWay way:pathBuilder.getConvertedWays()) { - pathPainter.drawWay(way, mv, (Graphics2D) g); + pathPainter.drawWay(way, mv, g); } - ((Graphics2D)g).setStroke(stroke); + g.setStroke(stroke); g.setColor(color); } Index: /applications/editors/josm/plugins/routing/build.xml =================================================================== --- /applications/editors/josm/plugins/routing/build.xml (revision 18596) +++ /applications/editors/josm/plugins/routing/build.xml (revision 18597) @@ -44,5 +44,5 @@ - + Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java =================================================================== --- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java (revision 18596) +++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java (revision 18597) @@ -46,4 +46,5 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.RenameLayerAction; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Way; @@ -227,5 +228,5 @@ */ @Override - public void paint(Graphics g, MapView mv) { + public void paint(Graphics2D g, MapView mv, Bounds bounds) { boolean isActiveLayer = (mv.getActiveLayer().equals(this)); // Get routing nodes (start, middle, end) Index: /applications/editors/josm/plugins/walkingpapers/.project =================================================================== --- /applications/editors/josm/plugins/walkingpapers/.project (revision 18596) +++ /applications/editors/josm/plugins/walkingpapers/.project (revision 18597) @@ -1,5 +1,5 @@ - slippymap + JOSM-walkingpapers Index: /applications/editors/josm/plugins/walkingpapers/build.xml =================================================================== --- /applications/editors/josm/plugins/walkingpapers/build.xml (revision 18596) +++ /applications/editors/josm/plugins/walkingpapers/build.xml (revision 18597) @@ -26,5 +26,5 @@ - + Index: /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java =================================================================== --- /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java (revision 18596) +++ /applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java (revision 18597) @@ -5,5 +5,5 @@ import java.awt.Color; import java.awt.Component; -import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Image; import java.awt.Point; @@ -30,9 +30,9 @@ /** * Class that displays a slippy map layer. Adapted from SlippyMap plugin for Walking Papers use. - * + * * @author Frederik Ramm * @author LuVar * @author Dave Hansen - * + * */ public class WalkingPapersLayer extends Layer implements ImageObserver { @@ -55,5 +55,5 @@ private String tileUrlTemplate; private String walkingPapersId; - + @SuppressWarnings("serial") public WalkingPapersLayer(String id, String tile, Bounds b, int minz, int maxz) { @@ -66,7 +66,7 @@ this.minzoom = minz; this.maxzoom = maxz; currentZoomLevel = minz; - + clearTileStorage(); - + Layer.listeners.add(new LayerChangeListener() { public void activeLayerChange(Layer oldLayer, Layer newLayer) { @@ -182,8 +182,8 @@ */ @Override - public void paint(Graphics g, MapView mv) { + public void paint(Graphics2D g, MapView mv, Bounds bounds) { LatLon topLeft = mv.getLatLon(0, 0); LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight()); - Graphics oldg = g; + Graphics2D oldg = g; if (botRight.lon() == 0.0 || botRight.lat() == 0) { @@ -200,10 +200,10 @@ return; } - + needRedraw = false; lastTopLeft = topLeft; lastBotRight = botRight; bufferImage = mv.createImage(mv.getWidth(), mv.getHeight()); - g = bufferImage.getGraphics(); + g = (Graphics2D) bufferImage.getGraphics(); if (!LatLon.isValidLat(topLeft.lat()) || @@ -228,5 +228,5 @@ viewportMaxY = tmp; } - + if (viewportMaxX-viewportMinX > 18) return; if (viewportMaxY-viewportMinY > 18) return; @@ -255,5 +255,5 @@ if (tile == null) { // check if tile is in range - Bounds tileBounds = new Bounds(new LatLon(tileYToLat(y+1), tileXToLon(x)), + Bounds tileBounds = new Bounds(new LatLon(tileYToLat(y+1), tileXToLon(x)), new LatLon(tileYToLat(y), tileXToLon(x+1))); if (!tileBounds.asRect().intersects(printBounds.asRect())) continue; @@ -275,5 +275,5 @@ } } - + if (count == 0) { @@ -283,5 +283,5 @@ oldg.drawImage(bufferImage, 0, 0, null); - + if (imageScale != null) { // If each source image pixel is being stretched into > 3 @@ -289,5 +289,5 @@ if (imageScale > 3) { increaseZoomLevel(); - this.paint(oldg, mv); + this.paint(oldg, mv, bounds); } @@ -296,7 +296,7 @@ else if (imageScale < 0.32) { decreaseZoomLevel(); - this.paint(oldg, mv); - } - } + this.paint(oldg, mv, bounds); + } + } }// end of paint metod @@ -310,7 +310,7 @@ } } - + if (tilex == -1) return null; - + for (int y = viewportMinY; y <= viewportMaxY; y++) { if (pixelpos[0][y - viewportMinY + 1].y > py) { @@ -319,5 +319,5 @@ } } - + if (tiley == -1) return null; @@ -411,9 +411,9 @@ Main.pref.listener.remove(WalkingPapersLayer.this); } - + public String getWalkingPapersId() { return walkingPapersId; } - + public URL formatImageUrl(int x, int y, int z) { String urlstr = tileUrlTemplate. @@ -427,4 +427,4 @@ } } - + } Index: /applications/editors/josm/plugins/wmsplugin/.classpath =================================================================== --- /applications/editors/josm/plugins/wmsplugin/.classpath (revision 18596) +++ /applications/editors/josm/plugins/wmsplugin/.classpath (revision 18597) @@ -2,6 +2,6 @@ - + Index: /applications/editors/josm/plugins/wmsplugin/build.xml =================================================================== --- /applications/editors/josm/plugins/wmsplugin/build.xml (revision 18596) +++ /applications/editors/josm/plugins/wmsplugin/build.xml (revision 18597) @@ -32,5 +32,5 @@ - + Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (revision 18596) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java (revision 18597) @@ -5,4 +5,5 @@ import java.awt.Component; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.Toolkit; import java.awt.event.ActionEvent; @@ -27,4 +28,5 @@ import org.openstreetmap.josm.actions.DiskAccessAction; import org.openstreetmap.josm.actions.SaveActionBase; +import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.ProjectionBounds; import org.openstreetmap.josm.data.coor.EastNorth; @@ -69,5 +71,5 @@ /** set to true if the user confirmed to use an potentially invalid WMS base url */ private boolean isInvalidUrlConfirmed = false; - + public WMSLayer() { this(tr("Blank Layer"), null, null); @@ -79,5 +81,5 @@ super(name); alphaChannel.setSelected(Main.pref.getBoolean("wmsplugin.alpha_channel")); - setBackgroundLayer(true); /* set global background variable */ + setBackgroundLayer(true); /* set global background variable */ initializeImages(); this.baseURL = baseURL; @@ -112,5 +114,5 @@ @Override - public void destroy() { + public void destroy() { try { executor.shutdownNow(); @@ -163,5 +165,5 @@ } - @Override public void paint(Graphics g, final MapView mv) { + @Override public void paint(Graphics2D g, final MapView mv, Bounds bounds) { if(baseURL == null) return; if (usesInvalidUrl && !isInvalidUrlConfirmed) return; @@ -191,5 +193,5 @@ + "This is likely to lead to invalid WMS request. You should check your
" + "preference settings.
" - + "Do you want to fetch WMS tiles anyway?", + + "Do you want to fetch WMS tiles anyway?", url); String [] options = new String[] { @@ -198,10 +200,10 @@ }; int ret = JOptionPane.showOptionDialog( - Main.parent, + Main.parent, msg, tr("Invalid URL?"), - JOptionPane.YES_NO_OPTION, - JOptionPane.WARNING_MESSAGE, - null, + JOptionPane.YES_NO_OPTION, + JOptionPane.WARNING_MESSAGE, + null, options, options[1] ); @@ -228,6 +230,6 @@ ); return; - } - + } + for(int x = bminx; x