Revision 44533 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
| DefaultJExpressionBuilder.java | ||
|---|---|---|
| 48 | 48 |
import org.apache.commons.io.FilenameUtils; |
| 49 | 49 |
import org.apache.commons.io.IOUtils; |
| 50 | 50 |
import org.apache.commons.lang3.StringUtils; |
| 51 |
import org.gvsig.configurableactions.ConfigurableActionsMamager; |
|
| 51 | 52 |
import org.gvsig.expressionevaluator.Expression; |
| 52 | 53 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator; |
| 53 | 54 |
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager; |
| ... | ... | |
| 68 | 69 |
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_GETVALUE; |
| 69 | 70 |
import static org.gvsig.tools.swing.api.bookmarkshistory.ActionEventWithCurrentValue.ID_SETVALUE; |
| 70 | 71 |
import org.gvsig.tools.swing.api.bookmarkshistory.BookmarksController; |
| 71 |
import org.gvsig.tools.swing.api.bookmarkshistory.BookmarksController.BookmarkEvent; |
|
| 72 | 72 |
import org.gvsig.tools.swing.api.bookmarkshistory.HistoryController; |
| 73 |
import org.gvsig.tools.swing.api.bookmarkshistory.HistoryController.HistoryEvent; |
|
| 74 | 73 |
import org.gvsig.tools.swing.api.pickercontroller.PickerController; |
| 75 | 74 |
import org.gvsig.tools.swing.api.script.ScriptSwingManager; |
| 76 | 75 |
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager; |
| 77 | 76 |
import org.gvsig.tools.swing.icontheme.IconTheme; |
| 77 |
import org.gvsig.tools.util.ToolsUtilLocator; |
|
| 78 | 78 |
|
| 79 | 79 |
/** |
| 80 | 80 |
* |
| ... | ... | |
| 302 | 302 |
|
| 303 | 303 |
@SuppressWarnings("Convert2Lambda")
|
| 304 | 304 |
private void initComponents() {
|
| 305 |
ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager(); |
|
| 306 |
JComponent c = cfgActionsManager.getConfigurableActionsComponent(CONFIGURABLE_PANEL_ID, this); |
|
| 307 |
pnlCfgActions.setLayout(new BorderLayout(0,0)); |
|
| 308 |
pnlCfgActions.add(c, BorderLayout.LINE_END); |
|
| 309 |
|
|
| 305 | 310 |
final ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager(); |
| 306 | 311 |
final IconTheme theme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
| 307 | 312 |
final I18nManager i18n = ToolsLocator.getI18nManager(); |
| ... | ... | |
| 605 | 610 |
doInsert(" - ");
|
| 606 | 611 |
} |
| 607 | 612 |
}); |
| 608 |
ScriptSwingManager scriptSwingManager = ToolsSwingLocator.getScriptSwingManager(); |
|
| 609 |
this.scriptPicker = scriptSwingManager.createListScriptPickerController( |
|
| 610 |
cboPickerScripts, |
|
| 611 |
btnPickerRemove, |
|
| 612 |
btnPickerSelectScript |
|
| 613 |
); |
|
| 614 |
this.scriptEditor = scriptSwingManager.createScriptEditor(); |
|
| 615 |
this.pnlScriptEditorContainer.setLayout(new BorderLayout()); |
|
| 616 |
this.pnlScriptEditorContainer.add(this.scriptEditor.asJComponent(), BorderLayout.CENTER); |
|
| 617 |
|
|
| 618 |
this.tabExpressionBuilder.setEnabledAt(0, this.builderConfig.getPreferences().getScriptsEnabled()); |
|
| 613 |
// ScriptSwingManager scriptSwingManager = ToolsSwingLocator.getScriptSwingManager();
|
|
| 614 |
// this.scriptPicker = scriptSwingManager.createListScriptPickerController(
|
|
| 615 |
// cboPickerScripts,
|
|
| 616 |
// btnPickerRemove,
|
|
| 617 |
// btnPickerSelectScript
|
|
| 618 |
// );
|
|
| 619 |
// this.scriptEditor = scriptSwingManager.createScriptEditor();
|
|
| 620 |
// this.pnlScriptEditorContainer.setLayout(new BorderLayout());
|
|
| 621 |
// this.pnlScriptEditorContainer.add(this.scriptEditor.asJComponent(), BorderLayout.CENTER);
|
|
| 622 |
// |
|
| 623 |
// this.tabExpressionBuilder.setEnabledAt(0, this.builderConfig.getPreferences().getScriptsEnabled());
|
|
| 619 | 624 |
|
| 620 | 625 |
ActionListener historyAndBookmarkListener = new ActionListener() {
|
| 621 | 626 |
@Override |
| ... | ... | |
| 785 | 790 |
} |
| 786 | 791 |
Expression expression = ExpressionEvaluatorLocator.getManager().createExpression(); |
| 787 | 792 |
expression.setPhrase(phrase); |
| 788 |
Script script = ToolsLocator.getScriptManager().createScript("UserScript", "", "python");
|
|
| 789 |
this.scriptEditor.fetch(script); |
|
| 790 |
if( !StringUtils.isEmpty(script.getCode()) ) {
|
|
| 791 |
expression.setUserScript(script); |
|
| 792 |
} |
|
| 793 |
// Script script = ToolsLocator.getScriptManager().createScript("UserScript", "", "python");
|
|
| 794 |
// this.scriptEditor.fetch(script);
|
|
| 795 |
// if( !StringUtils.isEmpty(script.getCode()) ) {
|
|
| 796 |
// expression.setUserScript(script);
|
|
| 797 |
// }
|
|
| 793 | 798 |
return expression; |
| 794 | 799 |
} |
| 795 | 800 |
|
| 796 | 801 |
@Override |
| 797 | 802 |
public void setExpression(Expression expression) {
|
| 798 |
if( expression==null ) {
|
|
| 803 |
// if( expression==null ) {
|
|
| 799 | 804 |
this.txtExpression.setText("");
|
| 800 |
try { this.scriptEditor.set(null); } catch(Exception ex) {}
|
|
| 801 |
this.scriptPicker.set(null); |
|
| 802 |
} else {
|
|
| 803 |
this.txtExpression.setText(expression.getPhrase()); |
|
| 804 |
if( expression.getUserScript()!=null ) {
|
|
| 805 |
this.scriptEditor.set(expression.getUserScript()); |
|
| 806 |
} |
|
| 807 |
if( expression.getScripts()!=null ) {
|
|
| 808 |
this.scriptPicker.set(expression.getScripts().toList()); |
|
| 809 |
} |
|
| 810 |
} |
|
| 805 |
// try { this.scriptEditor.set(null); } catch(Exception ex) {}
|
|
| 806 |
// this.scriptPicker.set(null);
|
|
| 807 |
// } else {
|
|
| 808 |
// this.txtExpression.setText(expression.getPhrase());
|
|
| 809 |
// if( expression.getUserScript()!=null ) {
|
|
| 810 |
// this.scriptEditor.set(expression.getUserScript());
|
|
| 811 |
// }
|
|
| 812 |
// if( expression.getScripts()!=null ) {
|
|
| 813 |
// this.scriptPicker.set(expression.getScripts().toList());
|
|
| 814 |
// }
|
|
| 815 |
// }
|
|
| 811 | 816 |
} |
| 812 | 817 |
|
| 813 | 818 |
@Override |
Also available in: Unified diff