Revision 1360

View differences:

org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.app/org.gvsig.raster.wcs.app.wcsclient/src/main/java/org/gvsig/raster/wcs/app/wcsclient/gui/wizard/WCSWizard.java
258 258
	    	try {
259 259
	    		explorer.connect(cancel);
260 260
			} catch (RemoteServiceException e) {
261
				String msg = getIOExceptionMessage(e);
261
				String msg = e.getMessage() + " : " + getIOExceptionMessage(e);
262 262
				if(msg != null) {
263 263
					logger.info(msg, e);
264 264
					JOptionPane.showMessageDialog(getWCSParamsPanel(), msg, Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.app/org.gvsig.raster.wcs.app.wcsclient/src/main/java/org/gvsig/raster/wcs/app/wcsclient/layer/FLyrWCS.java
54 54
import java.util.HashMap;
55 55

  
56 56
import javax.print.attribute.PrintRequestAttributeSet;
57
import javax.swing.JOptionPane;
57 58

  
58 59
import org.cresques.cts.IProjection;
59 60
import org.gvsig.compat.net.ICancellable;
......
92 93
import org.gvsig.fmap.mapcontext.layers.FLayer;
93 94
import org.gvsig.fmap.mapcontext.layers.FLyrDefault;
94 95
import org.gvsig.fmap.mapcontext.layers.Tiling;
96
import org.gvsig.gui.beans.Messages;
95 97
import org.gvsig.raster.fmap.layers.DefaultFLyrRaster;
96 98
import org.gvsig.raster.fmap.layers.IRasterLayerActions;
97 99
import org.gvsig.raster.fmap.layers.NotAvailableStateException;
......
375 377
					getRender().drawTiledService(g, vp2, vp.getImageSize(), taskStatus);
376 378
                }
377 379
            } catch (RasterDriverException e) {
378
                throw new RemoteServiceException("Problems drawing this layer: " + e.getMessage(), e);
380
            	setAvailable(false);
381
				JOptionPane.showMessageDialog(null, "Problems drawing this layer:" + e.getMessage(), Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
382
				logger.info("Problems drawing this layer:" + e.getMessage(), e);
379 383
            } catch (InvalidSetViewException e) {
380 384
                throw new RemoteServiceException("Problems drawing this layer: " + e.getMessage(), e);
381 385
            } catch (ProcessInterruptedException e) {
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/resources/org/gvsig/raster/wcs/io/i18n/text.properties
1
error_connecting=Error conectando con el servidor
2
malformed_url=URL mal formada
0 3

  
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/resources/org/gvsig/raster/wcs/io/i18n/text_en.properties
1
error_connecting=Error connecting with the server
2
malformed_url=Malformed URL
0 3

  
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/DefaultWCSIOLibrary.java
21 21
 */
22 22
package org.gvsig.raster.wcs.io;
23 23

  
24
import org.gvsig.i18n.Messages;
24 25
import org.gvsig.tools.library.AbstractLibrary;
25 26
import org.gvsig.tools.library.LibraryException;
26 27
/**
......
40 41
	protected void doInitialize() throws LibraryException {
41 42
		//RasterLibrary.wakeUp();
42 43
		WCSDataParametersImpl.registerPersistence();
44
		
45
		Messages.addResourceFamily("org.gvsig.raster.wcs.io.i18n.text",
46
				DefaultWCSIOLibrary.class.getClassLoader(),
47
				DefaultWCSIOLibrary.class.getClass().getName()); 
43 48
	}
44 49

  
45 50
	@Override
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSServerExplorer.java
45 45
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
46 46
import org.gvsig.fmap.dal.spi.DataServerExplorerProvider;
47 47
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices;
48
import org.gvsig.i18n.Messages;
48 49

  
49 50
/**
50 51
 * Explorer for a WCS server
......
181 182
		try {
182 183
			url = new URL(parameters.getHost());
183 184
		} catch (Exception e) {
184
			throw new RemoteServiceException("Malformed URL",e);
185
			throw new RemoteServiceException(Messages.getText("malformed_url"), e);
185 186
		}
186 187
        try {
187 188
        	connector = WCSProvider.getConnectorFromURL(url);
188 189
        	if (!connector.connect(override, cancellable))
189
        		throw new RemoteServiceException("Error connecting");
190
        		throw new RemoteServiceException(Messages.getText("error_connecting"));
190 191
        } catch (IOException e) {
191
			throw new RemoteServiceException("Error connecting",e);
192
			throw new RemoteServiceException(Messages.getText("error_connecting"), e);
192 193
		}
193 194
		
194 195
	}
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/pom.xml
85 85
            <artifactId>org.gvsig.tools.lib</artifactId>
86 86
            <scope>compile</scope>
87 87
        </dependency>
88
        <dependency>
89
            <groupId>org.gvsig</groupId>
90
            <artifactId>org.gvsig.i18n</artifactId>
91
            <scope>compile</scope>
92
        </dependency>
88 93
	</dependencies>
89 94
</project>
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/layer/FLyrWMS.java
40 40
import java.util.prefs.Preferences;
41 41

  
42 42
import javax.print.attribute.PrintRequestAttributeSet;
43
import javax.swing.JOptionPane;
43 44

  
44 45
import org.cresques.cts.ICoordTrans;
45 46
import org.cresques.cts.IProjection;
......
82 83
import org.gvsig.fmap.mapcontext.layers.Tiling;
83 84
import org.gvsig.fmap.mapcontext.layers.operations.ComposedLayer;
84 85
import org.gvsig.fmap.mapcontext.rendering.legend.ILegend;
86
import org.gvsig.gui.beans.Messages;
85 87
import org.gvsig.raster.fmap.layers.DefaultFLyrRaster;
86 88
import org.gvsig.raster.fmap.layers.IRasterLayerActions;
87 89
import org.gvsig.raster.fmap.layers.NotAvailableStateException;
......
441 443
				//this.updateDrawVersion();
442 444
			} catch (RasterDriverException e) {
443 445
				setAvailable(false);
444
				logger.error("Problems drawing this layer:" + e.getMessage(), e);
446
				JOptionPane.showMessageDialog(null, "Problems drawing this layer:" + e.getMessage(), Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
447
				logger.info("Problems drawing this layer:" + e.getMessage(), e);
445 448
			} catch (InvalidSetViewException e) {
446 449
				throw new RemoteServiceException("Problems drawing this layer: " + e.getMessage(), e);
447 450
			} catch (ProcessInterruptedException e) {
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.app/org.gvsig.raster.wms.app.wmsclient/src/main/java/org/gvsig/raster/wms/app/wmsclient/gui/wizard/WMSWizard.java
264 264
	    	try {
265 265
		    		explorer.connect(cancel, getWMSParamsPanel().isUpdatingCache());
266 266
			} catch (RemoteServiceException e) {
267
				String msg = getIOExceptionMessage(e);
267
				String msg = e.getMessage() + " : " + getIOExceptionMessage(e);
268 268
				if(msg != null) {
269 269
					LoggerFactory.getLogger(getClass()).info(msg, e);
270 270
					JOptionPane.showMessageDialog(getWMSParamsPanel(), msg, Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/resources/org/gvsig/raster/wms/io/i18n/text.properties
1
error_connecting=Error conectando con el servidor
2
malformed_url=URL mal formada
0 3

  
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/resources/org/gvsig/raster/wms/io/i18n/text_en.properties
1
error_connecting=Error connecting with the server
2
malformed_url=Malformed URL
0 3

  
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/DefaultWMSIOLibrary.java
21 21
 */
22 22
package org.gvsig.raster.wms.io;
23 23

  
24
import org.gvsig.i18n.Messages;
24 25
import org.gvsig.raster.wms.io.time.DefaultDimension;
25 26
import org.gvsig.raster.wms.io.time.TimeDimension;
26 27
import org.gvsig.tools.library.AbstractLibrary;
......
46 47
		DefaultDimension.registerPersistent();
47 48
		TimeDimension.registerPersistent();
48 49
		WMSDataParametersImpl.registerPersistence();
50
		
51
		Messages.addResourceFamily("org.gvsig.raster.wms.io.i18n.text",
52
				DefaultWMSIOLibrary.class.getClassLoader(),
53
				DefaultWMSIOLibrary.class.getClass().getName()); 
49 54
	}
50 55

  
51 56
	@Override
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSServerExplorer.java
48 48
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
49 49
import org.gvsig.fmap.dal.spi.DataServerExplorerProvider;
50 50
import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices;
51
import org.gvsig.i18n.Messages;
51 52

  
52 53
/**
53 54
 * Explorer for a WMS server
......
175 176
		try {
176 177
			url = new URL(parameters.getHost());
177 178
		} catch (Exception e) {
178
			throw new RemoteServiceException("Malformed URL",e);
179
			throw new RemoteServiceException(Messages.getText("malformed_url"), e);
179 180
		}
180 181
        try {
181 182
        	connector = WMSProvider.getConnectorFromURL(url, updateCache);
182 183
        	if (!connector.connect(updateCache, cancellable))
183
        		throw new RemoteServiceException("Error connecting");
184
        		throw new RemoteServiceException(Messages.getText("error_connecting"));
184 185
        } catch (IOException e) {
185
			throw new RemoteServiceException("Error connecting",e);
186
			throw new RemoteServiceException(Messages.getText("error_connecting"), e);
186 187
		}
187 188
		
188 189
	}
org.gvsig.raster.wms/trunk/org.gvsig.raster.wms/org.gvsig.raster.wms.io/pom.xml
80 80
            <artifactId>org.gvsig.tools.lib</artifactId>
81 81
            <scope>compile</scope>
82 82
        </dependency>
83
        <dependency>
84
            <groupId>org.gvsig</groupId>
85
            <artifactId>org.gvsig.i18n</artifactId>
86
            <scope>compile</scope>
87
        </dependency>
83 88
	</dependencies>
84 89
</project>

Also available in: Unified diff