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

diff: move context hints update/process into base class

Browse Source 
* avoid possible issues with dispose() order - we want to update hints before anything is destroyed
This commit is contained in:
Aleksey Pivovarov
2015-05-18 14:16:41 +03:00
parent ca5cc81f35
commit a304b4a923
7 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/binary/BinaryDiffViewer.java
+8 -10
View File
@@ -118,23 +118,18 @@ public class BinaryDiffViewer extends ListenerDiffViewerBase {
installEditorListeners();
}
@Override
@CalledInAwt
protected void onInit() {
super.onInit();
processContextHints();
}
@Override
@CalledInAwt
public void onDispose() {
updateContextHints();
destroyEditorListeners();
destroyEditors();
super.onDispose();
}
private void processContextHints() {
@Override
@CalledInAwt
protected void processContextHints() {
super.processContextHints();
if (myEditor1 == null) {
myCurrentSide = Side.RIGHT;
}
@@ -147,7 +142,10 @@ public class BinaryDiffViewer extends ListenerDiffViewerBase {
}
}
private void updateContextHints() {
@Override
@CalledInAwt
protected void updateContextHints() {
super.updateContextHints();
if (myEditor1 != null && myEditor2 != null) {
myContext.putUserData(DiffUserDataKeys.PREFERRED_FOCUS_SIDE, myCurrentSide);
}
platform/diff-impl/src/com/intellij/diff/tools/fragmented/OnesideDiffViewer.java
+5 -3
View File
@@ -149,7 +149,6 @@ public class OnesideDiffViewer extends TextDiffViewerBase {
@CalledInAwt
protected void onInit() {
super.onInit();
processContextHints();
installTypingSupport();
myPanel.setLoadingContent(); // We need loading panel only for initial rediff()
}
@@ -157,21 +156,24 @@ public class OnesideDiffViewer extends TextDiffViewerBase {
@Override
@CalledInAwt
protected void onDispose() {
updateContextHints();
EditorFactory.getInstance().releaseEditor(myEditor);
super.onDispose();
EditorFactory.getInstance().releaseEditor(myEditor);
}
@Override
@CalledInAwt
protected void processContextHints() {
super.processContextHints();
Side side = DiffUtil.getUserData(myRequest, myContext, DiffUserDataKeys.MASTER_SIDE);
if (side != null && side.select(myActualContent1, myActualContent2) != null) myMasterSide = side;
myInitialScrollHelper.processContext(myRequest);
}
@Override
@CalledInAwt
protected void updateContextHints() {
super.updateContextHints();
myInitialScrollHelper.updateContext(myRequest);
myFoldingModel.updateContext(myRequest, getFoldingModelSettings());
}
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
+3 -1
View File
@@ -161,16 +161,18 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer {
}
@Override
@CalledInAwt
protected void processContextHints() {
super.processContextHints();
myInitialScrollHelper.processContext(myRequest);
}
@Override
@CalledInAwt
protected void updateContextHints() {
super.updateContextHints();
if (myFoldingModel != null) myFoldingModel.updateContext(myRequest, getFoldingModelSettings());
myInitialScrollHelper.updateContext(myRequest);
super.updateContextHints();
}
//
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
+2
View File
@@ -138,12 +138,14 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewer {
}
@Override
@CalledInAwt
protected void processContextHints() {
super.processContextHints();
myInitialScrollHelper.processContext(myRequest);
}
@Override
@CalledInAwt
protected void updateContextHints() {
super.updateContextHints();
myFoldingModel.updateContext(myRequest, getFoldingModelSettings());
platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
+11
View File
@@ -58,6 +58,7 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
@NotNull
public final FrameDiffTool.ToolbarComponents init() {
processContextHints();
onInit();
FrameDiffTool.ToolbarComponents components = new FrameDiffTool.ToolbarComponents();
@@ -81,6 +82,8 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
myDisposed = true;
abortRediff();
updateContextHints();
onDispose();
}
};
@@ -89,6 +92,14 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider {
UIUtil.invokeLaterIfNeeded(doDispose);
}
@CalledInAwt
protected void processContextHints() {
}
@CalledInAwt
protected void updateContextHints() {
}
@CalledInAwt
public final void scheduleRediff() {
if (isDisposed()) return;
platform/diff-impl/src/com/intellij/diff/tools/util/threeside/ThreesideTextDiffViewer.java
+6 -8
View File
@@ -110,27 +110,25 @@ public abstract class ThreesideTextDiffViewer extends TextDiffViewerBase {
myEditorSettingsAction.applyDefaults();
}
@Override
@CalledInAwt
protected void onInit() {
super.onInit();
processContextHints();
}
@Override
@CalledInAwt
protected void onDispose() {
updateContextHints();
super.onDispose();
destroyEditors();
}
@Override
@CalledInAwt
protected void processContextHints() {
super.processContextHints();
ThreeSide side = myContext.getUserData(DiffUserDataKeys.PREFERRED_FOCUS_THREESIDE);
if (side != null) myCurrentSide = side;
}
@Override
@CalledInAwt
protected void updateContextHints() {
super.updateContextHints();
myContext.putUserData(DiffUserDataKeys.PREFERRED_FOCUS_THREESIDE, myCurrentSide);
}
platform/diff-impl/src/com/intellij/diff/tools/util/twoside/TwosideTextDiffViewer.java
+6 -8
View File
@@ -113,22 +113,17 @@ public abstract class TwosideTextDiffViewer extends TextDiffViewerBase {
new MyOpenInEditorWithMouseAction().register(getEditors());
}
@Override
@CalledInAwt
protected void onInit() {
super.onInit();
processContextHints();
}
@Override
@CalledInAwt
protected void onDispose() {
updateContextHints();
super.onDispose();
destroyEditors();
}
@Override
@CalledInAwt
protected void processContextHints() {
super.processContextHints();
if (myEditor1 == null) {
myCurrentSide = Side.RIGHT;
}
@@ -141,7 +136,10 @@ public abstract class TwosideTextDiffViewer extends TextDiffViewerBase {
}
}
@Override
@CalledInAwt
protected void updateContextHints() {
super.updateContextHints();
if (myEditor1 != null && myEditor2 != null) {
myContext.putUserData(DiffUserDataKeys.PREFERRED_FOCUS_SIDE, myCurrentSide);
}