Revision 44267 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 java.util.Map;
8 9
import javax.swing.ImageIcon;
9 10
import javax.swing.JButton;
10 11
import javax.swing.JMenuItem;
......
62 63
    private final JMenuItem menuItem;
63 64
    private final AbstractAutomaticExpressionChecker automaticExpressionChecker;
64 65
    private boolean returnNullWhenEmptyExpression;
66
    private final HistoryController historyController;
67
    private final BookmarksController bookmarksController;
65 68
    
66
    public DefaultExpressionPickerController(ExpressionEvaluatorSwingManager manager, JTextComponent text, JButton button) {
69
    public DefaultExpressionPickerController(ExpressionEvaluatorSwingManager manager, 
70
            JTextComponent text, 
71
            JButton button,
72
            JButton btnHistory,
73
            JButton btnBookmarks
74
        ) {
67 75
        ToolsSwingManager swingManager = ToolsSwingLocator.getToolsSwingManager();
68 76
        I18nManager i18n = ToolsLocator.getI18nManager();
69 77

  
......
89 97
        this.menuItem.addActionListener(buttonAction);
90 98
        popupMenu.add(this.menuItem);
91 99
        
100
        this.historyController = new HistoryController(btnHistory) {
101
            @Override
102
            public void updateExpression(Expression expression) {
103
                set(expression);
104
            }
105
        };
106
        popupMenu.add(this.historyController.createMenu());
107

  
108
        this.bookmarksController = new BookmarksController(btnBookmarks) {
109
            @Override
110
            public void updateExpression(Expression expression) {
111
                set(expression);
112
            }
113

  
114
            @Override
115
            public Expression getExpressionWithOutHistory() {
116
                return get();
117
            }
118
        };
119
        popupMenu.add(this.bookmarksController.createMenu());
120

  
92 121
        this.automaticExpressionChecker = new AbstractAutomaticExpressionChecker(config, text) {
93 122
            @Override
94 123
            protected Expression getExpression() {
......
236 265
    public void setPreviewSymbolTable(SymbolTable symbolTable) {
237 266
        this.config.setPreviewSymbolTable(symbolTable);
238 267
    }
268

  
269
    @Override
270
    public Object getProperty(String name) {
271
        return this.config.getProperty(name);
272
    }
273

  
274
    @Override
275
    public void setProperty(String name, Object value) {
276
        this.config.setProperty(name, value);
277
    }
278

  
279
    @Override
280
    public Map<String, Object> getProperties() {
281
        return this.config.getProperties();
282
    }
239 283
}

Also available in: Unified diff