Revision 5378 branches/MULTITHREADING_DEVELOPMENT/libraries/libRemoteServices/src/org/gvsig/remoteClient/wms/WMSProtocolHandler.java

View differences:

WMSProtocolHandler.java
4 4
import java.io.DataInputStream;
5 5
import java.io.File;
6 6
import java.io.FileInputStream;
7
import java.io.FileNotFoundException;
8 7
import java.io.IOException;
9
import java.io.InputStream;
10 8
import java.io.StringReader;
11 9
import java.net.MalformedURLException;
12 10
import java.net.URL;
13
import java.net.URLConnection;
14 11
import java.nio.ByteBuffer;
15 12
import java.nio.channels.FileChannel;
16 13
import java.util.ArrayList;
......
18 15
import java.util.TreeMap;
19 16
import java.util.Vector;
20 17

  
18
import org.gvsig.remoteClient.ICancellable;
21 19
import org.gvsig.remoteClient.exceptions.ServerErrorException;
22 20
import org.gvsig.remoteClient.exceptions.WMSException;
23 21
import org.gvsig.remoteClient.taskplanning.retrieving.RequestManager;
24 22
import org.gvsig.remoteClient.taskplanning.retrieving.RetrieveEvent;
25 23
import org.gvsig.remoteClient.taskplanning.retrieving.RetrieveListener;
26 24
import org.gvsig.remoteClient.taskplanning.retrieving.URLRequest;
27
import org.gvsig.remoteClient.taskplanning.retrieving.URLRetrieveTask;
28 25
import org.gvsig.remoteClient.utils.CapabilitiesTags;
29 26
import org.gvsig.remoteClient.utils.ExceptionTags;
30 27
import org.gvsig.remoteClient.utils.Utilities;
......
305 302
    	}
306 303
    }
307 304
    
308
    public void getMap(WMSStatus status) throws ServerErrorException, WMSException
305
    public void getMap(WMSStatus status, ICancellable cancel) 
309 306
    {      
310 307
		try
311 308
		{
312
			mapRequest = buildMapRequest(status);
309
			mapRequest = buildMapRequest(status, cancel);
313 310
			mapRequest.setFileName("wmsGetMap");
314 311
			mapRequest = RequestManager.getInstance().addURLRequest(mapRequest, getMapListener);
315 312
			
......
445 442
     * Builds the GetMapRequest according to the OGC WMS Specifications
446 443
     * @throws MalformedURLException 
447 444
     */
448
    private URLRequest buildMapRequest(WMSStatus status) throws MalformedURLException
445
    private URLRequest buildMapRequest(WMSStatus status, ICancellable cancel) throws MalformedURLException
449 446
    { 
450 447
		URLRequest req = new URLRequest();
451 448
		StringBuffer u = new StringBuffer();
......
471 468
		int myPort = url.getPort();
472 469
		if (myPort != -1 && myPort != 80 )
473 470
			req.setPort(myPort);
474
		
471
		req.setCancel(cancel);
475 472
		return req;
476 473
    }
477 474
    

Also available in: Unified diff