Revision 44080 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/DefaultExpressionPickerController.java

View differences:

DefaultExpressionPickerController.java
5 5
import java.net.URL;
6 6
import java.util.Collection;
7 7
import java.util.List;
8
import javax.swing.AbstractAction;
9
import javax.swing.Action;
8 10
import javax.swing.ImageIcon;
9 11
import javax.swing.JButton;
12
import javax.swing.JPopupMenu;
10 13
import javax.swing.text.JTextComponent;
11 14
import org.apache.commons.lang3.StringUtils;
12 15
import org.gvsig.expressionevaluator.DataTypes;
......
24 27
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
25 28
import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
26 29
import org.gvsig.expressionevaluator.swing.ExpressionPickerController;
30
import org.gvsig.tools.i18n.I18nManager;
31
import org.gvsig.tools.swing.api.ToolsSwingManager;
27 32
import org.gvsig.tools.swing.api.windowmanager.Dialog;
28 33
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
29 34
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
......
54 59
    private final ExpressionEvaluatorSwingManager manager;
55 60
    
56 61
    public DefaultExpressionPickerController(ExpressionEvaluatorSwingManager manager, JTextComponent text, JButton button) {
62
        ToolsSwingManager swingManager = ToolsSwingLocator.getToolsSwingManager();
63
        I18nManager i18n = ToolsLocator.getI18nManager();
64

  
57 65
        this.manager = manager;
58 66
        this.config = new DefaultExpressionBuilderConfig(manager);
59 67
        this.text = text;
......
67 75
            }
68 76
        });
69 77

  
78
        swingManager.addClearButton(this.text);
79
        swingManager.setDefaultPopupMenu(this.text);
80
        JPopupMenu popupMenu = this.text.getComponentPopupMenu();
81
        Action showExpressionBuilderAction = new AbstractAction(i18n.getTranslation("_Show_expression_builder")) {
82
            @Override
83
            public void actionPerformed(ActionEvent e) {
84
                doSelectExpression();
85
            }
86
        };  
87
        popupMenu.addSeparator();
88
        popupMenu.add(showExpressionBuilderAction);
70 89
    }
71 90
    
72 91
    private void doSelectExpression() {
......
96 115

  
97 116
    @Override
98 117
    public void set(Expression value) {
99
        this.value = value; 
100 118
        if( value==null ) {
101 119
            this.text.setText("");
120
            this.value.setPhrase("");
102 121
        } else {
122
            this.value = value;
103 123
            this.text.setText(this.value.getPhrase());
104 124
        }
105 125
    }

Also available in: Unified diff