MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WI-1153 (Exception when closing one of two opened projects)

Browse Source 
!!! Editor not released bug fixed
This commit is contained in:
irengrig
2010-02-24 10:57:00 +03:00
parent b32655c721
commit 85546ce0f4
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/editor/DisposableEditorPanel.java
+3 -1
View File
@@ -33,6 +33,8 @@ public class DisposableEditorPanel extends JPanel implements Disposable {
}
public void dispose() {
EditorFactory.getInstance().releaseEditor(myEditor);
if (! myEditor.isDisposed()) {
EditorFactory.getInstance().releaseEditor(myEditor);
}
}
}
platform/platform-api/src/com/intellij/util/ui/EditorAdapter.java
+4
View File
@@ -81,6 +81,10 @@ public class EditorAdapter {
LOG.assertTrue(myEditor.isViewer());
}
public Editor getEditor() {
return myEditor;
}
public void appendString(String string, TextAttributes attrs) {
synchronized (myLines) {
myLines.add(new Line(string, attrs));
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+13 -2
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.components.StorageScheme;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.DisposableEditorPanel;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
import com.intellij.openapi.editor.EditorSettings;
@@ -64,7 +63,10 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.util.*;
import java.util.List;
public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx implements ProjectComponent, JDOMExternalizable {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl");
@@ -244,6 +246,12 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
synchronized (myDisposeLock) {
if (myIsDisposed) return;
if (myEditorAdapter != null) {
final Editor editor = myEditorAdapter.getEditor();
if (! editor.isDisposed()) {
EditorFactory.getInstance().releaseEditor(editor);
}
}
myMappings.disposeMe();
try {
myContentManager = null;
@@ -319,7 +327,10 @@ public void addMessageToConsoleWindow(final String message, final TextAttributes
editorSettings.setFoldingOutlineShown(false);
myEditorAdapter = new EditorAdapter(editor, myProject);
content = ContentFactory.SERVICE.getInstance().createContent(new DisposableEditorPanel(editor), displayName, true);
final JPanel panel = new JPanel(new BorderLayout());
panel.add(editor.getComponent(), BorderLayout.CENTER);
content = ContentFactory.SERVICE.getInstance().createContent(panel, displayName, true);
contentManager.addContent(content);
for (Pair<String, TextAttributes> pair : myPendingOutput) {