Revision 46301 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/searchPostProcess/distinctOn/DistinctOnFactory.java

View differences:

DistinctOnFactory.java
9 9 
import java.util.List;
10 10 
import java.util.UUID;
11 11 
import org.apache.commons.lang3.StringUtils;
12 
import org.gvsig.expressionevaluator.ExpressionBuilder;
13 
import org.gvsig.expressionevaluator.ExpressionUtils;
14 12 
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
15 
import org.gvsig.fmap.dal.feature.Feature;
16 13 
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
17 14 
import org.gvsig.fmap.dal.feature.FeatureExtraColumns;
18 15 
import org.gvsig.fmap.dal.feature.FeatureQuery;
......
30 27 
import org.gvsig.tools.ToolsLocator;
31 28 
import org.gvsig.tools.dataTypes.DataType;
32 29 
import org.gvsig.tools.dynform.spi.DynFormSPIManager;
33 
import org.gvsig.tools.dynobject.DynClass;
34 30 
import org.gvsig.tools.dynobject.DynClass_v2;
35 31 
import org.gvsig.tools.dynobject.DynField_v2;
36 32 
import org.gvsig.tools.dynobject.DynObject;
......
87 83 
        FeatureType ft = input.getDefaultFeatureTypeQuietly();
88 84 
        List<DynObjectValueItem> attrs = getAtributeNames(input);
89 85 
        if (query.getExtraColumn().size()>0) {
90 
//        if (searchParams.getResultColumnNames().size()>0) {
91 
////            DynObjectValueItem[] attrs = new DynObjectValueItem[size];
92 
////            List<DynObjectValueItem> attrs = new ArrayList<DynObjectValueItem>();
93 86 
            FeatureExtraColumns extraColumns = query.getExtraColumn();
94 
//            int newSize = attrs.length+query.getExtraColumn().size();
95 
//            DynObjectValueItem[] newAttrs = new DynObjectValueItem[newSize];
96 
//            int j = 0;
97 
//            for (int i = 0; i < attrs.length; i++) {
98 
//                newAttrs[i]=attrs[i];
99 
//            }
100 87 

  		




  101
  88
  
    
            for (int i = 0; i < extraColumns.size(); i++) {


  		




  102
  89
  
    
                EditableFeatureAttributeDescriptor attr = extraColumns.get(i);


  		




  ......




  106
  93
  
    
                } 


  		




  107
  94
  
    
            }


  		




  108
  95
  
    
            


  		




  109
  
  
    
//            for ( EditableFeatureAttributeDescriptor attr : query.getExtraColumn()) {


  		




  110
  
  
    
//                if (query.getExtraColumn().get(attrName) != null) {


  		




  111
  
  
    
//                    DynObjectValueItem attr = new DynObjectValueItem(query.getExtraColumn().get(attrName), query.getExtraColumn().get(attrName).toJson().getString(label));


  		




  112
  
  
    
//                    try{


  		




  113
  
  
    
//                        attrs.add(attr);


  		




  114
  
  
    
//                    }catch (Exception ex) {


  		




  115
  
  
    
//                        LOGGER.warn("Can't add "+ attr.toString(), ex);


  		




  116
  
  
    
//                    }


  		




  117
  
  
    
//                }


  		




  118
  
  
    
//            }


  		




  119
  
  
    
           


  		




  120
  96
  
    
            dynField.setAvailableValues(attrs.toArray(new DynObjectValueItem[attrs.size()]));


  		




  121
  97
  
    
            for (int i = 0; i < attrs.size(); i++) {


  		




  122
  98
  
    
                fillParameters( (String) attrs.get(i).getValue(), operation, dynClass, dynField, searchParams, i, ft, extraColumns);


  		




  123
  99
  
    
                


  		




  124
  100
  
    
            }


  		




  125
  
  
    
//            for (String attrName : query.getAttributeNames()) {


  		




  126
  
  
    
//                if (ft.get(attrName) != null) {


  		




  127
  
  
    
//                    FeatureAttributeDescriptor attr = (FeatureAttributeDescriptor) ft.get(attrName);


  		




  128
  
  
    
//                    fillParameters(attr, firstOperation, dynClass, dynField);


  		




  129
  
  
    
//                } else if (query.getExtraColumn().get(attrName) != null) {


  		




  130
  
  
    
//                    FeatureAttributeDescriptor attr = query.getExtraColumn().get(attrName);


  		




  131
  
  
    
//                    fillParameters(attr, firstOperation, dynClass, dynField);


  		




  132
  
  
    
//                }


  		




  133
  
  
    
//            }


  		




  134
  
  
    

  		




  135
  101
  
    
        } else {


  		




  136
  102
  
    
            dynField.setAvailableValues(attrs);


  		




  137
  103
  
    
            for (int i = 0; i < attrs.size(); i++) {  


  		




  138
  
  
    
//            }


  		




  139
  
  
    
//            for (FeatureAttributeDescriptor attr : input.getDefaultFeatureTypeQuietly()) {


  		




  140
  104
  
    
                fillParameters( (String) attrs.get(i).getValue(), operation, dynClass, dynField, searchParams, i, ft, null);


  		




  141
  105
  
    
            }


  		




  142
  106
  
    
        }


  		




  
  107
  
    
        


  		




  
  108
  
    
        DynField_v2 addTableToProjectDynField = (DynField_v2) dynClass.addDynFieldBoolean("addTableToProject");


  		




  
  109
  
    
        addTableToProjectDynField.setDefaultFieldValue(false);


  		




  
  110
  
    
        addTableToProjectDynField.setLabel(i18n.getTranslation("_Add_table_to_project"));


  		




  
  111
  
    
        addTableToProjectDynField.setDescription("");


  		




  
  112
  
    
        addTableToProjectDynField.setGroup(i18n.getTranslation("_Other_parameters"));


  		




  
  113
  
    
        addTableToProjectDynField.setOrder(4000);


  		




  
  114
  
    
        


  		




  143
  115
  
    

  		




  144
  116
  
    
        dynClass.getTags().set(DynFormSPIManager.TAG_DYNFORM_HEIGHT, 250);


  		




  145
  117
  
    
        dynClass.getTags().set(DynFormSPIManager.TAG_DYNFORM_WIDTH, 350);


  		












Also available in:  Unified diff