[jbosstools-commits] JBoss Tools SVN: r22911 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.

[jbosstools-commits at lists.jboss.org]

Author: mareshkau
Date: 2010-06-21 06:54:33 -0400 (Mon, 21 Jun 2010)
New Revision: 22911

Modified:
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
Log:
https://jira.jboss.org/browse/JBIDE-6373

Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java	2010-06-21 09:07:37 UTC (rev 22910)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java	2010-06-21 10:54:33 UTC (rev 22911)
@@ -23,10 +23,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -36,7 +33,6 @@
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -646,8 +642,11 @@
 				}
 
 				public void completed(ProgressEvent event) {
-					MozillaEditor.this.onLoadWindow();
-					xulRunnerEditor.getBrowser().removeProgressListener(this);
+					if(MozillaEditor.this.getXulRunnerEditor().getWebBrowser()!=null){
+						//process this code only in case when editor hasn't been disposed
+						MozillaEditor.this.onLoadWindow();
+						xulRunnerEditor.getBrowser().removeProgressListener(this);
+					}
 				}
 				
 			});