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/featurequery/DefaultFeatureQueryCalculatedColumnsPanel.java

View differences:

DefaultFeatureQueryCalculatedColumnsPanel.java
26 26 
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
27 27 
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
28 28 
import org.gvsig.expressionevaluator.swing.ExpressionPickerController;
29 
import org.gvsig.expressionevaluator.swing.JExpressionBuilder;
30 29 
import org.gvsig.fmap.dal.DALLocator;
31 30 
import org.gvsig.fmap.dal.exception.DataException;
32 31 
import org.gvsig.fmap.dal.expressionevaluator.FeatureAttributeEmulatorExpression;
......
36 35 
import org.gvsig.fmap.dal.feature.FeatureStore;
37 36 
import org.gvsig.fmap.dal.feature.FeatureType;
38 37 
import org.gvsig.fmap.dal.swing.DALSwingLocator;
39 
import org.gvsig.fmap.dal.swing.expressionevaluator.FeatureStoreElement;
40 38 
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryCalculatedColumnsPanel;
41 39 
import org.gvsig.fmap.dal.swing.featuretype.FeatureTypeAttributePanel;
42 40 
import org.gvsig.fmap.dal.swing.featuretype.FeatureTypePanel;
......
295 293 
        }
296 294
297 295 
        public void setStore(FeatureStore store) {
298 
             FeatureStoreElement calculatedStoreElement = DALSwingLocator.getSwingManager()
299 
                    .createFeatureStoreElement();
300 
            calculatedStoreElement.setFeatureStore(store);
301 
            this.expPicker.removeAllSymbolTables();
302 
            this.expPicker.addElement(calculatedStoreElement);
296 
          DALSwingLocator.getManager().configureExpressionBuilder(expPicker, store);
297 
//             FeatureStoreElement calculatedStoreElement = DALSwingLocator.getSwingManager()
298 
//                    .createFeatureStoreElement();
299 
//            calculatedStoreElement.setFeatureStore(store);
300 
//            this.expPicker.removeAllSymbolTables();
301 
//            this.expPicker.addElement(calculatedStoreElement);
303 302 
        }
304 303 
    }
305 304 

  		




  ......




  307
  306
  
    
    private FeatureStore store;


  		




  308
  307
  
    
    private FeatureType featureType;


  		




  309
  308
  
    
    private FeatureQuery query;


  		




  310
  
  
    
    private JExpressionBuilder pckExpression;


  		




  311
  
  
    
    private static String COLUMN_DEFAULT_NAME = "Field";


  		




  
  309
  
    
//    private JExpressionBuilder pckExpression;


  		




  
  310
  
    
    private static final String COLUMN_DEFAULT_NAME = "Field";


  		




  312
  311
  
    
    private EditableFeatureAttributeDescriptor actualEditableAttribute;


  		




  313
  312
  
    
    private DefaultListModel lstAttributesModel;


  		




  314
  313
  
    
    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFeatureQueryCalculatedColumnsPanel.class);


  		




  ......




  344
  343
  
    
            this.store = store;


  		




  345
  344
  
    
            this.query = store.createFeatureQuery();


  		




  346
  345
  
    
            this.columnController.setStore(store);


  		




  347
  
  
    
            this.pckExpression = DALSwingLocator.getManager().createQueryFilterExpresion(store);


  		




  
  346
  
    
//            this.pckExpression = DALSwingLocator.getManager().createQueryFilterExpresion(store);


  		




  348
  347
  
    
        } catch (DataException ex) {


  		




  349
  348
  
    
            throw new RuntimeException("Can't assign store", ex);


  		




  350
  349
  
    
        }


  		












Also available in:  Unified diff