Revision 44801 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
5 5
import java.awt.event.ActionListener;
6 6
import java.net.URL;
7 7
import java.util.List;
8
import javax.swing.DefaultComboBoxModel;
9 8
import javax.swing.DefaultListModel;
10 9
import javax.swing.DefaultListSelectionModel;
11 10
import javax.swing.ImageIcon;
......
22 21
import javax.swing.event.DocumentListener;
23 22
import javax.swing.event.ListSelectionEvent;
24 23
import javax.swing.text.JTextComponent;
25
import jdk.nashorn.internal.parser.TokenType;
26 24
import org.apache.commons.io.FilenameUtils;
27 25
import org.apache.commons.lang.StringUtils;
28 26
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
......
33 31
import org.gvsig.fmap.dal.exception.DataException;
34 32
import org.gvsig.fmap.dal.expressionevaluator.FeatureAttributeEmulatorExpression;
35 33
import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
36
import org.gvsig.fmap.dal.feature.EditableFeatureType;
37 34
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
38
import org.gvsig.fmap.dal.feature.FeatureExtraColumn;
39 35
import org.gvsig.fmap.dal.feature.FeatureQuery;
40 36
import org.gvsig.fmap.dal.feature.FeatureStore;
41 37
import org.gvsig.fmap.dal.feature.FeatureType;
42 38
import org.gvsig.fmap.dal.swing.DALSwingLocator;
39
import org.gvsig.fmap.dal.swing.expressionevaluator.FeatureStoreElement;
43 40
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryCalculatedColumnsPanel;
44 41
import org.gvsig.fmap.dal.swing.featuretype.FeatureTypeAttributePanel;
45 42
import org.gvsig.fmap.dal.swing.featuretype.FeatureTypePanel;
46
import org.gvsig.fmap.dal.swing.impl.featuretype.DefaultFeatureAttributePanel;
47
import org.gvsig.fmap.dal.swing.impl.featuretype.FeatureAttributeListCellRenderer;
48 43
import org.gvsig.tools.ToolsLocator;
49
import org.gvsig.tools.dataTypes.DataType;
50 44
import org.gvsig.tools.dataTypes.DataTypes;
51 45
import org.gvsig.tools.i18n.I18nManager;
52
import org.gvsig.tools.swing.api.FilteredListModel;
53 46
import org.gvsig.tools.swing.api.ListElement;
54 47
import org.gvsig.tools.swing.api.ToolsSwingLocator;
55 48
import org.gvsig.tools.swing.api.ToolsSwingManager;
......
58 51
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
59 52
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
60 53
import org.gvsig.tools.swing.icontheme.IconTheme;
61
import org.gvsig.tools.util.LabeledValueImpl;
62 54
import org.slf4j.Logger;
63 55
import org.slf4j.LoggerFactory;
64 56

  
......
114 106
                    btnExpressionBookmarks,
115 107
                    btnExpressionHistory
116 108
            );
109
            
117 110

  
118 111
            this.txtName.getDocument().addDocumentListener(this);
119 112
            this.cboDataType.addActionListener(this);
120
            this.expPicker.removeAllChangeListener();
121
            this.expPicker.addChangeListener(new ChangeListener() {
122
                @Override
123
                public void stateChanged(ChangeEvent ce) {
124
                    if (!expPicker.isEmpty()) {
125
                        doHasChanges();
126
                    }
127
                }
128
            });
113
            this.txtExpression.getDocument().addDocumentListener(this);
114
            //Todo: que el listener expresion lo gestion el picker
129 115

  
130 116
        }
131 117

  
......
194 180
        public void actionPerformed(ActionEvent ae) {
195 181
            doHasChanges();
196 182
        }
183
        
184
        public void setStore(FeatureStore store) {
185
             FeatureStoreElement calculatedStoreElement = DALSwingLocator.getSwingManager()
186
                    .createFeatureStoreElement();
187
            calculatedStoreElement.setFeatureStore(store);
188
            this.expPicker.removeAllSymbolTables();
189
            this.expPicker.addElement(calculatedStoreElement);
190
        }
197 191
    }
198 192

  
199 193
    private ColumnController columnController;
......
236 230
            this.featureType = store.getDefaultFeatureType();
237 231
            this.store = store;
238 232
            this.query = store.createFeatureQuery();
233
            this.columnController.setStore(store);
239 234
            this.pckExpression = DALSwingLocator.getManager().createQueryFilterExpresion(store);
240 235
        } catch (DataException ex) {
241 236
            throw new RuntimeException("Can't assign store", ex);

Also available in: Unified diff