Revision 44390 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
64 64 
import org.gvsig.tools.swing.api.Component;
65 65 
import org.gvsig.tools.swing.api.ToolsSwingLocator;
66 66 
import org.gvsig.tools.swing.api.ToolsSwingManager;
67 
import org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue;
68 
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_GETVALUE;
69 
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_SETVALUE;
70 
import org.gvsig.tools.swing.api.bookmarkshistory.BookmarksController;
71 
import org.gvsig.tools.swing.api.bookmarkshistory.BookmarksController.BookmarkEvent;
72 
import org.gvsig.tools.swing.api.bookmarkshistory.HistoryController;
73 
import org.gvsig.tools.swing.api.bookmarkshistory.HistoryController.HistoryEvent;
67 74 
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
68 75 
import org.gvsig.tools.swing.api.script.ScriptSwingManager;
69 76 
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
......
89 96 
    private ImageIcon defaultIconElement;
90 97 
    private InfoPanel infoPanel;
91 98 
    private AbstractAutomaticExpressionChecker automaticExpressionChecker;
92 
    private HistoryController historyController;
93 
    private BookmarksController bookmarksController;
99 
    private HistoryController<Expression> historyController;
100 
    private BookmarksController<Expression> bookmarksController;
94 101 

  		




  95
  102
  
    
    private static class InfoPanel implements Component {


  		




  96
  103
  
    

  		




  ......




  293
  300
  
    
        return new ImageIcon(url);


  		




  294
  301
  
    
    }


  		




  295
  302
  
    

  		




  
  303
  
    
    @SuppressWarnings("Convert2Lambda")


  		




  296
  304
  
    
    private void initComponents() {


  		




  297
  305
  
    
        final ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();


  		




  298
  306
  
    
        final IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent();


  		




  ......




  609
  617
  
    
    


  		




  610
  618
  
    
        this.tabExpressionBuilder.setEnabledAt(0, this.builderConfig.getPreferences().getScriptsEnabled());


  		




  611
  619
  
    
        


  		




  612
  
  
    
        this.historyController = new HistoryController(btnHistory) {


  		




  
  620
  
    
        ActionListener historyAndBookmarkListener = new ActionListener() {


  		




  613
  621
  
    
            @Override


  		




  614
  
  
    
            public void updateExpression(Expression expression) {


  		




  615
  
  
    
                setExpression(expression);


  		




  
  622
  
    
            public void actionPerformed(ActionEvent e) {


  		




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


  		




  
  624
  
    
                switch(ee.getID()) {


  		




  
  625
  
    
                    case ID_SETVALUE:


  		




  
  626
  
    
                        setExpression(ee.getCurrentValue());


  		




  
  627
  
    
                        break;


  		




  
  628
  
    
                    case ID_GETVALUE:


  		




  
  629
  
    
                        ee.setCurrentValue(getExpressionWithOutHistory());


  		




  
  630
  
    
                        break;


  		




  
  631
  
    
                }


  		




  616
  632
  
    
            }


  		




  617
  633
  
    
        };


  		




  
  634
  
    
        this.historyController = toolsSwingManager.createHistoryController(


  		




  
  635
  
    
                ExpressionEvaluatorLocator.getManager().getHistory(), 


  		




  
  636
  
    
                btnHistory


  		




  
  637
  
    
        );


  		




  
  638
  
    
        this.historyController.addActionListener(historyAndBookmarkListener);


  		




  618
  639
  
    
        


  		




  619
  
  
    
        this.bookmarksController = new BookmarksController(btnBookmarks) {


  		




  620
  
  
    
            @Override


  		




  621
  
  
    
            public void updateExpression(Expression expression) {


  		




  622
  
  
    
                setExpression(expression);


  		




  623
  
  
    
            }


  		




  624
  
  
    

  		




  625
  
  
    
            @Override


  		




  626
  
  
    
            public Expression getExpressionWithOutHistory() {


  		




  627
  
  
    
                    return DefaultJExpressionBuilder.this.getExpressionWithOutHistory();


  		




  628
  
  
    
            }


  		




  629
  
  
    
        };


  		




  
  640
  
    
        this.bookmarksController = toolsSwingManager.createBookmarksController(


  		




  
  641
  
    
                ExpressionEvaluatorLocator.getManager().getBookmarks(), 


  		




  
  642
  
    
                btnBookmarks


  		




  
  643
  
    
        );


  		




  
  644
  
    
        this.bookmarksController.addActionListener(historyAndBookmarkListener);        


  		




  630
  645
  
    
        


  		




  631
  
  
    
        


  		




  632
  646
  
    
        this.infoPanel.repaint();


  		




  633
  647
  
    
        


  		




  634
  648
  
    
        this.setPreferredSize(new Dimension(750, 450));


  		












Also available in:  Unified diff