Revision 43989 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/DefaultJExpressionBuilder.java

View differences:

DefaultJExpressionBuilder.java
7 7
import java.awt.event.ActionListener;
8 8
import java.awt.event.KeyAdapter;
9 9
import java.awt.event.KeyEvent;
10
import java.awt.event.KeyListener;
11 10
import java.awt.event.MouseAdapter;
12 11
import java.awt.event.MouseEvent;
13 12
import java.net.URL;
......
167 166

  
168 167
    public DefaultJExpressionBuilder(ExpressionEvaluatorSwingManager manager, ExpressionBuilderConfig config) {
169 168
        this.manager = manager;
170
        this.config = new DefaultExpressionBuilderConfig(manager);
169
        if( config == null ) {
170
            this.config = new DefaultExpressionBuilderConfig(manager);
171
        } else {
172
            this.config = config;
173
        }
171 174
        this.initComponents();
172 175
    }
173 176
    
......
249 252
                doFilter();
250 253
            }
251 254
        });
255
        
256
        this.lstSimpleElement.setModel(new FilteredListModel());
252 257
        this.lstSimpleElement.setCellRenderer(new DefaultListCellRenderer() {
253 258
            @Override
254 259
            public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
......
301 306
                    }
302 307
                }
303 308
            }
304
            
305
            @Override
306
            public void keyTyped(KeyEvent e) {
307
                if( e.getKeyCode()==KeyEvent.VK_ENTER ) {
308
                    ListElement<SimpleElement> element = (ListElement<SimpleElement>) lstSimpleElement.getSelectedValue();
309
                    if (element != null) {
310
                        doSelectElement(element.getValue());
311
                        doInsert(element.getValue());
312
                    }
313
                }
314
            }
315 309
        });
310

  
316 311
        this.btnSimpleElementTimeLimit.addActionListener(new ActionListener() {
317 312
            @Override
318 313
            public void actionPerformed(ActionEvent e) {

Also available in: Unified diff