[jbosstools-commits] JBoss Tools SVN: r16516 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor.
Author: scabanovich
Date: 2009-07-09 08:14:24 -0400 (Thu, 09 Jul 2009)
New Revision: 16516
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/SaveEditorSpecialWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4573
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/SaveEditorSpecialWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/SaveEditorSpecialWizard.java 2009-07-09
11:04:47 UTC (rev 16515)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/objecteditor/SaveEditorSpecialWizard.java 2009-07-09
12:14:24 UTC (rev 16516)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.model.ui.objecteditor;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.*;
import org.jboss.tools.common.meta.action.*;
import org.jboss.tools.common.model.XModelObject;
@@ -26,7 +27,14 @@
}
public int execute() {
- IWorkbenchPage workbenchPage =
ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ if(Display.getCurrent() == null) {
+ return 1;
+ }
+ IWorkbenchWindow window =
ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
+ if(window == null) {
+ return 1;
+ }
+ IWorkbenchPage workbenchPage = window.getActivePage();
IModelObjectEditorInput input = XModelObjectEditorInput.createInstance(o);
if(input == null) return 1;
IEditorPart editor = workbenchPage.findEditor(input);