mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
vcs: remove unused parameters from constructor
* List<ChangeLists> is used only in MultipleChangeListBrowser * List<Change> is pointless with "capableOfExcludingChanges = false"
This commit is contained in:
+1
-1
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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() {
|
||||
|
||||
+15
-5
@@ -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<CommittedChangeList> changeLists) {
|
||||
this(project, changeLists, Collections.emptyList(), null);
|
||||
this(project);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public RepositoryChangesBrowser(final Project project, final List<? extends ChangeList> changeLists, final List<Change> changes,
|
||||
final ChangeList initialListSelection) {
|
||||
this(project, changeLists, changes, initialListSelection, null);
|
||||
this(project, initialListSelection, null);
|
||||
}
|
||||
|
||||
public RepositoryChangesBrowser(final Project project, final List<? extends ChangeList> changeLists, final List<Change> 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) {
|
||||
|
||||
+1
-6
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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.<SvnChangeList>emptyList(), emptyList(), null);
|
||||
myRepositoryChangesBrowser = new RepositoryChangesBrowser(myMergeContext.getProject());
|
||||
myRepositoryChangesBrowser.getDiffAction()
|
||||
.registerCustomShortcutSet(myRepositoryChangesBrowser.getDiffAction().getShortcutSet(), myRevisionsList);
|
||||
setChangesDecorator();
|
||||
|
||||
Reference in New Issue
Block a user