Author: dgeraskov Date: 2008-02-20 09:56:10 -0500 (Wed, 20 Feb 2008) New Revision: 6471 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java Log: http://jira.jboss.com/jira/browse/JBIDE-1667 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2008-02-20 14:55:47 UTC (rev 6470) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/AbstractQueryEditor.java 2008-02-20 14:56:10 UTC (rev 6471) @@ -77,14 +77,24 @@ hei.resetName(); } this.consoleConfigurationName = name; - execAction.setEnabled(name.trim().length() != 0); + showEditorInput( getEditorInput() ); } + + protected void updateExecButton(){ + if (getSourceViewer() != null ){ + execAction.setEnabled(getConsoleConfigurationName().trim().length() != 0 + && getSourceViewer().getDocument().get().trim().length() > 0); + } else { + execAction.setEnabled(false); + } + } public void showEditorInput(IEditorInput editorInput) { try { doSetInput( editorInput ); + updateExecButton(); } catch (CoreException e) { HibernateConsolePlugin.getDefault().logErrorMessage( Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2008-02-20 14:55:47 UTC (rev 6470) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/criteriaeditor/CriteriaEditor.java 2008-02-20 14:56:10 UTC (rev 6471) @@ -36,7 +36,9 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextListener; import org.eclipse.jface.text.ITextSelection; +import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -188,6 +190,13 @@ createToolbar( parent ); super.createPartControl( parent ); + if (getSourceViewer() != null ){ + getSourceViewer().addTextListener(new ITextListener(){ + + public void textChanged(TextEvent event) { + updateExecButton(); + }}); + } Control control = parent.getChildren()[1]; control.setLayoutData( new GridData( GridData.FILL_BOTH ) ); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2008-02-20 14:55:47 UTC (rev 6470) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLEditor.java 2008-02-20 14:56:10 UTC (rev 6471) @@ -29,7 +29,9 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.ITextListener; import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.jface.text.source.IVerticalRuler; import org.eclipse.jface.text.source.projection.ProjectionSupport; @@ -135,6 +137,14 @@ super.createPartControl( parent ); + if (getSourceViewer() != null ){ + getSourceViewer().addTextListener(new ITextListener(){ + + public void textChanged(TextEvent event) { + updateExecButton(); + }}); + } + // move to base class? Control control = parent.getChildren()[1]; control.setLayoutData( new GridData( GridData.FILL_BOTH ) );