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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2015-11-20 16:35:14 +01:00
parent f166c442c4
commit 1fb3d06854
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/text/PsiAwareTextEditorProvider.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class PsiAwareTextEditorProvider extends TextEditorProvider implements As
final TextEditorState state = super.getStateImpl(project, editor, level);
// Save folding only on FULL level. It's very expensive to commit document on every
// type (caused by undo).
if(FileEditorStateLevel.FULL == level){
if (FileEditorStateLevel.FULL == level) {
// Folding
if (project != null && !project.isDisposed() && !editor.isDisposed() && project.isInitialized()) {
PsiDocumentManager.getInstance(project).commitDocument(editor.getDocument());
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
+12 -18
View File
@@ -199,9 +199,9 @@ public class EditorsSplitters extends IdePanePanel implements UISettingsListener
return res;
}
else if (comp instanceof EditorWindow.TCompForTablessMode) {
final EditorWithProviderComposite composite = ((EditorWindow.TCompForTablessMode)comp).myEditor;
final Element res = new Element("leaf");
writeComposite(res, composite.getFile(), composite, false, composite);
EditorWithProviderComposite composite = ((EditorWindow.TCompForTablessMode)comp).myEditor;
Element res = new Element("leaf");
res.addContent(writeComposite(composite.getFile(), composite, false, composite));
return res;
}
else {
@@ -212,28 +212,22 @@ public class EditorsSplitters extends IdePanePanel implements UISettingsListener
private void writeWindow(@NotNull Element res, @Nullable EditorWindow window) {
if (window != null) {
final EditorWithProviderComposite[] composites = window.getEditors();
EditorWithProviderComposite[] composites = window.getEditors();
for (int i = 0; i < composites.length; i++) {
final VirtualFile file = window.getFileAt(i);
final boolean isPinned = window.isFilePinned(file);
final EditorWithProviderComposite composite = composites[i];
final EditorWithProviderComposite selectedEditor = window.getSelectedEditor();
writeComposite(res, file, composite, isPinned, selectedEditor);
VirtualFile file = window.getFileAt(i);
res.addContent(writeComposite(file, composites[i], window.isFilePinned(file), window.getSelectedEditor()));
}
}
}
private void writeComposite(final Element res, final VirtualFile file, final EditorWithProviderComposite composite,
final boolean pinned,
final EditorWithProviderComposite selectedEditor) {
final Element fileElement = new Element("file");
@NotNull
private Element writeComposite(VirtualFile file, EditorWithProviderComposite composite, boolean pinned, EditorWithProviderComposite selectedEditor) {
Element fileElement = new Element("file");
fileElement.setAttribute("leaf-file-name", file.getName()); // TODO: all files
final HistoryEntry entry = composite.currentStateAsHistoryEntry();
entry.writeExternal(fileElement, getManager().getProject());
fileElement.setAttribute(PINNED, Boolean.toString(pinned));
composite.currentStateAsHistoryEntry().writeExternal(fileElement, getManager().getProject());
fileElement.setAttribute(PINNED, Boolean.toString(pinned));
fileElement.setAttribute(CURRENT_IN_TAB, Boolean.toString(composite.equals(selectedEditor)));
res.addContent(fileElement);
return fileElement;
}
public void openFiles() {