Revision 44855 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/expressionevaluator/FeatureAttributeElement.java

View differences:

FeatureAttributeElement.java
50 50 
    }
51 51
52 52 
    FeatureAttributeElement(Element parent, FeatureStore store, FeatureAttributeDescriptor attrdesc, String iconName) {
53 
        super(attrdesc.getName(), addQuotesIfNeeded(attrdesc.getName()), iconName);
53 
        super(attrdesc.getName(),  buildRenderedValueForAttribute(store,attrdesc), iconName);
54 54 
        this.parent = parent;
55 55 
        this.store = store;
56 56 
        this.attrdesc = attrdesc;
......
71 71 
        }
72 72 
    }
73 73 

  		




  
  74
  
    
    private static String buildRenderedValueForAttribute(FeatureStore store, FeatureAttributeDescriptor attrdesc) {


  		




  
  75
  
    
      String attrname = attrdesc.getName();


  		




  
  76
  
    
      String storename = store.getName();


  		




  
  77
  
    
      if( StringUtils.equalsIgnoreCase(storename, attrname) ) {


  		




  
  78
  
    
        return addQuotesIfNeeded(storename)+"."+addQuotesIfNeeded(attrname);


  		




  
  79
  
    
      }


  		




  
  80
  
    
      return addQuotesIfNeeded(attrname);


  		




  
  81
  
    
    }


  		




  
  82
  
    
    


  		




  74
  83
  
    
    public Element getParent() {


  		




  75
  84
  
    
        return this.parent;


  		




  76
  85
  
    
    }


  		




  ......




  99
  108
  
    
        for (int i = 0; i < fieldNames.size(); i++) {


  		




  100
  109
  
    
            params[i] = builder.constant(fieldNames.get(i));


  		




  101
  110
  
    
        }


  		




  102
  
  
    
        ExpressionBuilder.Function tuple = builder.tuple(params);


  		




  
  111
  
    
        ExpressionBuilder.Function tuple = builder.tuple((Object[])params);


  		




  103
  112
  
    

  		




  104
  113
  
    
        String formula = builder.function(DataManager.FUNCTION_FOREING_VALUE, tuple).toString();


  		




  105
  114
  
    
        return formula;


  		












Also available in:  Unified diff