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

[vcs-log] dispose instances of LoadingPane

Browse Source
This commit is contained in:
Julia Beliaeva
2016-04-08 18:35:18 +03:00
committed by Julia Beliaeva
parent 0a96c5cc18
commit 6cf3bca403
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/DetailsPanel.java
+3 -2
View File
@@ -98,7 +98,8 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
DetailsPanel(@NotNull VcsLogDataManager logDataManager,
@NotNull VcsLogGraphTable graphTable,
@NotNull VcsLogColorManager colorManager,
@NotNull VisiblePack initialDataPack) {
@NotNull VisiblePack initialDataPack,
@NotNull Disposable parent) {
myLogDataManager = logDataManager;
myGraphTable = graphTable;
myColorManager = colorManager;
@@ -129,7 +130,7 @@ class DetailsPanel extends JPanel implements ListSelectionListener {
myMainContentPanel.add(myReferencesPanel, "");
myMainContentPanel.add(myCommitDetailsPanel, "");
myLoadingPanel = new JBLoadingPanel(new BorderLayout(), logDataManager, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS) {
myLoadingPanel = new JBLoadingPanel(new BorderLayout(), parent, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS) {
@Override
public Color getBackground() {
return getDetailsBackground();
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
+3 -3
View File
@@ -90,14 +90,14 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
myGraphTable = new VcsLogGraphTable(ui, logDataManager, initialDataPack);
myBranchesPanel = new BranchesPanel(logDataManager, ui, initialDataPack.getRefs());
setBranchesPanelVisible(uiProperties.isShowBranchesPanel());
myDetailsPanel = new DetailsPanel(logDataManager, myGraphTable, ui.getColorManager(), initialDataPack);
myDetailsPanel = new DetailsPanel(logDataManager, myGraphTable, ui.getColorManager(), initialDataPack, this);
myChangesBrowser = new RepositoryChangesBrowser(project, null, Collections.<Change>emptyList(), null);
myChangesBrowser.getViewer().setScrollPaneBorder(IdeBorderFactory.createBorder(SideBorder.TOP));
myChangesBrowser.getDiffAction().registerCustomShortcutSet(myChangesBrowser.getDiffAction().getShortcutSet(), getGraphTable());
myChangesBrowser.getEditSourceAction().registerCustomShortcutSet(CommonShortcuts.getEditSource(), getGraphTable());
myChangesBrowser.getViewer().setEmptyText("");
myChangesLoadingPane = new JBLoadingPanel(new BorderLayout(), project, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS);
myChangesLoadingPane = new JBLoadingPanel(new BorderLayout(), this, ProgressWindow.DEFAULT_PROGRESS_DIALOG_POSTPONE_TIME_MILLIS);
myChangesLoadingPane.add(myChangesBrowser);
myGraphTable.getSelectionModel().addListSelectionListener(new CommitSelectionListener());
@@ -125,7 +125,7 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
setLayout(new BorderLayout());
add(myChangesBrowserSplitter);
Disposer.register(logDataManager, this);
Disposer.register(ui, this);
myGraphTable.resetDefaultFocusTraversalKeys();
setFocusTraversalPolicyProvider(true);
setFocusTraversalPolicy(new MyFocusPolicy());