Changeset 18597 in osm for applications/editors/josm/plugins/wmsplugin

Timestamp:

2009-11-14T20:01:49+01:00 (15 years ago)

Author:

jttt

Message:

Updated to new MapViewPaintable.paint arguments

Location:

applications/editors/josm/plugins/wmsplugin

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/wmsplugin/WMSLayer.java (modified) (10 diffs)

applications/editors/josm/plugins/wmsplugin/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="lib" path="C:/prj.ht/josm-snapshot-467.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="build"/>
 </classpath>

applications/editors/josm/plugins/wmsplugin/build.xml

@@ -32 +32 @@
     <property name="ant.build.javac.target" value="1.5"/>
         <property name="commit.message"         value="fixing JOSM issue #3186" />
-        <property name="josm.reference.release" value="2323" />
+        <property name="josm.reference.release" value="2450" />
 
     <target name="init">

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -5 +5 @@
 import java.awt.Component;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -27 +28 @@
 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 +71 @@
         /** 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 +81 @@
                 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 +114 @@
 
         @Override
-        public void destroy() { 
+        public void destroy() {
                 try {
                         executor.shutdownNow();
@@ -163 +165 @@
         }
 
-        @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 +193 @@
                                         + "This is likely to lead to invalid WMS request. You should check your<br>"
                                         + "preference settings.<br>"
-                                        + "Do you want to fetch WMS tiles anyway?",                                     
+                                        + "Do you want to fetch WMS tiles anyway?",
                                         url);
                 String [] options = new String[] {
@@ -198 +200 @@
                 };
                 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 +230 @@
                         );
                         return;
-                }               
-                
+                }
+
                 for(int x = bminx; x<bmaxx; ++x) {
                         for(int y = bminy; y<bmaxy; ++y){
@@ -352 +354 @@
                 }
         }
-        
+
         public class SaveWmsAction extends AbstractAction {
                 public SaveWmsAction() {