Revision 45997

View differences:

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
22 22 
import org.gvsig.fmap.dal.swing.DataSwingManager;
23 23 
import org.gvsig.fmap.dal.swing.impl.searchPostProcess.distinctOn.AggregateOperation.AggregateOperationFactory;
24 24 
import org.gvsig.fmap.dal.swing.impl.searchPostProcess.distinctOn.FirstAggregateOperation.FirstAggregateOperationFactory;
25 
import org.gvsig.fmap.dal.swing.impl.searchPostProcess.distinctOn.NullAggregateOperation.NullAggregateOperationFactory;
25 26 
import org.gvsig.fmap.dal.swing.searchPostProcess.AbstractSearchPostProcessFactory;
26 27 
import org.gvsig.fmap.dal.swing.searchPostProcess.SearchPostProcess;
27 28 
import org.gvsig.fmap.dal.swing.searchPostProcess.SearchPostProcessFactory;
......
162 163 
            if (StringUtils.equals(featureAttributeDescriptor.getName(), attr)) {
163 164 
                Class attrClass = featureAttributeDescriptor.getDataType().getDefaultClass();
164 165 
                List<DynObjectValueItem> availableOperations = fillAggregateOperations (attrClass);
165 
                String newOperation = getOperation(attrClass, operation);
166 166 
                if (availableOperations.size() > 0) {
167 167 
                    if(searchParams.getResultColumnNames().contains(attr)){
168 
                        String newOperation = getOperation(attrClass, operation);
168 169 
                        dynField = (DynField_v2) dynClass.addDynFieldString(attr);
169 170 
                        dynField.setAvailableValues(availableOperations);
170 171 
                        dynField.setDefaultFieldValue(newOperation);
171 172 
                        dynField.setGroup(i18n.getTranslation("_Visible_columns"));
172 173 
                        dynField.setOrder(2000+n);
173 174 
                    } else {
175 
                        String newOperation = getOperation(attrClass, NullAggregateOperationFactory.NAME);
174 176 
                        dynField = (DynField_v2) dynClass.addDynFieldString(attr);
175 177 
                        dynField.setAvailableValues(availableOperations);
176 178 
                        dynField.setDefaultFieldValue(newOperation);
......
185 187 
                if (StringUtils.equals(extraColumns.get(i).getName(), attr)) {
186 188 
                    Class attrClass = ((FeatureAttributeDescriptor) extraColumns.get(i)).getDataType().getDefaultClass();;
187 189 
                    List<DynObjectValueItem> availableOperations = fillAggregateOperations (attrClass);
188 
                    String newOperation = getOperation(attrClass, operation);
189 190 
                    if (availableOperations.size() > 0) {
190 191 
                        if(searchParams.getResultColumnNames().contains(attr)){
192 
                            String newOperation = getOperation(attrClass, operation);
191 193 
                            dynField = (DynField_v2) dynClass.addDynFieldString(attr);
192 194 
                            dynField.setAvailableValues(availableOperations);
193 195 
                            dynField.setDefaultFieldValue(newOperation);
194 196 
                            dynField.setGroup(i18n.getTranslation("_Visible_columns"));
195 197 
                            dynField.setOrder(2000+n);
196 198 
                        } else {
199 
                            String newOperation = getOperation(attrClass, NullAggregateOperationFactory.NAME);
197 200 
                            dynField = (DynField_v2) dynClass.addDynFieldString(attr);
198 201 
                            dynField.setAvailableValues(availableOperations);
199 202 
                            dynField.setDefaultFieldValue(newOperation);
......
286 289 
    private List<DynObjectValueItem> getAtributeNames(FeatureStore input) {
287 290 
        FeatureType ft = input.getDefaultFeatureTypeQuietly();
288 291 
        List<DynObjectValueItem> values = new ArrayList();
292 
        I18nManager i18n = ToolsLocator.getI18nManager();
289 293 
        for (FeatureAttributeDescriptor attr : ft) {
290 294 
            DataType dataType = attr.getDataType();
291 295 
            if (!dataType.isContainer()){
292 
                values.add( new DynObjectValueItem(attr.getName(), attr.getLabel()));
296 
                values.add( new DynObjectValueItem(attr.getName(), i18n.getTranslation(attr.getLabel())));
293 297 
            }
294 298 
        }
295 299 
//        return values.toArray(new DynObjectValueItem[values.size()]);
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/NullAggregateOperation.java
1 
/*
2 
 * To change this license header, choose License Headers in Project Properties.
3 
 * To change this template file, choose Tools | Templates
4 
 * and open the template in the editor.
5 
 */
6 
package org.gvsig.fmap.dal.swing.impl.searchPostProcess.distinctOn;
7 

  		




  
  8
  
    
/**


  		




  
  9
  
    
 *


  		




  
  10
  
    
 * @author jovivas


  		




  
  11
  
    
 */


  		




  
  12
  
    
public class NullAggregateOperation implements AggregateOperation {


  		




  
  13
  
    
    public static class NullAggregateOperationFactory implements AggregateOperationFactory{


  		




  
  14
  
    
        public static final String NAME = "None";


  		




  
  15
  
    
        @Override


  		




  
  16
  
    
        public String getName() {


  		




  
  17
  
    
            return NAME;


  		




  
  18
  
    
        }


  		




  
  19
  
    

  		




  
  20
  
    
        @Override


  		




  
  21
  
    
        public AggregateOperation create(Object... os) {


  		




  
  22
  
    
            return new NullAggregateOperation();


  		




  
  23
  
    
        }


  		




  
  24
  
    

  		




  
  25
  
    
        @Override


  		




  
  26
  
    
        public boolean isApplicable(Object... value) {


  		




  
  27
  
    
            return true;


  		




  
  28
  
    
        }


  		




  
  29
  
    
    }


  		




  
  30
  
    
    


  		




  
  31
  
    

  		




  
  32
  
    
    public NullAggregateOperation() {


  		




  
  33
  
    

  		




  
  34
  
    
    }


  		




  
  35
  
    

  		




  
  36
  
    
    @Override


  		




  
  37
  
    
    public boolean isApplicable(Object... value) {


  		




  
  38
  
    
        return true;


  		




  
  39
  
    
    }


  		




  
  40
  
    

  		




  
  41
  
    
    @Override


  		




  
  42
  
    
    public void reset() {


  		




  
  43
  
    

  		




  
  44
  
    
    }


  		




  
  45
  
    

  		




  
  46
  
    
    @Override


  		




  
  47
  
    
    public void perform(Object value) {    


  		




  
  48
  
    

  		




  
  49
  
    
    }


  		




  
  50
  
    

  		




  
  51
  
    
    @Override


  		




  
  52
  
    
    public Object getValue() {


  		




  
  53
  
    
        return null;


  		




  
  54
  
    
    }


  		




  
  55
  
    
    


  		




  
  56
  
    
}


  		












Also available in:  Unified diff