/ - Diff - Application: gvSIG desktop - gvSIG

+     *
      * $Id$
      * $Log$
      * Revision 1.3.2.2  2006-05-22 12:19:12  jaume
      * Revision 1.3.2.3  2006-05-24 08:28:08  jaume
      * *** empty log message ***
+     *
      * Revision 1.3.2.2  2006/05/22 12:19:12  jaume
      * *** empty log message ***
+     *
      * Revision 1.3.2.1  2006/05/17 09:21:49  jaume
      * *** empty log message ***
+     *
-...
+    	}
     	public void testRetrieve() {
     		queue.put(task1);
     		queue.put(task2);
     		while(!queue.isEmpty()) {
+    		}
+    	}
     //	public void testRetrieve() {
     //		queue.put(task1);
     //		queue.put(task2);
     //
     //		while(!queue.isEmpty()) {
     //		}
     //	}
     	public void testCancelling() {
     		long time = System.currentTimeMillis();
     		queue.put(task1);
     		queue.put(task3);
     		queue.put(task2);
     		boolean more = true;
     		while (!queue.isEmpty()) {
     			if (more && System.currentTimeMillis()-time > 1000) { // wait 1 seconds and cancel
     				task2.cancel();
     			if (more && System.currentTimeMillis()-time > 5000) { // wait 1 seconds and cancel
     				task3.cancel();
     				more = false;
+    			}
+    		}
-...
     		// http://192.168.0.223/prueba.rar
     		RequestManager manager = RequestManager.getInstance();
     		manager.addURLRequest(request3, listener3);
     		manager.addURLRequest(request4, listener4);
     		manager.addURLRequest(request4, listener1);
     		while (!(finished1 && finished3 && finished4)) {
     		/*manager.addURLRequest(request4, listener4);
     		manager.addURLRequest(request4, listener1);*/
     		while (!(finished3 /*&& finished1 && finished4*/)) {
+    		}
+    	}
-...
     		manager.addURLRequest(request3, listener2);
     		manager.addURLRequest(request3, listener3);
     		manager.addURLRequest(request3, listener4);
     		while (!(finished1 && finished2 && finished3 && finished4)) {
     		while (!(finished1 && finished2 && finished3)) {
+    		}
+    	}
     	public void printMessage(String who, int code) {
     	private void printMessage(String who, int code) {
     		switch (code) {
     		case RetrieveEvent.CONNECTING:
     			System.out.println(who+": connecting");

     	/**
     	 * The request failed retreiving.
     	 */
     	public static final int REQUEST_FAILED = 4;
     	public static final int REQUEST_FAILED = -4;
     	/**
     	 * The request was cancelled by somewho.
     	 */
     	public static final int REQUEST_CANCELED = 5;
     	public static final int REQUEST_CANCELED = -5;
     	/**
     	 * The task is postprocessing the request. For instance, it is closing the connection.
-...
     	public static final int POSTPROCESSING = 6;
     	/**
     	 * The task returned a non communication error but a server-kind specific error.
     	 * The task returned a non communication error but a protocol specific error.
     	 */
     	public static final int ERROR = 11;
     	public static final int ERROR = -11;
     	/**
     	 * When the url is not valid.
     	 */
     	public static final int REQUEST_FAILED_INVALID_URL = -7;
     	/**
     	 * No route to the host.
     	 */
     	public static final int REQUEST_FAILED_UNKNOWN_HOST = -8;
     	/**
     	 * No answer from the host, or the connection was refused.
     	 */
     	public static final int REQUEST_FAILED_CONNECTION_REFUSED = -9;
     	private int eventType;
     	private String fileName;

     import java.util.Iterator;
     import java.util.Vector;
     import org.gvsig.remoteClient.ICancellable;
     /**
      * @author Luis W. Sevilla (sevilla_lui@gva.es)
      */
-...
     	private Vector listeners = new Vector();
     	private RetrieveEvent event = new RetrieveEvent();
     	private URLRetrieveTask worker;
     	private ICancellable cancel;
     	public URL getUrl() throws MalformedURLException {
     		String u = protocol;
-...
     		if (listeners.size()==0) {
     			// If no body listens at, then no body cares about the result;
     			// cancel the job
     			event.setType(RetrieveEvent.REQUEST_CANCELED);
     			worker.cancel();
     			worker = null;
+    		}
-...
     		if (this.requestType != other.requestType) return false;
     		return true;
+    	}
     	public void setCancel(ICancellable cancel) {
     		this.cancel = cancel;
+    	}
     	public boolean isCanceled() {
     		if (cancel!=null)
     			return cancel.isCanceled() || event.getType() == RetrieveEvent.REQUEST_CANCELED;
     		else
     			return event.getType() == RetrieveEvent.REQUEST_CANCELED;
+    	}
+    }

     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.net.ConnectException;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.UnknownHostException;
     import java.util.Iterator;
     import java.util.Vector;
-...
     				for (int i = is.read(buffer); !canceled && i>0; i = is.read(buffer)){
     					dos.write(buffer, 0, i);
     					readed += i;
     					if (!canceled) {
     						canceled = request.isCanceled();
+    					}
+    				}
     				dos.close();
-...
     			if (canceled) {
     				// Bad incomplete file, delete it.
     				System.out.println("\n[RemoteClients:URLRetrieveTask] download cancelled ("+url+")\n");
     				System.err.println("\n[RemoteClients:URLRetrieveTask] download cancelled ("+url+")\n");
     				f.delete();
+    			}
     			running = false;
     			if (canceled)
     				request.setStatus(RetrieveEvent.REQUEST_CANCELED);
     			else
     				cancel();
     			} else
     				request.setStatus(RetrieveEvent.REQUEST_FINISHED);
     //		} catch (ConnectException e) {
     //        	JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(), PluginServices.getText(this,"server_timeout"));
     //			e.printStackTrace();
     //			return;
     //		} catch (IOException e) {
     //			JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(), PluginServices.getText(this, "cant_connect"));
     //			e.printStackTrace();
     //			return;
     //		}
     		} catch (MalformedURLException e) {
     			e.printStackTrace();
     			request.setStatus(RetrieveEvent.REQUEST_FAILED);
     			request.setStatus(RetrieveEvent.REQUEST_FAILED_INVALID_URL);
     		} catch (IOException e) {
     			e.printStackTrace();
     //			event.setMessage("cant_connect");
     			if (!canceled)
     				request.setStatus(RetrieveEvent.REQUEST_FAILED);
     			if (!canceled) {
     				if (e instanceof UnknownHostException)
     					request.setStatus(RetrieveEvent.REQUEST_FAILED_UNKNOWN_HOST);
     				else if (e instanceof ConnectException)
     					request.setStatus(RetrieveEvent.REQUEST_FAILED_CONNECTION_REFUSED);
     				else
     					request.setStatus(RetrieveEvent.ERROR);
+    			}
+    		}
     		running = false;
+    	}
     	public void cancel() {
     		canceled = true;
     		try {
     			synchronized (this) {
     				if (is != null) {
     					is.close();
-...
     		} catch (IOException e) {
     			e.printStackTrace();
+    		}
     		canceled = true;
+    	}
     	public boolean isRunning() {

     					if (r.equals(request)) {
     						System.out.println(request.getUrl()+" is cached at '"+r.getFileName()+"'");
     						request.setFileName(r.getFileName()); /* Uaaah!
     															   * Si no pose a?? l'event es
     															   * Si no pose aixo l'event es
     															   * dispara abans que haja
     															   * retornat el request
     															   * reasignat i confon el
-...
+    					}
+    				}
     				synchronized (this) {
     					if (request.getStatus() == RetrieveEvent.REQUEST_CANCELED ||
     						request.getStatus() == RetrieveEvent.REQUEST_FAILED) {
     					if (request.getStatus() < 0) { // Error codes are less than 0
     						// The last requested URL was cancelled or it failed but now it is required again
     						// so, I have to remove it and add again.
     						removeURLRequest(request);
     						return addURLRequest(request, listener);
     					} else if (request.getStatus() == RetrieveEvent.REQUEST_FINISHED) {
     						File f = new File(request.getFileName());
     						if (!f.exists()) {
     							/*
     							 * Maybe a multiple instance of the
     							 * application erased previous cached files.
+    							 *
     							 * Remove from the table, and try again.
     							 */
     							removeURLRequest(request);
     							return addURLRequest(request, listener);
+    						}
     						if (debug)
     							System.err.println("done job found ("+request.getFileName()+")");
     						RetrieveEvent event = new RetrieveEvent();
     						event.setFileName(request.getFileName());
     						event.setType(RetrieveEvent.REQUEST_FINISHED);
-...
     				if (!tempDir.exists())
     					tempDir.mkdir();
     				String fileNamePrefix = tempDirectoryPath +
     											File.separator + host +
     											File.separator + host.toString().replaceAll("[.]", "_") + /* GDAL gets confused if there is dots in the filename */
     											"-" ;
     				if (fileName.startsWith(fileNamePrefix))
     					fileName = fileName.substring(fileNamePrefix.length(), fileName.length());

     package org.gvsig.remoteClient.wms;
     import java.awt.geom.Rectangle2D;
     import java.io.File;
     import java.io.IOException;
     import java.net.ConnectException;
     import java.util.TreeMap;
     import java.util.Vector;
     import org.gvsig.remoteClient.ICancellable;
     import org.gvsig.remoteClient.exceptions.ServerErrorException;
     import org.gvsig.remoteClient.exceptions.WMSException;
     import org.gvsig.remoteClient.utils.BoundaryBox;
-...
          * <p>One of the three interfaces that OGC WMS defines. Request a map.</p>
          * @throws ServerErrorException
          */
         public void getMap(WMSStatus status) throws WMSException, ServerErrorException{
             handler.getMap(status);
         public void getMap(WMSStatus status, ICancellable cancel) {
             handler.getMap(status, cancel);
+        }
         /**

     import org.gvsig.remoteClient.utils.CapabilitiesTags;
     import org.gvsig.remoteClient.utils.ExceptionTags;
     import org.gvsig.remoteClient.wms.WMSProtocolHandler.ServiceInformation;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParserException;
-...
+    	{
     		this.version = "1.1.0";
     		this.name = "WMS1.1.0";
     		this.serviceInfo = new ServiceInformation();
     		this.layers = new TreeMap();
+    	}
-...
     // Parsing methods....
     //------------------------------------------------------------------------------
     /**
      * <p>Parse the xml data retrieved from the WMS, it will parse the WMS Capabilities</p>
      * <p>Parses the xml data retrieved from the WMS, it will parse the WMS Capabilities</p>
+     *
      */
         public void parse(File f)
+        {
         	FileReader reader = null;
+        {
         	layers.clear();
         	rootLayer = null;
         	serviceInfo = new ServiceInformation();
         	FileReader reader = null;
         	this.serviceInfo = new ServiceInformation();
         	try
+        	{
         		reader = new FileReader(f);

     import java.io.DataInputStream;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileNotFoundException;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.StringReader;
     import java.net.MalformedURLException;
     import java.net.URL;
     import java.net.URLConnection;
     import java.nio.ByteBuffer;
     import java.nio.channels.FileChannel;
     import java.util.ArrayList;
-...
     import java.util.TreeMap;
     import java.util.Vector;
     import org.gvsig.remoteClient.ICancellable;
     import org.gvsig.remoteClient.exceptions.ServerErrorException;
     import org.gvsig.remoteClient.exceptions.WMSException;
     import org.gvsig.remoteClient.taskplanning.retrieving.RequestManager;
     import org.gvsig.remoteClient.taskplanning.retrieving.RetrieveEvent;
     import org.gvsig.remoteClient.taskplanning.retrieving.RetrieveListener;
     import org.gvsig.remoteClient.taskplanning.retrieving.URLRequest;
     import org.gvsig.remoteClient.taskplanning.retrieving.URLRetrieveTask;
     import org.gvsig.remoteClient.utils.CapabilitiesTags;
     import org.gvsig.remoteClient.utils.ExceptionTags;
     import org.gvsig.remoteClient.utils.Utilities;
-...
+        	}
+        }
         public void getMap(WMSStatus status) throws ServerErrorException, WMSException
         public void getMap(WMSStatus status, ICancellable cancel)
+        {
     		try
+    		{
     			mapRequest = buildMapRequest(status);
     			mapRequest = buildMapRequest(status, cancel);
     			mapRequest.setFileName("wmsGetMap");
     			mapRequest = RequestManager.getInstance().addURLRequest(mapRequest, getMapListener);
-...
          * Builds the GetMapRequest according to the OGC WMS Specifications
          * @throws MalformedURLException
          */
         private URLRequest buildMapRequest(WMSStatus status) throws MalformedURLException
         private URLRequest buildMapRequest(WMSStatus status, ICancellable cancel) throws MalformedURLException
+        {
     		URLRequest req = new URLRequest();
     		StringBuffer u = new StringBuffer();
-...
     		int myPort = url.getPort();
     		if (myPort != -1 && myPort != 80 )
     			req.setPort(myPort);
     		req.setCancel(cancel);
     		return req;
+        }

branches/MULTITHREADING_DEVELOPMENT/libraries/libRemoteServices/src/org/gvsig/remoteClient/wms/wms_1_1_1/WMSProtocolHandler1_1_1.java
28	28	{
29	29	this.version = "1.1.1";
30	30	this.name = "WMS1.1.1";
31		this.serviceInfo = new ServiceInformation();
32	31	this.layers = new TreeMap();
33	32	}
34	33
...	...
41	40	*/
42	41	public void parse(File f)
43	42	{
44		FileReader reader = null;
	43	layers.clear();
	44	rootLayer = null;
	45	serviceInfo = new ServiceInformation();
	46
	47	FileReader reader = null;
45	48	try
46	49	{
47	50	reader = new FileReader(f);

     import org.gvsig.remoteClient.utils.CapabilitiesTags;
     import org.gvsig.remoteClient.utils.ExceptionTags;
     import org.gvsig.remoteClient.wms.WMSLayer;
     import org.gvsig.remoteClient.wms.WMSProtocolHandler.ServiceInformation;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParserException;
-...
+    	{
     		this.version = "1.3.0";
     		this.name = "WMS1.3.0";
     		this.serviceInfo = new ServiceInformation();
     		this.layers = new TreeMap();
     		this.layers = new TreeMap();
+    	}
     //------------------------------------------------------------------------------
-...
+     *
      */
         public void parse(File f)
+        {
+        {
         	layers.clear();
         	rootLayer = null;
         	serviceInfo = new ServiceInformation();
         	FileReader reader = null;
         	try
+        	{

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2005 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *  Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Ib??ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *      +34 963862235
      *   gvsig@gva.es
      *      www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     /* CVS MESSAGES:
+    *
     * $Id$
     * $Log$
     * Revision 1.1.2.1  2006-05-24 08:28:08  jaume
     * *** empty log message ***
+    *
+    *
     */
     package org.gvsig.remoteClient;
     public interface ICancellable {
     	public boolean isCanceled();
+    }

Application: gvSIG desktop

Revision 5378