From ad2bc1203d421a814af285eced99a5fa1eecb0b9 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 15 Feb 2017 18:48:22 +0300 Subject: [PATCH] [vcs-log] remove isShowTagNames and isCompactReferencesView from log ui These methods are used only in table initialization, and initial values can be set externally when creating ui. So no need to have these methods in AbstractVcsLogUi. --- .../src/com/intellij/vcs/log/ui/AbstractVcsLogUi.java | 4 ---- .../impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java | 8 -------- .../src/com/intellij/vcs/log/ui/frame/MainFrame.java | 2 ++ .../intellij/vcs/log/ui/history/FileHistoryPanel.java | 3 +++ .../com/intellij/vcs/log/ui/history/FileHistoryUi.java | 10 ---------- .../intellij/vcs/log/ui/table/VcsLogGraphTable.java | 7 ++++--- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/AbstractVcsLogUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/AbstractVcsLogUi.java index 29073ebbfacb..5d117e34dc82 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/AbstractVcsLogUi.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/AbstractVcsLogUi.java @@ -120,10 +120,6 @@ public abstract class AbstractVcsLogUi implements VcsLogUi, Disposable { public abstract boolean isShowRootNames(); - public abstract boolean isCompactReferencesView(); - - public abstract boolean isShowTagNames(); - @Override public boolean areGraphActionsEnabled() { return getTable().getRowCount() > 0; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java index 433f50cc5af0..9186bd27ad3d 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUiImpl.java @@ -97,14 +97,6 @@ public class VcsLogUiImpl extends AbstractVcsLogUi { return myUiProperties.exists(property) && myUiProperties.get(property); } - public boolean isCompactReferencesView() { - return myUiProperties.get(MainVcsLogUiProperties.COMPACT_REFERENCES_VIEW); - } - - public boolean isShowTagNames() { - return myUiProperties.get(MainVcsLogUiProperties.SHOW_TAG_NAMES); - } - @Override public boolean isMultipleRoots() { return myColorManager.isMultipleRoots(); // somewhy color manager knows about this diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java index 199db65a5365..404ba7d567e8 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java @@ -81,6 +81,8 @@ public class MainFrame extends JPanel implements DataProvider, Disposable { // initialize components myGraphTable = new VcsLogGraphTable(ui, logData, initialDataPack); + myGraphTable.setCompactReferencesView(myUiProperties.get(MainVcsLogUiProperties.COMPACT_REFERENCES_VIEW)); + myGraphTable.setShowTagNames(myUiProperties.get(MainVcsLogUiProperties.SHOW_TAG_NAMES)); PopupHandler.installPopupHandler(myGraphTable, VcsLogActionPlaces.POPUP_ACTION_GROUP, VcsLogActionPlaces.VCS_LOG_TABLE_PLACE); myDetailsPanel = new DetailsPanel(logData, ui.getColorManager(), this); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryPanel.java index 3ca01b3f4a93..7d85cd04def3 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryPanel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryPanel.java @@ -81,6 +81,9 @@ public class FileHistoryPanel extends JPanel implements DataProvider, Disposable return true; } }; + myGraphTable.setCompactReferencesView(true); + myGraphTable.setShowTagNames(false); + myDetailsPanel = new DetailsPanel(logData, myUi.getColorManager(), this); myDetailsPanel.setBorder(IdeBorderFactory.createBorder(SideBorder.LEFT)); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryUi.java index c04f7c1eee7b..2a91a5907931 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryUi.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/history/FileHistoryUi.java @@ -86,16 +86,6 @@ public class FileHistoryUi extends AbstractVcsLogUi { return false; } - @Override - public boolean isCompactReferencesView() { - return true; - } - - @Override - public boolean isShowTagNames() { - return false; - } - @Override public boolean isMultipleRoots() { return false; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java index f8559159f6ef..b81f1198bf2f 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java @@ -103,7 +103,9 @@ public class VcsLogGraphTable extends TableWithProgress implements DataProvider, @NotNull private final Collection myHighlighters = ContainerUtil.newArrayList(); - public VcsLogGraphTable(@NotNull AbstractVcsLogUi ui, @NotNull VcsLogData logData, @NotNull VisiblePack initialDataPack) { + public VcsLogGraphTable(@NotNull AbstractVcsLogUi ui, + @NotNull VcsLogData logData, + @NotNull VisiblePack initialDataPack) { super(new GraphTableModel(initialDataPack, logData, ui)); getEmptyText().setText("Changes Log"); @@ -115,8 +117,7 @@ public class VcsLogGraphTable extends TableWithProgress implements DataProvider, return VcsLogGraphTable.this.getRowHeight(); } }; - myGraphCommitCellRenderer = - new GraphCommitCellRenderer(logData, graphCellPainter, this, ui.isCompactReferencesView(), ui.isShowTagNames()); + myGraphCommitCellRenderer = new GraphCommitCellRenderer(logData, graphCellPainter, this, true, false); myStringCellRenderer = new StringCellRenderer(); myLogData.getProgress().addProgressIndicatorListener(new MyProgressListener(), ui);