Revision 1355

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/dialog/WCSPropsDialog.java
319 319

  
320 320
					if (parent != null) {
321 321
						FLayer layer = wcsParamsTabbedPane.getLayer();
322
						if(layer == null)
323
							return;
322 324
						mapCtrl.getMapContext().getLayers().
323 325
						replaceLayer(fLayer.getName(), layer);
324 326
					} else {
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/panel/WCSParamsPanel.java
25 25
import java.awt.event.FocusEvent;
26 26
import java.awt.event.FocusListener;
27 27
import java.awt.geom.Rectangle2D;
28
import java.lang.reflect.InvocationTargetException;
28 29
import java.util.ArrayList;
29 30
import java.util.prefs.Preferences;
30 31

  
32
import javax.swing.JOptionPane;
31 33
import javax.swing.JTabbedPane;
32 34

  
33 35
import org.gvsig.andami.PluginServices;
......
41 43
import org.gvsig.fmap.dal.exception.ProviderNotRegisteredException;
42 44
import org.gvsig.fmap.mapcontext.exceptions.LoadLayerException;
43 45
import org.gvsig.fmap.mapcontext.layers.FLayer;
46
import org.gvsig.gui.beans.Messages;
44 47
import org.gvsig.raster.wcs.app.wcsclient.layer.FLyrWCS;
45 48
import org.gvsig.raster.wcs.io.FMapWCSParameter;
46 49
import org.gvsig.raster.wcs.io.WCSDataParameters;
47 50
import org.gvsig.raster.wcs.io.WCSLayerNode;
48 51
import org.gvsig.raster.wcs.io.WCSServerExplorer;
52
import org.slf4j.Logger;
53
import org.slf4j.LoggerFactory;
49 54

  
50 55

  
51 56
/**
......
65 70
public class WCSParamsPanel extends WizardPanel {
66 71
	private static final long      serialVersionUID   = 1L;
67 72
	public	static Preferences     fPrefs             = Preferences.userRoot().node( "gvsig.wcs-wizard" );
73
	private Logger                 log                = LoggerFactory.getLogger(WCSParamsPanel.class);
68 74
	protected WCSServerExplorer    explorer           = null;
69 75
	private LayerPanel             layerPanel         = null;
70 76
	private InfoPanel              infoPanel          = null;
......
154 160
			layer.setFullExtent(getExtent());
155 161
			layer.setName(getLayerName());
156 162
		} catch (InitializeException e) {
157
			throw new LoadLayerException("Error initializating layer", e);
163
			if (e.getCause() instanceof InvocationTargetException) {
164
				Throwable t = ((InvocationTargetException)e.getCause()).getTargetException().getCause();
165
				if(t != null) {
166
					String msg = t.getMessage();
167
					JOptionPane.showMessageDialog(this, msg, Messages.getText("Error"), JOptionPane.ERROR_MESSAGE);
168
				}
169
			}
170
			log.info(e.getMessage(), e);
171
			return null;
158 172
		}
159 173
		return layer;
160 174
	}
......
162 176
	/**
163 177
	 * Refreshes the content shown by this.
164 178
	 */
165
	@SuppressWarnings("rawtypes")
166 179
	public void refreshData(WCSDataParameters par) {
167 180
		String coverageName = getLayerPanel().getSelectedInListCoverageName();
168 181
		if(coverageName == null && par != null) {
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
709 709
	public void execute() {
710 710
		try {
711 711
			FLayer layer = wcsParamsPanel.getLayer(getChkTileCache().isSelected());
712
			if(layer == null)
713
				return;
712 714
			this.getMapCtrl().getMapContext().getLayers().addLayer(layer);
713 715
		} catch (LoadLayerException e) {
714 716
			logger.info("The layer cannot be added", e);
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
780 780
            throw new InitializeException(e);
781 781
        } catch (ProviderNotRegisteredException e) {
782 782
            throw new InitializeException(e);
783
        } catch (InitializeException e) {
784
            throw new InitializeException(e);
785 783
        } catch (LoadLayerException e) {
786 784
            throw new InitializeException(e);
787 785
        }
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSConnector.java
372 372
		} catch (ServerErrorException e) {
373 373
			throw new RemoteServiceException(getName(), e);
374 374
		} catch (org.gvsig.remoteclient.exceptions.WCSException e) {
375
			throw new RemoteServiceException(getName(), e);
375
			throw new RemoteServiceException(e.getMessage(), e);
376 376
		}
377 377
	}
378 378
	
org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.io/src/main/java/org/gvsig/raster/wcs/io/WCSProvider.java
77 77
import org.gvsig.remoteclient.wcs.WCSStatus;
78 78
import org.gvsig.tools.ToolsLocator;
79 79
import org.gvsig.tools.task.TaskStatus;
80
import org.slf4j.Logger;
81
import org.slf4j.LoggerFactory;
82 80
/**
83 81
 * Clase que representa al driver de acceso a datos de wcs.
84 82
 *
......
89 87
	public static String                DESCRIPTION              = "Wcs Raster file";
90 88
	public static final String          METADATA_DEFINITION_NAME = "WcsStore";
91 89
	
92
	private static final Logger         logger                   = LoggerFactory.getLogger(WCSProvider.class);
93 90
	private Extent                      viewRequest              = null;
94 91
	private static Hashtable<URL, WCSConnector>    
95 92
	                                    drivers                  = new Hashtable<URL, WCSConnector> ();
......
121 118
	 * @param fName Nombre del fichero
122 119
	 * @throws NotSupportedExtensionException
123 120
	 */
124
	public WCSProvider(String params) throws NotSupportedExtensionException {
121
	public WCSProvider(String params) throws InitializeException {
125 122
		super(params);
126 123
		if(params instanceof String) {
127 124
			WCSDataParametersImpl p = new WCSDataParametersImpl();
......
135 132
	}
136 133
	
137 134
	public WCSProvider(WCSDataParametersImpl params,
138
			DataStoreProviderServices storeServices) throws NotSupportedExtensionException {
135
			DataStoreProviderServices storeServices) throws InitializeException {
139 136
		super(params, storeServices, ToolsLocator.getDynObjectManager()
140 137
				.createDynObject(
141 138
						MetadataLocator.getMetadataManager().getDefinition(
......
169 166
	 * @param proj Proyecci?n
170 167
	 * @param param Parametros de carga
171 168
	 * @throws NotSupportedExtensionException
169
	 * @throws RasterDriverException 
172 170
	 */
173 171
	public void init (DataStoreParameters params,
174
			DataStoreProviderServices storeServices) throws NotSupportedExtensionException {
172
			DataStoreProviderServices storeServices) throws InitializeException {
175 173
		setParam(storeServices, params);
176 174
		open = true;
177 175
		try {
178 176
			loadInitialInfo();
179 177
		} catch (RasterDriverException e) {
180
			logger.info("Loaded default values in WCS provider", e);
178
			throw new InitializeException(e.getMessage(), e);
181 179
		}
182 180
		
183 181
		stats = new RemoteDataStoreStatistics(this);

Also available in: Unified diff