Revision 44688

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/searchpanel/SearchFieldController.java
42 42
import org.gvsig.tools.dataTypes.CoercionException;
43 43
import org.gvsig.tools.dataTypes.DataTypesManager;
44 44
import org.gvsig.tools.exception.BaseException;
45
import org.gvsig.tools.i18n.I18nManager;
45 46
import org.gvsig.tools.swing.api.DropDown;
46 47
import org.gvsig.tools.swing.api.ToolsSwingLocator;
47 48
import org.gvsig.tools.swing.api.ToolsSwingManager;
......
140 141
    private DropDown ddnLogicalOperators;
141 142
    private DropDown ddnRelationalOperators;
142 143

  
143
    private final LabeledValue[] relationalOperators = {
144
        new LabeledValueImpl("Equals to", ExpressionBuilder.OPERATOR_EQ),
145
        new LabeledValueImpl("Like to", ExpressionBuilder.OPERATOR_ILIKE),
146
        new LabeledValueImpl("Not equals to", ExpressionBuilder.OPERATOR_NE),
147
        new LabeledValueImpl("Greater than", ExpressionBuilder.OPERATOR_GT),
148
        new LabeledValueImpl("Greater or equal to", ExpressionBuilder.OPERATOR_GE),
149
        new LabeledValueImpl("Less than", ExpressionBuilder.OPERATOR_LT),
150
        new LabeledValueImpl("Less or equal to", ExpressionBuilder.OPERATOR_LE)
151
    };
152
    private final LabeledValue[] logicalOperators = {
153
        new LabeledValueImpl("Or", ExpressionBuilder.OPERATOR_OR),
154
        new LabeledValueImpl("And", ExpressionBuilder.OPERATOR_AND)
155
    };
144
    private LabeledValue[] relationalOperators;
145
    private LabeledValue[] logicalOperators;
156 146

  
157 147
    public SearchFieldController(
158 148
            FeatureStore store,
......
182 172
    
183 173
    private void initComponents() {
184 174
        try {
175
            I18nManager i18n = ToolsLocator.getI18nManager();
185 176
            ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
177
            
178
            relationalOperators = new LabeledValue[] {
179
                new LabeledValueImpl(i18n.getTranslation("_Equals_to"), ExpressionBuilder.OPERATOR_EQ),
180
                new LabeledValueImpl(i18n.getTranslation("_Like_to"), ExpressionBuilder.OPERATOR_ILIKE),
181
                new LabeledValueImpl(i18n.getTranslation("_Not_equals_to"), ExpressionBuilder.OPERATOR_NE),
182
                new LabeledValueImpl(i18n.getTranslation("_Greater_than"), ExpressionBuilder.OPERATOR_GT),
183
                new LabeledValueImpl(i18n.getTranslation("_Greater_or_equal_to"), ExpressionBuilder.OPERATOR_GE),
184
                new LabeledValueImpl(i18n.getTranslation("_Less_than"), ExpressionBuilder.OPERATOR_LT),
185
                new LabeledValueImpl(i18n.getTranslation("_Less_or_equal_to"), ExpressionBuilder.OPERATOR_LE)
186
            };
187

  
188
            logicalOperators = new LabeledValue[] {
189
                new LabeledValueImpl(i18n.getTranslation("_Or"), ExpressionBuilder.OPERATOR_OR),
190
                new LabeledValueImpl(i18n.getTranslation("_And"), ExpressionBuilder.OPERATOR_AND)
191
            };
192
            
186 193
            this.lblExtraFields.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
187 194

  
188 195
            this.ddnFields = toolsSwingManager.createDropDown(lblFields);
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties
1406 1406
_Search=Buscar
1407 1407
_Insert_a_search_expression=Introduzca una expresi\u00f3n de b\u00fasqueda
1408 1408
_elements=elementos
1409
_Select_order=Seleccione orden
1409
_Select_order=Seleccione orden
1410
_Equals_to=Igual a
1411
_Like_to=Parecido a
1412
_Not_equals to=No igual a
1413
_Greater_than=Mayor que
1414
_Greater_or_equal_to=Moyor o igual que
1415
_Less_than=Menor que
1416
_Less_or_equal_to=Menor o igual que
1417
_Or=O
1418
_And=Y
1419

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
1325 1325
_Search=Search
1326 1326
_Insert_a_search_expression=Inseart a search expression
1327 1327
_elements=elements
1328
_Select_order=Select order
1328
_Select_order=Select order
1329
_Equals_to=Equals to
1330
_Like_to=Like to
1331
_Not_equals to=Not equals to
1332
_Greater_than=Greater than
1333
_Greater_or_equal_to=Greater or equal to
1334
_Less_than=Less than
1335
_Less_or_equal_to=Less or equal to
1336
_Or=Or
1337
_And=And

Also available in: Unified diff