Revision 32538 branches/v2_0_0_prep/libraries/org.gvsig.arcims/src/org/gvsig/remoteclient/arcims/ArcImsStatus.java

View differences:

ArcImsStatus.java
30 30

  
31 31
import java.awt.Dimension;
32 32
import java.awt.geom.Rectangle2D;
33
import java.util.List;
34
import java.util.Map;
35 33
import java.util.Vector;
36 34

  
37
import org.gvsig.fmap.dal.DataStoreParameters;
38
import org.gvsig.fmap.dal.feature.EditableFeatureType;
39
import org.gvsig.fmap.dal.feature.FeatureType;
40
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
41 35
import org.gvsig.fmap.geom.primitive.Point;
42 36
import org.gvsig.fmap.geom.primitive.impl.Envelope2D;
43 37
import org.gvsig.remoteclient.RemoteClientStatus;
44
import org.gvsig.remoteclient.arcims.utils.FieldInformation;
45 38
import org.gvsig.remoteclient.arcims.utils.ServiceInformation;
46
import org.gvsig.remoteclient.arcims.utils.ServiceInformationLayerFeatures;
47 39

  
48 40
/**
49 41
 * Describes the status of a ArcImsclient, so it adds to the Remote client
......
59 51
public class ArcImsStatus extends RemoteClientStatus implements Cloneable {
60 52

  
61 53
	private String serverURL;
62

  
63 54
	private String serviceType;
64
	
55
	private String serviceName;
65 56
	private String serverVersion;
66
	
67 57
	private String newLayerName;
68 58
	/**
69 59
	 * List of layer to be retrieved by the ArcIms
70 60
	 */
71
	private Vector<String> layersQuery;
61
	private Vector<String> layersIdsSelected;
72 62

  
73 63
	/**
74 64
	 * List of layer styles
......
85 75
	 */
86 76
	private boolean transparency;
87 77
	private String onlineResource;
88
	private String serviceName;
89 78
	private Vector<Dimension> dimensions;
90 79
	private ServiceInformation serviceInfo;
91 80
	public boolean verbose;
92
	private List<FeatureType> layersFeatureType;
93 81

  
94 82
	/**
95 83
	 * Constructor
96 84
	 * 
97 85
	 */
98 86
	public ArcImsStatus() {
99
		layersQuery = new Vector<String>();
87
		layersIdsSelected = new Vector<String>();
100 88
		styles = new Vector<String>();
101 89
		verbose = false;
102 90
	}
......
127 115
	 * 
128 116
	 * @return Vector, the list of layers
129 117
	 */
130
	public Vector<String> getLayerIds() {
131
		return layersQuery;
118
	public Vector<String> getLayersIdsSelected() {
119
		return layersIdsSelected;
132 120
	}
133 121

  
134 122
	/**
......
137 125
	 * @param _layers
138 126
	 *            Vector, the list of layers to set
139 127
	 */
140
	public void setLayerIds(Vector<String> _layers) {
141
		layersQuery = _layers;
128
	public void setLayersIdsSelected(Vector<String> _layers) {
129
		layersIdsSelected = _layers;
142 130
	}
143 131

  
144 132
	/**
......
149 137
	 * @param alayerName
150 138
	 *            name of the layer to be added.
151 139
	 */
152
	public void addLayerName(String alayerName) {
153
		layersQuery.add(alayerName);
140
	public void addLayerIdSelected(String alayerName) {
141
		layersIdsSelected.add(alayerName);
154 142
	}
155 143

  
156 144
	/**
......
161 149
	 * @param alayerName
162 150
	 * @return true if the layer name has been deleted from the list
163 151
	 */
164
	public boolean removeLayerName(String alayerName) {
165
		return layersQuery.remove(alayerName);
152
	public boolean removeLayerIdSelected(String alayerName) {
153
		return layersIdsSelected.remove(alayerName);
166 154
	}
167 155

  
168 156
	/**
......
289 277
		ArcImsStatus s = (ArcImsStatus) obj;
290 278

  
291 279
		// Compare layer names
292
		if (!(((s.getLayerIds() == null) && (this.getLayerIds() == null)) || s
293
				.getLayerIds().equals(this.getLayerIds()))) {
280
		if (!(((s.getLayersIdsSelected() == null) && (this
281
				.getLayersIdsSelected() == null)) || s.getLayersIdsSelected()
282
				.equals(this.getLayersIdsSelected()))) {
294 283
			return false;
295 284
		}
296 285

  
......
355 344
	 */
356 345
	public Object clone() {
357 346
		ArcImsStatus newObject = new ArcImsStatus();
358
		Vector<String> v = this.getLayerIds();
347
		Vector<String> v = this.getLayersIdsSelected();
359 348

  
360 349
		if (v != null) {
361
			newObject.setLayerIds((Vector) v.clone());
350
			newObject.setLayersIdsSelected((Vector) v.clone());
362 351
		}
363 352

  
364 353
		Envelope2D enve = this.getEnvelope();
......
441 430
	 */
442 431
	public void setServiceInformation(ServiceInformation si) {
443 432
		this.serviceInfo = si;
444
		//
445
		layersFeatureType.clear();
446
		
447
		
433

  
448 434
	}
449 435

  
450 436
	/**
......
493 479
	public String getLayerQueryString() {
494 480

  
495 481
		String lyrs = "";
496
		if (layersQuery.size() > 0) {
497
			lyrs = layersQuery.get(0);
498
			for (int i = 1; i < layersQuery.size(); i++) {
499
				lyrs = lyrs+","+layersQuery.get(i);
482
		if (layersIdsSelected.size() > 0) {
483
			lyrs = layersIdsSelected.get(0);
484
			for (int i = 1; i < layersIdsSelected.size(); i++) {
485
				lyrs = lyrs + "," + layersIdsSelected.get(i);
500 486
			}
501 487
		}
502 488
		return lyrs;
503 489
	}
504
	
490

  
505 491
	/**
506 492
	 * 
507 493
	 * @return
508 494
	 */
509 495
	public void setLayerQueryString(String layers) {
510 496

  
511
		layersQuery.clear();
512
		String [] lyrs = layers.split(",");
513
		if(lyrs.length > 0){
497
		layersIdsSelected.clear();
498
		String[] lyrs = layers.split(",");
499
		if (lyrs.length > 0) {
514 500
			for (int i = 0; i < lyrs.length; i++) {
515
				layersQuery.add(lyrs[i]);
501
				layersIdsSelected.add(lyrs[i]);
516 502
			}
517
		}		
503
		}
518 504
	}
519 505

  
520 506
	/**
......
549 535
		this.serverVersion = serverVersion;
550 536
	}
551 537

  
552
	/**
553
	 * 
554
	 * @return
555
	 */
556
	public List<FeatureType> getLayersFeatureType() {
557
		return layersFeatureType;
558
	}
559 538

  
560
	/**
561
	 * 
562
	 * @param layersFeatureType
563
	 */
564
	public void setLayersFeatureType(List<FeatureType> layersFeatureType) {
565
		this.layersFeatureType = layersFeatureType;
566
	}
567
	
568 539

  
569

  
570 540
}

Also available in: Unified diff