Revision 44706 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
22 22 
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
23 23 
import org.gvsig.tools.ToolsLocator;
24 24 
import org.gvsig.tools.dataTypes.CoercionException;
25 
import org.gvsig.tools.dataTypes.DataTypesManager;
26 25 
import org.gvsig.tools.swing.api.ToolsSwingLocator;
27 26 
import org.gvsig.tools.swing.api.pickercontroller.AbstractPickerController;
28 27 
import org.gvsig.tools.swing.icontheme.IconTheme;
......
36 35 
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_GETVALUE;
37 36 
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_SETVALUE;
38 37 
import org.gvsig.tools.swing.api.bookmarkshistory.BookmarksController;
39 
import org.gvsig.tools.swing.api.bookmarkshistory.BookmarksController.BookmarkEvent;
40 38 
import org.gvsig.tools.swing.api.bookmarkshistory.HistoryController;
41 
import org.gvsig.tools.swing.api.bookmarkshistory.HistoryController.HistoryEvent;
42 39 
import org.gvsig.tools.swing.api.windowmanager.Dialog;
43 40 
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
44 41 
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
......
93 90 
        this.value = null;
94 91 
        this.returnNullWhenEmptyExpression = true;
95 92 
        this.button.setIcon(this.getIcon("picker-expression"));
96 
        this.buttonAction = new ActionListener() {
97 
            @Override
98 
            public void actionPerformed(ActionEvent e) {
99 
                doSelectExpression();
100 
            }
93 
        this.buttonAction = (ActionEvent e) -> {
94 
          doSelectExpression();
101 95 
        };
102 96 
        this.button.addActionListener(this.buttonAction);
103 97 

  		




  ......




  108
  102
  
    
        this.menuItem.addActionListener(buttonAction);


  		




  109
  103
  
    
        popupMenu.add(this.menuItem);


  		




  110
  104
  
    
        


  		




  111
  
  
    
        ActionListener historyAndBookmarkListener = new ActionListener() {


  		




  112
  
  
    
            @Override


  		




  113
  
  
    
            public void actionPerformed(ActionEvent e) {


  		




  114
  
  
    
                ActionEventWithCurrentValue<Expression> ee = (ActionEventWithCurrentValue<Expression>)e;


  		




  115
  
  
    
                switch(ee.getID()) {


  		




  116
  
  
    
                    case ID_SETVALUE:


  		




  117
  
  
    
                        set(ee.getCurrentValue());


  		




  118
  
  
    
                        break;


  		




  119
  
  
    
                    case ID_GETVALUE:


  		




  120
  
  
    
                        ee.setCurrentValue(get());


  		




  121
  
  
    
                        break;


  		




  122
  
  
    
                }


  		




  123
  
  
    
            }


  		




  
  105
  
    
        ActionListener historyAndBookmarkListener = (ActionEvent e) -> {


  		




  
  106
  
    
          ActionEventWithCurrentValue<Expression> ee = (ActionEventWithCurrentValue<Expression>)e;


  		




  
  107
  
    
          switch(ee.getID()) {


  		




  
  108
  
    
            case ID_SETVALUE:


  		




  
  109
  
    
              set(ee.getCurrentValue());


  		




  
  110
  
    
              break;


  		




  
  111
  
    
            case ID_GETVALUE:


  		




  
  112
  
    
              ee.setCurrentValue(get());


  		




  
  113
  
    
              break;


  		




  
  114
  
    
          }


  		




  124
  115
  
    
        };


  		




  125
  116
  
    
        this.historyController = swingManager.createHistoryController(


  		




  126
  117
  
    
                ExpressionEvaluatorLocator.getManager().getHistory(), 


  		




  ......




  145
  136
  
    
    }


  		




  146
  137
  
    
    


  		




  147
  138
  
    
    private void doSelectExpression() {


  		




  148
  
  
    
        Expression theValue = this.get();


  		




  
  139
  
    
        I18nManager i18n = ToolsLocator.getI18nManager();


  		




  
  140
  
    
        WindowManager_v2 windowManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();


  		




  149
  141
  
    

  		




  
  142
  
    
        Expression theValue = this.get();


  		




  150
  143
  
    
        DefaultJExpressionBuilder panel = new DefaultJExpressionBuilder(this.manager, this.config);


  		




  151
  144
  
    
        panel.setPreviewSymbolTable(this.getPreviewSymbolTable());


  		




  152
  145
  
    
        panel.setExpression(theValue);


  		




  153
  146
  
    
        


  		




  154
  
  
    
        WindowManager_v2 windowManager = (WindowManager_v2) ToolsSwingLocator.getWindowManager();


  		




  155
  147
  
    
        Dialog dialog = windowManager.createDialog(


  		




  156
  148
  
    
                panel.asJComponent(),


  		




  157
  
  
    
                "Expression builder",


  		




  
  149
  
    
                i18n.getTranslation("_Expression_builder"),


  		




  158
  150
  
    
                null, 


  		




  159
  151
  
    
                WindowManager_v2.BUTTONS_OK_CANCEL


  		




  160
  152
  
    
        );


  		












Also available in:  Unified diff