Revision 44296 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/DefaultExpressionBuilder.java

View differences:

DefaultExpressionBuilder.java
96 96
        
97 97
        @Override
98 98
        public String toString(Formatter<Value> formatter) {
99
            if( formatter.canApply(this) ) {
99
            if( formatter!=null && formatter.canApply(this) ) {
100 100
                return formatter.format(this);
101 101
            }
102 102
            return MessageFormat.format(FORMAT_GROUP, this.value.toString());
......
123 123
        
124 124
        @Override
125 125
        public String toString(Formatter<Value> formatter) {
126
            if( formatter.canApply(this) ) {
126
            if( formatter!=null && formatter.canApply(this) ) {
127 127
                return formatter.format(this);
128 128
            }
129 129
            return identifier(this.name);
......
328 328
        
329 329
        @Override
330 330
        public String toString(Formatter<Value> formatter) {
331
            if( formatter.canApply(this) ) {
331
            if( formatter!=null && formatter.canApply(this) ) {
332 332
                return formatter.format(this);
333 333
            }
334 334
            switch (this.type) {
......
420 420
        
421 421
        @Override
422 422
        public String toString(Formatter<Value> formatter) {
423
            if( formatter.canApply(this) ) {
423
            if( formatter!=null && formatter.canApply(this) ) {
424 424
                return formatter.format(this);
425 425
            }
426 426
            if( this.value==null ) {
......
522 522
        
523 523
        @Override
524 524
        public String toString(Formatter<Value> formatter) {
525
            if( formatter.canApply(this) ) {
525
            if( formatter!=null && formatter.canApply(this) ) {
526 526
                return formatter.format(this);
527 527
            }
528 528
            return Objects.toString(this.value, "");
......
578 578
        
579 579
        @Override
580 580
        public String toString(Formatter<Value> formatter) {
581
            if( formatter.canApply(this) ) {
581
            if( formatter!=null && formatter.canApply(this) ) {
582 582
                return formatter.format(this);
583 583
            }
584 584
            if( this.format==null ) {
......
634 634
        
635 635
        @Override
636 636
        public String toString(Formatter<Value> formatter) {
637
            if( formatter.canApply(this) ) {
637
            if( formatter!=null && formatter.canApply(this) ) {
638 638
                return formatter.format(this);
639 639
            }
640 640
            StringBuilder builder = new StringBuilder();
......
713 713
        
714 714
        @Override
715 715
        public String toString(Formatter<Value> formatter) {
716
            if( formatter.canApply(this) ) {
716
            if( formatter!=null && formatter.canApply(this) ) {
717 717
                return formatter.format(this);
718 718
            }
719 719
            if( this.format==null ) {

Also available in: Unified diff