From ce1087edfe35a90c8f36dc519b1e84e76604a036 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 29 Jun 2017 14:14:47 +0300 Subject: [PATCH] vcs: remove unused parameters from constructor * List is used only in MultipleChangeListBrowser * List is pointless with "capableOfExcludingChanges = false" --- .../committed/CommittedChangesBrowser.java | 2 +- .../CommittedChangesTreeBrowser.java | 2 +- .../committed/RepositoryChangesBrowser.java | 20 ++++++++++++++----- .../changes/ui/ChangeListViewerDialog.java | 7 +------ .../intellij/vcs/log/ui/frame/MainFrame.java | 2 +- .../idea/svn/integrate/ToBeMergedDialog.java | 12 +++++++---- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java index 64f02ed77afe..1cd6e053f5f3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java @@ -76,7 +76,7 @@ public class CommittedChangesBrowser extends JPanel { myChangeListsView = new TableView<>(myTableModel); myChangeListsView.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - myChangesView = new RepositoryChangesBrowser(project, tableModel.getItems()); + myChangesView = new RepositoryChangesBrowser(project); myChangeListsView.getSelectionModel().addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java index 86ba24271a5a..6a1229d7b274 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java @@ -121,7 +121,7 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP TreeUtil.expandAll(myChangesTree); myChangesTree.setExpandableItemsEnabled(false); - myDetailsView = new RepositoryChangesBrowser(project, Collections.emptyList()); + myDetailsView = new RepositoryChangesBrowser(project); myDetailsView.getViewerScrollPane().setBorder(RIGHT_BORDER); myChangesTree.getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java index aad7bf69f00f..b6cf8d558a79 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java @@ -31,6 +31,8 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.List; @@ -43,18 +45,26 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv private CommittedChangesBrowserUseCase myUseCase; + @Deprecated public RepositoryChangesBrowser(final Project project, final List changeLists) { - this(project, changeLists, Collections.emptyList(), null); + this(project); } + @Deprecated public RepositoryChangesBrowser(final Project project, final List changeLists, final List changes, final ChangeList initialListSelection) { - this(project, changeLists, changes, initialListSelection, null); + this(project, initialListSelection, null); } - public RepositoryChangesBrowser(final Project project, final List changeLists, final List changes, - final ChangeList initialListSelection, VirtualFile toSelect) { - super(project, changeLists, changes, initialListSelection, false, false, null, MyUseCase.COMMITTED_CHANGES, toSelect); + + public RepositoryChangesBrowser(@NotNull Project project) { + this(project, null, null); + } + + public RepositoryChangesBrowser(@NotNull Project project, + @Nullable ChangeList initialListSelection, + @Nullable VirtualFile toSelect) { + super(project, null, Collections.emptyList(), initialListSelection, false, false, null, MyUseCase.COMMITTED_CHANGES, toSelect); } protected void buildToolBar(final DefaultActionGroup toolBarGroup) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java index c07d5fc94dcb..7a76b8863b6b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java @@ -47,9 +47,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Date; /** @@ -139,10 +137,7 @@ public class ChangeListViewerDialog extends DialogWrapper implements DataProvide final JPanel mainPanel = new JPanel(); mainPanel.setLayout(new BorderLayout()); final Splitter splitter = new Splitter(true, 0.8f); - myChangesBrowser = new RepositoryChangesBrowser(myProject, Collections.singletonList(myChangeList), - new ArrayList<>(myChangeList.getChanges()), - myChangeList, myToSelect) { - + myChangesBrowser = new RepositoryChangesBrowser(myProject, myChangeList, myToSelect) { @Override protected void buildToolBar(DefaultActionGroup toolBarGroup) { super.buildToolBar(toolBarGroup); 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 b1bbce389e10..35743a6d23e0 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 @@ -88,7 +88,7 @@ public class MainFrame extends JPanel implements DataProvider, Disposable { PopupHandler.installPopupHandler(myGraphTable, VcsLogActionPlaces.POPUP_ACTION_GROUP, VcsLogActionPlaces.VCS_LOG_TABLE_PLACE); myDetailsPanel = new DetailsPanel(logData, ui.getColorManager(), this); - myChangesBrowser = new RepositoryChangesBrowser(project, null, Collections.emptyList(), null) { + myChangesBrowser = new RepositoryChangesBrowser(project) { @Override protected void buildToolBar(DefaultActionGroup toolBarGroup) { super.buildToolBar(toolBarGroup); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java index 7e440d654c42..f665e83d82da 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java @@ -16,7 +16,10 @@ package org.jetbrains.idea.svn.integrate; import com.intellij.icons.AllIcons; -import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.ActionToolbar; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.Task; @@ -57,8 +60,10 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; -import java.util.*; +import java.util.Collection; import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static com.intellij.openapi.vcs.changes.committed.CommittedChangesTreeBrowser.collectChanges; @@ -289,8 +294,7 @@ public class ToBeMergedDialog extends DialogWrapper { mySplitter = new Splitter(false, 0.7f); mySplitter.setFirstComponent(panel); - myRepositoryChangesBrowser = - new RepositoryChangesBrowser(myMergeContext.getProject(), Collections.emptyList(), emptyList(), null); + myRepositoryChangesBrowser = new RepositoryChangesBrowser(myMergeContext.getProject()); myRepositoryChangesBrowser.getDiffAction() .registerCustomShortcutSet(myRepositoryChangesBrowser.getDiffAction().getShortcutSet(), myRevisionsList); setChangesDecorator();