Revision 28961

View differences:

branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/gui/styling/SymbolSelector.java
418 418
	protected void updateOptionsPanel() throws IllegalArgumentException {
419 419
		Object mySelectedElement = ((SymbolPreviewer) jPanelPreview).getSymbol();
420 420

  
421
		if (mySelectedElement == null) {
422
			return;
423
		}
421
//		if (mySelectedElement == null) {
422
//			return;
423
//		}
424 424
		act = false; // disable events
425 425

  
426 426
		if (mySelectedElement instanceof CartographicSupport) {
......
437 437

  
438 438
		try {
439 439

  
440
			jcc1.setEnabled(true);
441
			jcc2.setEnabled(true);
440
			jcc1.setEnabled(mySelectedElement!=null);
441
			jcc2.setEnabled(mySelectedElement!=null);
442 442

  
443 443
			if(mySelectedElement instanceof IMultiLayerSymbol){
444 444
				jcc1.setColor(Color.WHITE);
......
449 449

  
450 450
			if (shapeType == Geometry.TYPES.POINT) {
451 451
				IMarkerSymbol m = (IMarkerSymbol) mySelectedElement;
452
				jcc1.setColor(m.getColor());
453
				txtSize.setDouble(m.getSize());
454
				txtAngle.setDouble(Math.toDegrees(m.getRotation()));
452
				txtSize.setEnabled(m!=null);
453
				txtAngle.setEnabled(m!=null);
454
				if(m!=null){
455
					jcc1.setColor(m.getColor());
456
					txtSize.setDouble(m.getSize());
457
					txtAngle.setDouble(Math.toDegrees(m.getRotation()));
458
				}
455 459
			}
456 460

  
457 461
			if (shapeType == Geometry.TYPES.CURVE) {
458 462
				ILineSymbol l = (ILineSymbol) mySelectedElement;
459
				jcc1.setColor(l.getColor());
460
				jcc1.setAlpha(l.getAlpha());
461
				txtSize.setDouble(l.getLineWidth());
463
				txtSize.setEnabled(l!=null);
464
				if(l!=null){
465
					jcc1.setColor(l.getColor());
466
					jcc1.setAlpha(l.getAlpha());
467
					txtSize.setDouble(l.getLineWidth());
468
				}
462 469
			}
463 470

  
464 471
			if (shapeType == Geometry.TYPES.SURFACE) {
465 472
				IFillSymbol f = (IFillSymbol) mySelectedElement;
466 473

  
467
				txtWidth.setEnabled(true);
468
				cmbReferenceSystem.setEnabled(true);
469
				cmbUnits.setEnabled(true);
474
				txtWidth.setEnabled(f!=null);
475
				cmbReferenceSystem.setEnabled(f!=null);
476
				cmbUnits.setEnabled(f!=null);
470 477

  
471
				jcc1.setUseColorIsSelected(f.hasFill());
472
				jcc1.setColor(f.getFillColor());
473
				jcc1.setAlpha(f.getFillAlpha());
474
				jcc2.setUseColorIsSelected(f.hasOutline());
475
				ILineSymbol outline = f.getOutline();
476
				if (outline != null) {
477
					jcc2.setColor(outline.getColor());
478
					txtWidth.setDouble(outline.getLineWidth());
479
				}
478
				if (f!=null){
479
					jcc1.setUseColorIsSelected(f.hasFill());
480
					jcc1.setColor(f.getFillColor());
481
					jcc1.setAlpha(f.getFillAlpha());
482
					jcc2.setUseColorIsSelected(f.hasOutline());
483
					ILineSymbol outline = f.getOutline();
484
					if (outline != null) {
485
						jcc2.setColor(outline.getColor());
486
						txtWidth.setDouble(outline.getLineWidth());
487
					}
480 488

  
481
				if(f instanceof MultiLayerFillSymbol){
482
					txtWidth.setEnabled(false);
483
					cmbReferenceSystem.setEnabled(false);
484
					cmbUnits.setEnabled(false);
489
					if(f instanceof MultiLayerFillSymbol){
490
						txtWidth.setEnabled(false);
491
						cmbReferenceSystem.setEnabled(false);
492
						cmbUnits.setEnabled(false);
493
					}
485 494
				}
486

  
487 495
			}
488 496

  
489 497

  
490 498
			if (shapeType == Geometry.TYPES.TEXT) {
491 499
				ITextSymbol t = (ITextSymbol) mySelectedElement;
492
				jcc1.setColor(t.getTextColor());
493
				Double s = new Double(t.getFont().getSize());
494
				cmbFontSize.setSelectedItem(s);
495
				int i = cmbFontSize.getSelectedIndex();
496
				if (i == -1) {
497
					cmbFontSize.addItem(s);
500
				cmbFontSize.setEnabled(t!=null);
501
				if(t!=null){
502
					jcc1.setColor(t.getTextColor());
503
					Double s = new Double(t.getFont().getSize());
498 504
					cmbFontSize.setSelectedItem(s);
505
					int i = cmbFontSize.getSelectedIndex();
506
					if (i == -1) {
507
						cmbFontSize.addItem(s);
508
						cmbFontSize.setSelectedItem(s);
509
					}
499 510
				}
500 511
			}
501 512
		} catch (NullPointerException npEx) {

Also available in: Unified diff