From 99da5f4a68f587d12749be1342f0bfc58fbaf36d Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 20 Dec 2011 17:08:58 +0400 Subject: [PATCH] cleanup --- .../vcs/history/FileHistoryPanelImpl.java | 1 - .../git4idea/history/wholeTree/GitLogUI.java | 26 +++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index 3dd441f58509..067e69136f59 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -687,7 +687,6 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton { myDetailsSplitter.setFirstComponent(commentGroup); myDetailsSplitter.setSecondComponent(myAdditionalDetails); - mySplitter.setFirstComponent(myDualView); setupDetails(); return mySplitter; diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java index b11ca9700bc9..ece7fc0e9bab 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java @@ -129,7 +129,6 @@ public class GitLogUI implements Disposable { private MyRefreshAction myRefreshAction; private MyStructureFilter myStructureFilter; private StructureFilterAction myStructureFilterAction; - private ToggleAction myShowDetailsAction; private AnAction myCopyHashAction; // todo group somewhere?? private Consumer myDetailsLoaderImpl; @@ -865,19 +864,20 @@ public class GitLogUI implements Disposable { myRootsAction = new MyRootsAction(rootsGetter, myJBTable); group.add(myRootsAction); group.add(myMyShowTreeAction); - myShowDetailsAction = new ToggleAction("Show Details", "Display details panel", IconLoader.getIcon("/actions/showSource.png")) { - @Override - public boolean isSelected(AnActionEvent e) { - return GitLogSettings.getInstance(myProject).isShowDetails(); - } - @Override - public void setSelected(AnActionEvent e, boolean state) { - setupDetailsSplitter(state); - GitLogSettings.getInstance(myProject).setShowDetails(state); - } - }; - group.add(myShowDetailsAction); + group.add(new ToggleAction("Show Details", "Display details panel", IconLoader.getIcon("/actions/showSource.png")) { + @Override + public boolean isSelected(AnActionEvent e) { + return GitLogSettings.getInstance(myProject).isShowDetails(); + } + + @Override + public void setSelected(AnActionEvent e, boolean state) { + setupDetailsSplitter(state); + GitLogSettings.getInstance(myProject).setShowDetails(state); + } + }); + myMyGotoCommitAction = new MyGotoCommitAction(); group.add(myMyGotoCommitAction); group.add(myRefreshAction);