Author: scabanovich Date: 2010-10-22 11:26:06 -0400 (Fri, 22 Oct 2010) New Revision: 26001 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java Log: JBIDE-7391 https://jira.jboss.org/browse/JBIDE-7391 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2010-10-22 15:18:40 UTC (rev 26000) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2010-10-22 15:26:06 UTC (rev 26001) @@ -410,6 +410,8 @@ } public void doGlobalAction(String actionName) { + if(nsupport.doGlobalAction(actionName)); + if(vsupport.doGlobalAction(actionName)); if(ITextEditorActionConstants.DELETE.equals(actionName)) { action(XChildrenEditor.DELETE); } else if(ITextEditorActionConstants.COPY.equals(actionName)) { @@ -420,6 +422,10 @@ } private void doXActionCopy() { + if(xtable == null || xtable.getTable() == null || xtable.getTable().isDisposed() + || !xtable.getTable().isFocusControl()) { + return; + } ISelection selection = getSelectionProvider().getSelection(); if(selection == null || selection.isEmpty() || !(selection instanceof StructuredSelection)) return; StructuredSelection ss = (StructuredSelection)selection; @@ -435,6 +441,10 @@ } private void doXActionPaste() { + if(xtable == null || xtable.getTable() == null || xtable.getTable().isDisposed() + || !xtable.getTable().isFocusControl()) { + return; + } invokeXAction(XAction.PASTE, helper.getModelObject(), null); }