0001-fix-933.patch

Francisco Puga, 07/27/2012 04:43 PM

Download (4.31 KB)

View differences:

extensions/extWMS/src/com/iver/cit/gvsig/fmap/layers/WMSLayerNode.java
220 220
     * @return Returns the srs.
221 221
     */
222 222
    public Vector getAllSrs() {
223
        if ((srs.size() == 0) && _parent!=null)
224
            return _parent.getAllSrs();
223
        if ((srs.size() == 0) && _parent!=null) {
224
	    return _parent.getAllSrs();
225
	}
225 226
        return srs;
226 227
    }
227 228

  
......
344 345
     * @param dimensionExpression
345 346
     */
346 347
    public void addDimension(String name, String units, String unitSymbol, String dimExpression) {
347
    	if (dimensions == null)
348
    		dimensions = new ArrayList();
348
    	if (dimensions == null) {
349
	    dimensions = new ArrayList();
350
	}
349 351
    	if (name.equalsIgnoreCase("time")) {
350 352
    		try {
351 353
    			dimensions.add(new TimeDimension(units, unitSymbol,
......
419 421
     */
420 422
    public void addStyle(WMSStyle style) {
421 423
    	if (style.getName().toLowerCase().contains("default")) {
422
    		// Para que funcione el wms del JRC
423
    		style.setName("default");
424 424
    		selectedStyleIndex = styles.size();
425 425
    	}
426
        if (styles==null)
427
            styles = new ArrayList();
426
        if (styles==null) {
427
	    styles = new ArrayList();
428
	}
428 429
        styles.add(new FMapWMSStyle(style, this));
429 430

  
430 431
    }
......
434 435
     * @return FMapWMSStyle
435 436
     */
436 437
    public FMapWMSStyle getSelectedStyle() {
437
    	if (styles == null || selectedStyleIndex > styles.size()-1 || selectedStyleIndex == -1)
438
    		return null;
438
    	if (styles == null || selectedStyleIndex > styles.size()-1 || selectedStyleIndex == -1) {
439
	    return null;
440
	}
439 441
    	return (FMapWMSStyle) styles.get(selectedStyleIndex);
440 442
    }
441 443

  
......
454 456
     * @param style name
455 457
     */
456 458
	public void setSelectedStyleByName(String styName) {
457
		if (styName == null || styName.equals(""))
458
			setSelectedStyleByIndex(-1);
459
		if (styName == null || styName.equals("")) {
460
		    setSelectedStyleByIndex(-1);
461
		}
459 462
		for (int i = 0; i < styles.size(); i++) {
460 463
			FMapWMSStyle sty = (FMapWMSStyle) styles.get(i);
461 464
			if (sty.name.equals(styName)) {
......
468 471
	}
469 472

  
470 473
	public void addKeyword(String keyword) {
471
		if (keywords == null)
472
			keywords = new ArrayList();
474
		if (keywords == null) {
475
		    keywords = new ArrayList();
476
		}
473 477
		keywords.add(keyword);
474 478
	}
475 479

  
476 480
    public String toString(){
477 481
    	String str;
478
    	if (getName()==null)
479
    		str = getTitle();
480
    	else
481
    		str = "["+getName()+"] "+getTitle();
482
    	if (getName()==null) {
483
	    str = getTitle();
484
	} else {
485
	    str = "["+getName()+"] "+getTitle();
486
	}
482 487
        return str;
483 488
    }
484 489

  
......
504 509
				clone.keywords.add((String) keywords.get(i));
505 510
			}
506 511
        }
507
        if (styles!=null)
508
        	for (int i=0; i<styles.size(); i++){
509
        		FMapWMSStyle sty = (FMapWMSStyle) ((FMapWMSStyle) this.styles.get(i)).clone();
510
        		sty.parent = this;
511
        		clone.styles.add(sty);
512
        	}
513

  
514
        if (dimensions!=null)
515
        	for (int i = 0; i < dimensions.size(); i++) {
516
        		clone.dimensions = new ArrayList();
517
        		clone.dimensions.add((IFMapWMSDimension) this.dimensions.get(i));
518
        	}
512
        if (styles!=null) {
513
	    for (int i=0; i<styles.size(); i++){
514
	    	FMapWMSStyle sty = (FMapWMSStyle) ((FMapWMSStyle) this.styles.get(i)).clone();
515
	    	sty.parent = this;
516
	    	clone.styles.add(sty);
517
	    }
518
	}
519

  
520
        if (dimensions!=null) {
521
	    for (int i = 0; i < dimensions.size(); i++) {
522
	    	clone.dimensions = new ArrayList();
523
	    	clone.dimensions.add((IFMapWMSDimension) this.dimensions.get(i));
524
	    }
525
	}
519 526

  
520 527
        return clone;
521 528
    }
522
-