Revision 44942 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/DefaultCalculatorController.java

View differences:

DefaultCalculatorController.java
2 2

  
3 3
import java.awt.Color;
4 4
import java.awt.event.ActionEvent;
5
import java.awt.event.ActionListener;
6 5
import java.awt.event.FocusEvent;
7 6
import java.awt.event.FocusListener;
8 7
import java.awt.event.KeyAdapter;
......
25 24
import org.gvsig.expressionevaluator.ExpressionSyntaxException;
26 25
import org.gvsig.expressionevaluator.MutableSymbolTable;
27 26
import org.gvsig.expressionevaluator.SymbolTable;
28
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
29 27
import org.gvsig.expressionevaluator.swing.JExpressionBuilder;
30 28
import org.gvsig.tools.dataTypes.DataTypes;
31 29
import org.gvsig.tools.ToolsLocator;
......
85 83
        this.text.addKeyListener(new KeyAdapter() {
86 84
            @Override
87 85
            public void keyPressed(KeyEvent e) {
88
                   if( e.getKeyCode()==KeyEvent.VK_C && e.isControlDown() ) {
86
                   if( e.getKeyCode()==KeyEvent.VK_R && e.isControlDown() ) {
89 87
                       doCalculate(true);
90 88
                   } 
91 89
            }
......
117 115
                doCalculate(true);
118 116
            }
119 117
        });
120
        toolsSwingManager.addClearButton(this.text, new ActionListener() {
121
            @Override
122
            public void actionPerformed(ActionEvent e) {
123
                set(null);
124
            }
118
        toolsSwingManager.addClearButton(this.text, (ActionEvent e) -> {
119
            set(null);
125 120
        });
126 121
        toolsSwingManager.setDefaultPopupMenu(this.text);
127 122
        JPopupMenu popupMenu = this.text.getComponentPopupMenu();
......
133 128
        };  
134 129
        popupMenu.addSeparator();
135 130
        popupMenu.add(showExpressionBuilderAction);
136
        this.fireChangeTimer = new Timer(100, new ActionListener() {
137
            @Override
138
            public void actionPerformed(ActionEvent e) {
139
                fireEvent();
140
            }
131
        this.fireChangeTimer = new Timer(100, (ActionEvent e) -> {
132
            fireEvent();
141 133
        });
142 134
    }
143 135

  
......
208 200
        return null;
209 201
    }
210 202

  
203
    @Override
211 204
    public void setWarning(boolean warning) {
212 205
        this.setWarning(warning, null);
213 206
    }
214 207
    
208
    @Override
215 209
    public void setWarning(boolean warning, String description) {
216 210
        this.warning = warning;
217 211
        if( warning ) {

Also available in: Unified diff