JBIDE-20611 NPE in Visual Editor Preview for every editor modificatio…

…n after reopening the editor
jbosstools · Sep 17, 2015 · ce6b523 · ce6b523
1 parent b2138fe
commit ce6b523
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.../org.jboss.tools.vpe.preview.editor/src/org/jboss/tools/vpe/preview/editor/VpvEditor.java b/.../org.jboss.tools.vpe.preview.editor/src/org/jboss/tools/vpe/preview/editor/VpvEditor.java
@@ -453,6 +453,7 @@ public void setFocus() {
 	}
 
 	public void dispose() {
+		removeDocumentListener(sourceEditor);
 		if (selectionBarCloseListener != null) {
 			WebUiPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(selectionBarCloseListener);
 		}

diff --git a/....jboss.tools.vpe.preview.editor/src/org/jboss/tools/vpe/preview/editor/VpvEditorPart.java b/....jboss.tools.vpe.preview.editor/src/org/jboss/tools/vpe/preview/editor/VpvEditorPart.java
@@ -666,13 +666,6 @@ public void dispose() {
 			editorSettings.dispose();
 			editorSettings = null;
 		}
-		// editor will disposed as part of multipart editor
-		if (sourceEditor != null) {
-			removeDocumentListener(sourceEditor);
-			sourceEditor.dispose();
-			sourceEditor = null;
-		}
-
 		if (visualEditor != null) {
 			visualEditor.dispose();
 			visualEditor = null;
@@ -682,6 +675,11 @@ public void dispose() {
 			vpvPreview.dispose();
 			vpvPreview=null;
 		}
+		// editor will disposed as part of multipart editor
+		if (sourceEditor != null) {
+			sourceEditor.dispose();
+			sourceEditor = null;
+		}
 		if (previewContent != null) {
 			previewContent.dispose();
 			previewContent = null;
@@ -805,7 +803,10 @@ public void partDeactivated(IWorkbenchPart part) {
 
 				@Override
 				public void partClosed(IWorkbenchPart part) {
-					removeDocumentListener(sourceEditor);
+					if (part.equals(sourceEditor.getEditorPart())) {
+						removeDocumentListener(sourceEditor);
+						getSite().getPage().removePartListener(this);
+					}
 				}
 
 				@Override