Revision 44102

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/extension/SelectByAttributes.java
7 7
import javax.swing.JButton;
8 8
import javax.swing.JPanel;
9 9
import org.gvsig.expressionevaluator.Expression;
10
import org.gvsig.expressionevaluator.swing.Element;
10
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
11
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
12
import org.gvsig.expressionevaluator.MutableSymbolTable;
11 13
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
12 14
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
13 15
import org.gvsig.expressionevaluator.swing.JExpressionBuilder;
14 16
import org.gvsig.fmap.dal.DALLocator;
15 17
import org.gvsig.fmap.dal.DataManager;
18
import org.gvsig.fmap.dal.exception.DataException;
19
import org.gvsig.fmap.dal.expressionevaluator.FeatureSymbolTable;
16 20
import org.gvsig.fmap.dal.feature.Feature;
17 21
import org.gvsig.fmap.dal.feature.FeatureQuery;
18 22
import org.gvsig.fmap.dal.feature.FeatureSelection;
......
43 47
        I18nManager i18n = ToolsLocator.getI18nManager();
44 48
        WindowManager windowManager = ToolsSwingLocator.getWindowManager();
45 49
        ExpressionEvaluatorSwingManager swingManager = ExpressionEvaluatorSwingLocator.getManager();
46

  
50
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
51
        DataManager dataManager = DALLocator.getDataManager();
52
        
53
        Feature sampleFeature = null;
54
        try {
55
            sampleFeature = store.getFeatureSelection().first();
56
            if( sampleFeature == null ) {
57
                sampleFeature = store.first();
58
            }
59
        } catch (DataException ex) {
60
        }      
61
        
47 62
        final JPanel panel = new JPanel();
48 63
        panel.setLayout(new BorderLayout());
49 64

  
50 65
        final JExpressionBuilder builder = swingManager.createJExpressionBuilder();
66
        if( sampleFeature!=null ) {
67
            FeatureSymbolTable featureSymbolTable = dataManager.createFeatureSymbolTable();
68
            featureSymbolTable.setFeature(sampleFeature);
69
            builder.setPreviewSymbolTable(featureSymbolTable.createParent());
70
        }
71
        
51 72
        builder.addSymbolTable(DataManager.FEATURE_SYMBOL_TABLE);
52 73
        builder.addElement(swingManager.createElement("View"));
53 74
        builder.addElement(
......
60 81
        panel.add(builder.asJComponent(), BorderLayout.CENTER);
61 82
        JPanel buttons = new JPanel();
62 83
        buttons.setLayout(new FlowLayout(FlowLayout.RIGHT, 4, 4));
63
        buttons.add(new JButton(new AbstractAction(i18n.getTranslation("_Set_selection")) {
84
        buttons.add(new JButton(new AbstractAction(i18n.getTranslation("_New_selection")) {
64 85
            @Override
65 86
            public void actionPerformed(ActionEvent e) {
66 87
                setSelection(store, builder.getExpression());
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1230 1230

  
1231 1231
_Selection_by_attributes=Selecci\u00f3n por atributos
1232 1232
_Select_by_attributes_old=Selecci\u00f3n por atributos (antiguo)
1233
_Set_selection=Asignar a la selecci\u00f3nd
1233
_New_selection=Nueva selecci\u00f3n
1234 1234
_Add_to_selection=A\u00f1adir a la selecci\u00f3n
1235 1235
_Filter_selection=Filtrar la selecci\u00f3n
1236 1236
text_editor=Editor de texto
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1152 1152

  
1153 1153
_Selection_by_attributes=Selecci\u00f3n por atributos
1154 1154
_Select_by_attributes_old=Select by attributes (old)
1155
_Set_selection=Set selection
1155
_New_selection=New selection
1156 1156
_Add_to_selection=Add to selection
1157 1157
_Filter_selection=Filter selection
1158 1158
text_editor=Text editor

Also available in: Unified diff