Revision 2378 org.gvsig.raster.wms/branches/org.gvsig.raster.wms_dataaccess_refactoring/org.gvsig.raster.wms.io/src/main/java/org/gvsig/raster/wms/io/WMSDataParametersImpl.java

View differences:

WMSDataParametersImpl.java
39 39
import org.gvsig.tools.dynobject.DynClass;
40 40
import org.gvsig.tools.dynobject.DynStruct;
41 41
import org.gvsig.tools.persistence.PersistenceManager;
42
import org.gvsig.tools.persistence.PersistentState;
43
import org.gvsig.tools.persistence.exception.PersistenceException;
44 42

  
45 43
/**
46 44
 * Parameters for the WMS provider
......
170 168
		return definition;
171 169
	}
172 170
	
171
	
172
	/*@SuppressWarnings("unchecked")
173
	@Override
174
	public void loadFromState(PersistentState state)
175
			throws PersistenceException {
176
		super.loadFromState(state);
177
		
178
		if (state.hasValue(FIELD_STYLES)) {
179
			List<RemoteWMSStyle> styleList = state.getList(FIELD_STYLES);
180
			if(styleList != null) {
181
				Vector<RemoteWMSStyle> v = new Vector<RemoteWMSStyle>();
182
				v.addAll(styleList);
183
				setStyles(v);
184
			}
185
		}
186
		if (state.hasValue(FIELD_DIMENSIONS)) {
187
			List<String> dimList = state.getList(FIELD_DIMENSIONS);
188
			if(dimList != null) {
189
				Vector<String> v = new Vector<String>();
190
				v.addAll(dimList);
191
				setDimensions(v);
192
			}
193
		}
194
		
195
		if(state.getMap(FIELD_ONLINERESOURC) != null)
196
			setOnlineResources(new Hashtable<String, String>(state.getMap(FIELD_ONLINERESOURC)));
197
		
198
		if (state.hasValue(FIELD_FIXEDSIZE)) {
199
			setFixedSize((Dimension) state.get(FIELD_FIXEDSIZE));
200
		} else {
201
			setFixedSize(null);
202
		}
203
		setExtent((Rectangle2D)state.get(FIELD_EXTENT));
204
	}*/
205
	
173 206
	/**
174 207
	 * Gets the format
175 208
	 * @return
......
305 338
		this.setDynValue(FIELD_OVERRIDE, new Boolean(over));;
306 339
	}
307 340
	
308
	public void setStyles(Vector<RemoteWMSStyle> styles) {
341
	public void setStyles(List<RemoteWMSStyle> styles) {
309 342
		this.setDynValue(FIELD_STYLES, styles);
310 343
	}
311 344
	
......
313 346
	 * @param styles
314 347
	 */
315 348
	@SuppressWarnings("unchecked")
316
	public Vector<RemoteWMSStyle> getStyles() {
317
		return (Vector<RemoteWMSStyle>) this.getDynValue(FIELD_STYLES);
349
	public List<RemoteWMSStyle> getStyles() {
350
		return (List<RemoteWMSStyle>) this.getDynValue(FIELD_STYLES);
318 351
	}
319 352
	
320 353
	public void setDimensions(Vector<String> dimensions) {
......
331 364
		return (Vector<String>) this.getDynValue(FIELD_DIMENSIONS);
332 365
	}
333 366

  
334
	public void setOnlineResources(Hashtable<String, String> onlineResources) {
367
	public void setOnlineResources(Map<String, String> onlineResources) {
335 368
		this.setDynValue(FIELD_ONLINERESOURC, onlineResources);
336 369
	}
337 370
	
......
490 523
		setInfoLayerQuery(p.getInfoLayerQuery());
491 524
		setLayerQuery(p.getLayerQuery());
492 525
		setName(getName());
493
		setOnlineResources((Hashtable<String, String>)p.getDynValue(FIELD_ONLINERESOURC));
526
		setOnlineResources((Map<String, String>)p.getDynValue(FIELD_ONLINERESOURC));
494 527
		setOverrideHost(p.isOverridingHost());
495 528
		setQueryable(p.isQueryable());
496 529
		setSRS(p.getSRSCode());
......
499 532
		setDimensions(p.getDimensions());
500 533
		setCancellable(p.getCancellable());
501 534
	}
502
	
503
	@SuppressWarnings("unchecked")
504
	@Override
505
	public void loadFromState(PersistentState state)
506
			throws PersistenceException {
507
		super.loadFromState(state);
508
		
509
		if (state.hasValue(FIELD_STYLES)) {
510
			List<RemoteWMSStyle> styleList = state.getList(FIELD_STYLES);
511
			if(styleList != null) {
512
				Vector<RemoteWMSStyle> v = new Vector<RemoteWMSStyle>();
513
				v.addAll(styleList);
514
				setStyles(v);
515
			}
516
		}
517
		if (state.hasValue(FIELD_DIMENSIONS)) {
518
			List<String> dimList = state.getList(FIELD_DIMENSIONS);
519
			if(dimList != null) {
520
				Vector<String> v = new Vector<String>();
521
				v.addAll(dimList);
522
				setDimensions(v);
523
			}
524
		}
525
		
526
		if(state.getMap(FIELD_ONLINERESOURC) != null)
527
			setOnlineResources(new Hashtable<String, String>(state.getMap(FIELD_ONLINERESOURC)));
528
		
529
		if (state.hasValue(FIELD_FIXEDSIZE)) {
530
			setFixedSize((Dimension) state.get(FIELD_FIXEDSIZE));
531
		} else {
532
			setFixedSize(null);
533
		}
534
		setExtent((Rectangle2D)state.get(FIELD_EXTENT));
535
	}
536

  
537
	
538 535
}

Also available in: Unified diff