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

View differences:

ArcImsStatus.java
28 28

  
29 29
package org.gvsig.remoteclient.arcims;
30 30

  
31
import java.awt.Dimension;
31 32
import java.awt.geom.Rectangle2D;
32 33
import java.util.Vector;
33 34

  
34
import org.gvsig.fmap.geom.primitive.Envelope;
35 35
import org.gvsig.fmap.geom.primitive.Point;
36 36
import org.gvsig.fmap.geom.primitive.impl.Envelope2D;
37 37
import org.gvsig.remoteclient.RemoteClientStatus;
......
49 49
 * 
50 50
 */
51 51
public class ArcImsStatus extends RemoteClientStatus implements Cloneable {
52

  
53
	private String serverURL;
54

  
55
	private String serviceType;
56
	
57
	private String newLayerName;
52 58
	/**
53 59
	 * List of layer to be retrieved by the ArcIms
54 60
	 */
55
	private Vector<String> layers;
61
	private Vector<String> layersQuery;
56 62

  
57 63
	/**
58 64
	 * List of layer styles
......
69 75
	 */
70 76
	private boolean transparency;
71 77
	private String onlineResource;
72
	private String service;
73
	private Vector dimensions;
78
	private String serviceName;
79
	private Vector<Dimension> dimensions;
74 80
	private ServiceInformation serviceInfo;
75 81
	public boolean verbose;
76 82

  
77
	// Added by jldominguez to allow image identification with
78
	// the arcimsstatus variables
79
	private String server;
80

  
81 83
	/**
82 84
	 * Constructor
83 85
	 * 
84 86
	 */
85 87
	public ArcImsStatus() {
86
		layers = new Vector<String>();
88
		layersQuery = new Vector<String>();
87 89
		styles = new Vector<String>();
88 90
		verbose = false;
89 91
	}
......
93 95
	 * 
94 96
	 * @return Vector, the list of dimensions
95 97
	 */
96
	public Vector getDimensions() {
98
	public Vector<Dimension> getDimensions() {
97 99
		return dimensions;
98 100
	}
99 101

  
......
103 105
	 * @param dimensions
104 106
	 *            A vector of dimensions
105 107
	 */
106
	public void setDimensions(Vector dimensions) {
108
	public void setDimensions(Vector<Dimension> dimensions) {
107 109
		this.dimensions = dimensions;
108 110
	}
109 111

  
......
115 117
	 * @return Vector, the list of layers
116 118
	 */
117 119
	public Vector<String> getLayerIds() {
118
		return layers;
120
		return layersQuery;
119 121
	}
120 122

  
121 123
	/**
......
125 127
	 *            Vector, the list of layers to set
126 128
	 */
127 129
	public void setLayerIds(Vector<String> _layers) {
128
		layers = _layers;
130
		layersQuery = _layers;
129 131
	}
130 132

  
131 133
	/**
......
137 139
	 *            name of the layer to be added.
138 140
	 */
139 141
	public void addLayerName(String alayerName) {
140
		layers.add(alayerName);
142
		layersQuery.add(alayerName);
141 143
	}
142 144

  
143 145
	/**
......
149 151
	 * @return true if the layer name has been deleted from the list
150 152
	 */
151 153
	public boolean removeLayerName(String alayerName) {
152
		return layers.remove(alayerName);
154
		return layersQuery.remove(alayerName);
153 155
	}
154 156

  
155 157
	/**
......
207 209
	 * Gets the extent defined by the map
208 210
	 * </p>
209 211
	 */
210
	public Envelope2D getEnvelope() {		
212
	public Envelope2D getEnvelope() {
211 213
		return this.envelope;
212 214
	}
213
	
215

  
214 216
	/**
215 217
	 * <p>
216 218
	 * Gets the extent defined by the map
......
220 222
		double xmin = this.envelope.getMinimum(0);
221 223
		double ymin = this.envelope.getMinimum(1);
222 224
		double w = this.envelope.getMaximum(0) - xmin;
223
		double h = this.envelope.getMaximum(1)- ymin;
224
		Rectangle2D bBox = new Rectangle2D.Double(xmin,ymin,w,h);	
225
		double h = this.envelope.getMaximum(1) - ymin;
226
		Rectangle2D bBox = new Rectangle2D.Double(xmin, ymin, w, h);
225 227
		return bBox;
226 228
	}
227 229

  
......
233 235
	public void setEnvelope(Envelope2D envelope) {
234 236
		this.envelope = envelope;
235 237
	}
236
	
238

  
237 239
	/**
238 240
	 * <p>
239 241
	 * Sets the extent defined by the map
240 242
	 * </p>
241 243
	 */
242 244
	public void setEnvelope(Rectangle2D b) {
243
		Envelope2D enve = new Envelope2D(b.getMinX(), b.getMinY(), b.getMaxX(), b.getMaxY()); 
245
		Envelope2D enve = new Envelope2D(b.getMinX(), b.getMinY(), b.getMaxX(),
246
				b.getMaxY());
244 247
		this.envelope = enve;
245 248
	}
246 249

  
......
350 353
		Envelope2D enve = this.getEnvelope();
351 354
		Point pmin = enve.getLowerCorner();
352 355
		Point pmax = enve.getUpperCorner();
353
		double w = pmax.getX()-pmin.getX();
354
		double h = pmax.getY()-pmin.getY();
355
		Rectangle2D r = new Rectangle2D.Double(pmin.getX(),pmin.getY(),w,h);		
356
		double w = pmax.getX() - pmin.getX();
357
		double h = pmax.getY() - pmin.getY();
358
		Rectangle2D r = new Rectangle2D.Double(pmin.getX(), pmin.getY(), w, h);
356 359

  
357 360
		if (r != null) {
358 361
			newObject.setEnvelope((Rectangle2D) r.clone());
......
407 410
	 * 
408 411
	 * @return service
409 412
	 */
410
	public String getService() {
411
		return service;
413
	public String getServiceName() {
414
		return serviceName;
412 415
	}
413 416

  
414 417
	/**
......
416 419
	 * 
417 420
	 * @param service
418 421
	 */
419
	public void setService(String service) {
420
		this.service = service;
422
	public void setServiceName(String service) {
423
		this.serviceName = service;
421 424
	}
422 425

  
423 426
	/**
......
439 442
	/**
440 443
	 * Gets server
441 444
	 */
442
	public String getServer() {
443
		return server;
445
	public String getServerURL() {
446
		return serverURL;
444 447
	}
445 448

  
446 449
	/**
......
448 451
	 * 
449 452
	 * @param server
450 453
	 */
451
	public void setServer(String server) {
452
		this.server = server;
454
	public void setServerURL(String server) {
455
		this.serverURL = server;
453 456
	}
457

  
458
	/**
459
	 * 
460
	 * @return
461
	 */
462
	public String getServiceType() {
463
		return serviceType;
464
	}
465

  
466
	/**
467
	 * 
468
	 * @param serviceType
469
	 */
470
	public void setServiceType(String serviceType) {
471
		this.serviceType = serviceType;
472
	}
473

  
474
	/**
475
	 * 
476
	 * @return
477
	 */
478
	public String getLayerQueryString() {
479

  
480
		String lyrs = "";
481
		if (layersQuery.size() > 0) {
482
			lyrs = layersQuery.get(0);
483
			for (int i = 1; i < layersQuery.size(); i++) {
484
				lyrs = lyrs+","+layersQuery.get(i);
485
			}
486
		}
487
		return lyrs;
488
	}
489
	
490
	/**
491
	 * 
492
	 * @return
493
	 */
494
	public void setLayerQueryString(String layers) {
495

  
496
		String [] lyrs = layers.split(",");
497
		if(lyrs.length > 0){
498
			for (int i = 0; i < lyrs.length; i++) {
499
				layersQuery.add(lyrs[i]);
500
			}
501
		}		
502
	}
503

  
504
	/**
505
	 * 
506
	 * @return
507
	 */
508
	public String getNewLayerName() {
509
		return newLayerName;
510
	}
511

  
512
	/**
513
	 * 
514
	 * @param newLayerName
515
	 */
516
	public void setNewLayerName(String newLayerName) {
517
		this.newLayerName = newLayerName;
518
	}
519

  
454 520
}

Also available in: Unified diff