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/DefaultDataSwingManager.java

View differences:

DefaultDataSwingManager.java
38 38
import javax.swing.ListCellRenderer;
39 39
import javax.swing.table.TableModel;
40 40
import javax.swing.text.JTextComponent;
41
import org.apache.commons.lang3.StringUtils;
42
import org.gvsig.expressionevaluator.swing.Element;
43
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
41 44
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
42 45
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
43 46
import org.gvsig.expressionevaluator.swing.ExpressionPickerController;
......
101 104
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
102 105
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryOrderPanel;
103 106
import org.gvsig.fmap.dal.swing.featuretype.FeatureAttributesSelectionPanel;
104
import org.gvsig.fmap.dal.swing.searchpanel.SearchParameters;
105
import org.gvsig.tools.ToolsLocator;
106
import org.gvsig.tools.bookmarksandhistory.Bookmark;
107
import org.gvsig.tools.bookmarksandhistory.History;
107
import org.gvsig.fmap.dal.swing.impl.expressionevaluator.suggestions.CheckTableFieldsSuggestionProviderFactory;
108
import org.gvsig.fmap.dal.swing.impl.expressionevaluator.suggestions.QuotesForFieldNameSuggestionProviderFactory;
109
import org.gvsig.fmap.dal.swing.impl.expressionevaluator.suggestions.StorePointFieldSuggestionProviderFactory;
110
import org.gvsig.fmap.dal.swing.impl.expressionevaluator.suggestions.WrongNameFieldSuggestionProviderFactory;
108 111

  
109 112

  
110 113
/**
......
164 167
    }
165 168

  
166 169
    @Override
167
    public JExpressionBuilder createQueryFilterExpresion(FeatureStore store) {
170
    public void configureExpressionBuilder(ExpressionBuilderConfig builder, FeatureStore store) {
168 171
        DataManager dataManager = DALLocator.getDataManager();
169 172
        ExpressionEvaluatorSwingManager swingManager = ExpressionEvaluatorSwingLocator.getManager();
170 173
        FeatureSymbolTable featureSymbolTable = dataManager.createFeatureSymbolTable();
......
178 181
            }
179 182
        } catch (DataException ex) {
180 183
        }      
181
        final JExpressionBuilder builder = swingManager.createJExpressionBuilder();
182 184
        builder.setAllowedFunctions(storeFactory.allowFunction());
183 185
        if( sampleFeature!=null ) {
184 186
            featureSymbolTable.setFeature(sampleFeature);
......
189 191
        builder.addElement(storeElement);
190 192
        if( store.getProviderFactory().hasSQLSupport()==DataStoreProviderFactory.YES ) {
191 193
            builder.getPreferences().setSQLCompatible(true);
192
        }
193
        builder.expandElement(storeElement);
194
        }        
195
        builder.addSuggestionFactory(new StorePointFieldSuggestionProviderFactory(store));
196
        builder.addSuggestionFactory(new QuotesForFieldNameSuggestionProviderFactory(store));
197
        builder.addSuggestionFactory(new WrongNameFieldSuggestionProviderFactory(store));
198
        builder.addSuggestionFactory(new CheckTableFieldsSuggestionProviderFactory(store));
199
    }
200

  
201
    @Override
202
    public JExpressionBuilder createQueryFilterExpresion(FeatureStore store) {
203
        return this.createJExpressionBuilder(store);
204
    }
205

  
206
    @Override
207
    public JExpressionBuilder createJExpressionBuilder(final FeatureStore store) {
208
        ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
209
        final JExpressionBuilder builder = expressionSwingManager.createJExpressionBuilder();
210
        this.configureExpressionBuilder(builder, store);
211
        builder.expandElement(
212
                (Element t) -> t!=null && StringUtils.equals(t.getName(),store.getName())
213
        );
194 214
        return builder;
195 215
    }
196 216

  
197 217
    @Override
218
    public ExpressionPickerController createExpressionPickerController(FeatureStore store, JTextComponent text, JButton button, JButton bookmarks, JButton history) {
219
        ExpressionEvaluatorSwingManager expressionSwingManager = ExpressionEvaluatorSwingLocator.getManager();
220
        ExpressionPickerController builder = expressionSwingManager.createExpressionPickerController(text, button, bookmarks, history);
221
        this.configureExpressionBuilder(builder, store);
222
        return builder;
223
    }
224

  
225
    @Override
198 226
    public JFeatureForm createJFeatureForm(FeatureStore store) throws CreateJFeatureFormException {
199 227
        JFeatureForm form = new DefaultJFeatureForm();
200 228
        form.setStore(store);

Also available in: Unified diff