Revision 12274

View differences:

branches/v10/extensions/extAnnotations/src/com/iver/cit/gvsig/project/documents/gui/Annotation_TaskCreate.java
56 56

  
57 57
import com.hardcode.driverManager.Driver;
58 58
import com.hardcode.gdbms.engine.data.driver.DriverException;
59
import com.hardcode.gdbms.engine.values.NumericValue;
59 60
import com.hardcode.gdbms.engine.values.Value;
60 61
import com.hardcode.gdbms.engine.values.ValueFactory;
61 62
import com.iver.andami.PluginServices;
......
513 514
        int pos, int i) {
514 515
        int type = Annotation_Mapping.getType(name);
515 516

  
516
        if (pos != -1) {
517
            try {
518
                values[i] = ValueFactory.createValueByType(antValues[pos].toString(),
519
                        type);
520
            } catch (ParseException e) {
521
                e.printStackTrace();
522
            }
523
        } else {
517
//        if (pos != -1) {
518
//            try {
519
//                values[i] = ValueFactory.createValueByType(antValues[pos].toString(),
520
//                        type);
521
//            } catch (ParseException e) {
522
//                e.printStackTrace();
523
//            }
524
//        } else {
524 525
            // if (type == Types.VARCHAR) {
525 526
            // values[i] = ValueFactory.createNullValue();
526 527
            // } else {
527 528
            try {
528 529
                if (name == Annotation_Mapping.TEXT) {
529
                    values[i] = ValueFactory.createValueByType(String.valueOf(
530
                	if (pos!=-1){
531
                		values[i] = ValueFactory.createValue(antValues[pos].toString());
532
                	}else{
533
                		values[i] = ValueFactory.createValueByType(String.valueOf(
530 534
                                Annotation_Mapping.DEFAULTTEXT), type);
535
                	}
531 536
                } else if (name == Annotation_Mapping.COLOR) {
532
                    values[i] = ValueFactory.createValueByType(String.valueOf(
537
                	if (pos!=-1){
538
                		values[i] = ValueFactory.createValue(((NumericValue)antValues[pos]).intValue());
539
                	}else{
540
                		values[i] = ValueFactory.createValueByType(String.valueOf(
533 541
                                Annotation_Mapping.DEFAULTCOLOR), type);
542
                	}
534 543
                } else if (name == Annotation_Mapping.HEIGHT) {
535
                    values[i] = ValueFactory.createValueByType(String.valueOf(
544
                	if (pos!=-1){
545
                		values[i] = ValueFactory.createValue(((NumericValue)antValues[pos]).intValue());
546
                	}else{
547
                		values[i] = ValueFactory.createValueByType(String.valueOf(
536 548
                                Annotation_Mapping.DEFAULTHEIGHT), type);
549
                	}
537 550
                } else if (name == Annotation_Mapping.TYPEFONT) {
538
                    values[i] = ValueFactory.createValueByType(String.valueOf(
551
                	if (pos!=-1){
552
                		values[i] = ValueFactory.createValue(antValues[pos].toString());
553
                	}else{
554
                		values[i] = ValueFactory.createValueByType(String.valueOf(
539 555
                                Annotation_Mapping.DEFAULTTYPEFONT), type);
556
                	}
540 557
                } else if (name == Annotation_Mapping.STYLEFONT) {
541
                    values[i] = ValueFactory.createValueByType(String.valueOf(
558
                	if (pos!=-1){
559
                		values[i] = ValueFactory.createValue(((NumericValue)antValues[pos]).intValue());
560
                	}else{
561
                		values[i] = ValueFactory.createValueByType(String.valueOf(
542 562
                                Annotation_Mapping.DEFAULTSTYLEFONT), type);
563
                	}
543 564
                } else if (name == Annotation_Mapping.ROTATE) {
544
                    values[i] = ValueFactory.createValueByType(String.valueOf(
565
                	if (pos!=-1){
566
                		values[i] = ValueFactory.createValue(((NumericValue)antValues[pos]).intValue());
567
                	}else{
568
                		values[i] = ValueFactory.createValueByType(String.valueOf(
545 569
                                Annotation_Mapping.DEFAULTROTATE), type);
570
                	}
546 571
                }
547 572
            } catch (ParseException e) {
548 573
                e.printStackTrace();
549 574
            }
550 575

  
551 576
            // }
552
        }
577
//        }
553 578
    }
554 579

  
555 580
    /**
......
607 632
    private void modifyMap(IGeometry geom, int index)
608 633
        throws DriverException, EditionException {
609 634
        if (geom.getGeometryType() != FShape.POINT) {
610
            Point2D p = FLabel.createLabelPoint((FShape) geom.getInternalShape());
635
            Point2D p = FLabel.createLabelPoint(geom.getInternalShape());
611 636
            geom = ShapeFactory.createPoint2D(p.getX(), p.getY());
612 637
        }
613 638

  

Also available in: Unified diff