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

svn: merge: Removed unnecessary casts and used "SvnChangeList" directly

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2016-11-09 23:53:59 +03:00
parent 490a230235
commit 0d43889421
11 changed files with 64 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java
+2 -2
View File
@@ -17,13 +17,13 @@ package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.util.continuation.ContinuationContext;
import com.intellij.util.continuation.SeparatePiecesRunner;
import com.intellij.util.continuation.TaskDescriptor;
import com.intellij.util.continuation.Where;
import org.jetbrains.annotations.CalledInAny;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.history.SvnChangeList;
import java.util.List;
@@ -94,7 +94,7 @@ public abstract class BaseMergeTask extends TaskDescriptor {
return ar(new LocalChangesPromptTask(myMergeProcess), mergeAllTask);
}
protected void runChangeListsMerge(@NotNull List<CommittedChangeList> lists, @NotNull String title) {
protected void runChangeListsMerge(@NotNull List<SvnChangeList> lists, @NotNull String title) {
next(new LocalChangesPromptTask(myMergeProcess, lists),
new MergeTask(myMergeProcess, new ChangeListsMergerFactory(lists, false, false, true), title));
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ChangeListsMergerFactory.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class ChangeListsMergerFactory implements MergerFactory {
private final boolean myInvertRange;
private final boolean myGroupSequentialChangeLists;
public ChangeListsMergerFactory(@NotNull List<CommittedChangeList> changeLists,
public ChangeListsMergerFactory(@NotNull List<? extends CommittedChangeList> changeLists,
boolean recordOnly,
boolean invertRange,
boolean groupSequentialChangeLists) {
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LoadRecentBranchRevisions.java
+8 -10
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.util.Consumer;
import com.intellij.util.continuation.Where;
import org.jetbrains.annotations.NotNull;
@@ -44,7 +43,7 @@ public class LoadRecentBranchRevisions extends BaseMergeTask {
private boolean myLastLoaded;
@NotNull private final Consumer<LoadRecentBranchRevisions> myCallback;
@NotNull private final OneShotMergeInfoHelper myMergeChecker;
@NotNull private final List<CommittedChangeList> myCommittedChangeLists;
@NotNull private final List<SvnChangeList> myCommittedChangeLists;
public LoadRecentBranchRevisions(@NotNull QuickMerge mergeProcess, @NotNull Consumer<LoadRecentBranchRevisions> callback) {
super(mergeProcess, "Loading recent " + mergeProcess.getMergeContext().getBranchName() + " revisions", Where.POOLED);
@@ -65,7 +64,7 @@ public class LoadRecentBranchRevisions extends BaseMergeTask {
ProgressManager.progress2("Calculating not merged revisions");
myMergeChecker.prepare();
Pair<List<CommittedChangeList>, Boolean> loadResult = loadChangeLists(myMergeContext, -1, getBunchSize(-1));
Pair<List<SvnChangeList>, Boolean> loadResult = loadChangeLists(myMergeContext, -1, getBunchSize(-1));
myCommittedChangeLists.addAll(loadResult.first);
myLastLoaded = loadResult.second;
@@ -73,10 +72,9 @@ public class LoadRecentBranchRevisions extends BaseMergeTask {
}
@NotNull
public static Pair<List<CommittedChangeList>, Boolean> loadChangeLists(@NotNull MergeContext mergeContext, long beforeRevision, int size)
public static Pair<List<SvnChangeList>, Boolean> loadChangeLists(@NotNull MergeContext mergeContext, long beforeRevision, int size)
throws VcsException {
List<CommittedChangeList> changeLists =
getNotMergedChangeLists(getChangeListsBefore(mergeContext, beforeRevision, size), beforeRevision);
List<SvnChangeList> changeLists = getNotMergedChangeLists(getChangeListsBefore(mergeContext, beforeRevision, size), beforeRevision);
return Pair.create(
changeLists.subList(0, min(size, changeLists.size())),
@@ -115,9 +113,9 @@ public class LoadRecentBranchRevisions extends BaseMergeTask {
}
@NotNull
private static List<CommittedChangeList> getNotMergedChangeLists(@NotNull List<Pair<SvnChangeList, LogHierarchyNode>> changeLists,
long revision) {
List<CommittedChangeList> result = newArrayList();
private static List<SvnChangeList> getNotMergedChangeLists(@NotNull List<Pair<SvnChangeList, LogHierarchyNode>> changeLists,
long revision) {
List<SvnChangeList> result = newArrayList();
for (Pair<SvnChangeList, LogHierarchyNode> pair : changeLists) {
// do not take first since it's equal
@@ -137,7 +135,7 @@ public class LoadRecentBranchRevisions extends BaseMergeTask {
}
@NotNull
public List<CommittedChangeList> getChangeLists() {
public List<SvnChangeList> getChangeLists() {
return myCommittedChangeLists;
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LocalChangesPromptTask.java
+4 -6
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.LocalChangeList;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.util.FilePathByPathComparator;
import com.intellij.util.continuation.Where;
import com.intellij.vcsUtil.VcsUtil;
@@ -44,14 +43,14 @@ import static org.tmatesoft.svn.core.internal.util.SVNPathUtil.getRelativePath;
public class LocalChangesPromptTask extends BaseMergeTask {
@Nullable private final List<CommittedChangeList> myChangeListsToMerge;
@Nullable private final List<SvnChangeList> myChangeListsToMerge;
public LocalChangesPromptTask(@NotNull QuickMerge mergeProcess) {
super(mergeProcess, "local changes intersection check", Where.AWT);
myChangeListsToMerge = null;
}
public LocalChangesPromptTask(@NotNull QuickMerge mergeProcess, @NotNull List<CommittedChangeList> changeListsToMerge) {
public LocalChangesPromptTask(@NotNull QuickMerge mergeProcess, @NotNull List<SvnChangeList> changeListsToMerge) {
super(mergeProcess, "local changes intersection check", Where.AWT);
myChangeListsToMerge = changeListsToMerge;
}
@@ -96,7 +95,7 @@ public class LocalChangesPromptTask extends BaseMergeTask {
@Nullable
private Intersection getChangesIntersection(@NotNull List<LocalChangeList> localChangeLists,
@NotNull List<CommittedChangeList> changeListsToMerge) {
@NotNull List<SvnChangeList> changeListsToMerge) {
Set<FilePath> pathsToMerge = collectPaths(changeListsToMerge);
@@ -104,9 +103,8 @@ public class LocalChangesPromptTask extends BaseMergeTask {
}
@NotNull
private Set<FilePath> collectPaths(@NotNull List<CommittedChangeList> lists) {
private Set<FilePath> collectPaths(@NotNull List<SvnChangeList> lists) {
return lists.stream()
.map(SvnChangeList.class::cast)
.flatMap(list -> list.getAffectedPaths().stream())
.map(this::getLocalPath)
.filter(Objects::nonNull)
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java
+4 -5
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.util.Consumer;
import com.intellij.util.continuation.Where;
import org.jetbrains.annotations.NotNull;
@@ -40,7 +39,7 @@ public class MergeCalculatorTask extends BaseMergeTask {
@NotNull private final SvnBranchPointsCalculator.WrapperInvertor myCopyPoint;
@NotNull private final OneShotMergeInfoHelper myMergeChecker;
@NotNull private final List<CommittedChangeList> myNotMergedChangeLists;
@NotNull private final List<SvnChangeList> myNotMergedChangeLists;
@NotNull private final Consumer<MergeCalculatorTask> myCallback;
public MergeCalculatorTask(@NotNull QuickMerge mergeProcess,
@@ -62,7 +61,7 @@ public class MergeCalculatorTask extends BaseMergeTask {
}
@NotNull
public List<CommittedChangeList> getChangeLists() {
public List<SvnChangeList> getChangeLists() {
return myNotMergedChangeLists;
}
@@ -106,8 +105,8 @@ public class MergeCalculatorTask extends BaseMergeTask {
}
@NotNull
private List<CommittedChangeList> getNotMergedChangeLists(@NotNull List<Pair<SvnChangeList, LogHierarchyNode>> changeLists) {
List<CommittedChangeList> result = newArrayList();
private List<SvnChangeList> getNotMergedChangeLists(@NotNull List<Pair<SvnChangeList, LogHierarchyNode>> changeLists) {
List<SvnChangeList> result = newArrayList();
ProgressManager.getInstance().getProgressIndicator().setText("Checking merge information...");
for (Pair<SvnChangeList, LogHierarchyNode> pair : changeLists) {
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java
+2 -2
View File
@@ -17,8 +17,8 @@ package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.history.SvnChangeList;
import org.jetbrains.idea.svn.mergeinfo.MergeChecker;
import java.util.List;
@@ -33,7 +33,7 @@ public interface QuickMergeInteraction {
boolean shouldReintegrate(@NotNull String targetUrl);
@NotNull
SelectMergeItemsResult selectMergeItems(@NotNull List<CommittedChangeList> lists,
SelectMergeItemsResult selectMergeItems(@NotNull List<SvnChangeList> lists,
@NotNull MergeChecker mergeChecker,
boolean allStatusesCalculated,
boolean allListsLoaded);
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java
+3 -3
View File
@@ -22,9 +22,9 @@ import com.intellij.openapi.vcs.AbstractVcsHelper;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.dialogs.IntersectingLocalChangesPanel;
import org.jetbrains.idea.svn.history.SvnChangeList;
import org.jetbrains.idea.svn.mergeinfo.MergeChecker;
import java.util.List;
@@ -78,7 +78,7 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction {
@NotNull
@Override
public SelectMergeItemsResult selectMergeItems(@NotNull List<CommittedChangeList> lists,
public SelectMergeItemsResult selectMergeItems(@NotNull List<SvnChangeList> lists,
@NotNull MergeChecker mergeChecker,
boolean allStatusesCalculated,
boolean allListsLoaded) {
@@ -87,7 +87,7 @@ public class QuickMergeInteractionImpl implements QuickMergeInteraction {
dialog.show();
QuickMergeContentsVariants resultCode = toMergeVariant(dialog.getExitCode());
List<CommittedChangeList> selectedLists = resultCode == QuickMergeContentsVariants.select ? dialog.getSelected() : emptyList();
List<SvnChangeList> selectedLists = resultCode == QuickMergeContentsVariants.select ? dialog.getSelected() : emptyList();
return new SelectMergeItemsResult(resultCode, selectedLists);
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectMergeItemsResult.java
+4 -4
View File
@@ -15,16 +15,16 @@
*/
package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.history.SvnChangeList;
import java.util.List;
public class SelectMergeItemsResult {
@NotNull private final QuickMergeContentsVariants myResultCode;
@NotNull private final List<CommittedChangeList> myLists;
@NotNull private final List<SvnChangeList> myLists;
public SelectMergeItemsResult(@NotNull QuickMergeContentsVariants resultCode, @NotNull List<CommittedChangeList> lists) {
public SelectMergeItemsResult(@NotNull QuickMergeContentsVariants resultCode, @NotNull List<SvnChangeList> lists) {
myResultCode = resultCode;
myLists = lists;
}
@@ -35,7 +35,7 @@ public class SelectMergeItemsResult {
}
@NotNull
public List<CommittedChangeList> getSelectedLists() {
public List<SvnChangeList> getSelectedLists() {
return myLists;
}
}
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java
+4 -4
View File
@@ -15,22 +15,22 @@
*/
package org.jetbrains.idea.svn.integrate;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.util.continuation.Where;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.idea.svn.history.SvnChangeList;
import org.jetbrains.idea.svn.mergeinfo.MergeChecker;
import java.util.List;
public class ShowRevisionSelector extends BaseMergeTask {
@NotNull private final List<CommittedChangeList> myChangeLists;
@NotNull private final List<SvnChangeList> myChangeLists;
@NotNull private final MergeChecker myMergeChecker;
private final boolean myAllStatusesCalculated;
private final boolean myAllListsLoaded;
public ShowRevisionSelector(@NotNull QuickMerge mergeProcess,
@NotNull List<CommittedChangeList> changeLists,
@NotNull List<SvnChangeList> changeLists,
@NotNull MergeChecker mergeChecker,
boolean allStatusesCalculated,
boolean allListsLoaded) {
@@ -55,7 +55,7 @@ public class ShowRevisionSelector extends BaseMergeTask {
next(getMergeAllTasks(true));
break;
default:
List<CommittedChangeList> lists = result.getSelectedLists();
List<SvnChangeList> lists = result.getSelectedLists();
if (!lists.isEmpty()) {
runChangeListsMerge(lists, myMergeContext.getTitle());
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java
+28 -38
View File
@@ -31,12 +31,10 @@ import com.intellij.openapi.vcs.QuantitySelection;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.committed.CommittedChangeListRenderer;
import com.intellij.openapi.vcs.changes.committed.CommittedChangesTreeBrowser;
import com.intellij.openapi.vcs.changes.committed.RepositoryChangesBrowser;
import com.intellij.openapi.vcs.changes.issueLinks.AbstractBaseTagMouseListener;
import com.intellij.openapi.vcs.changes.ui.ChangeNodeDecorator;
import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNodeRenderer;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.ui.*;
import com.intellij.ui.table.TableView;
import com.intellij.util.ObjectUtils;
@@ -65,6 +63,7 @@ import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
import static com.intellij.openapi.vcs.changes.committed.CommittedChangesTreeBrowser.collectChanges;
import static com.intellij.util.containers.ContainerUtil.*;
import static com.intellij.util.containers.ContainerUtilRt.emptyList;
import static com.intellij.util.containers.ContainerUtilRt.newHashSet;
@@ -77,8 +76,8 @@ public class ToBeMergedDialog extends DialogWrapper {
public static final int MERGE_ALL_CODE = 222;
private final JPanel myPanel;
@NotNull private final MergeContext myMergeContext;
@NotNull private final ListTableModel<CommittedChangeList> myRevisionsModel;
private TableView<CommittedChangeList> myRevisionsList;
@NotNull private final ListTableModel<SvnChangeList> myRevisionsModel;
private TableView<SvnChangeList> myRevisionsList;
private RepositoryChangesBrowser myRepositoryChangesBrowser;
private Splitter mySplitter;
@@ -94,7 +93,7 @@ public class ToBeMergedDialog extends DialogWrapper {
private ToBeMergedDialog.MoreXAction myMore500Action;
public ToBeMergedDialog(@NotNull MergeContext mergeContext,
@NotNull List<CommittedChangeList> changeLists,
@NotNull List<SvnChangeList> changeLists,
final String title,
@NotNull MergeChecker mergeChecker,
boolean allStatusesCalculated,
@@ -139,7 +138,7 @@ public class ToBeMergedDialog extends DialogWrapper {
return totalRows > 0 ? myRevisionsModel.getItem(totalRows - 1).getNumber() : 0;
}
public void addMoreLists(@NotNull List<CommittedChangeList> changeLists) {
public void addMoreLists(@NotNull List<SvnChangeList> changeLists) {
myRevisionsModel.addRows(changeLists);
myRevisionsList.revalidate();
myRevisionsList.repaint();
@@ -158,13 +157,13 @@ public class ToBeMergedDialog extends DialogWrapper {
myDisposed = true;
}
private void refreshListStatus(@NotNull final List<CommittedChangeList> changeLists) {
private void refreshListStatus(@NotNull final List<SvnChangeList> changeLists) {
if (myDisposed) return;
ApplicationManager.getApplication().executeOnPooledThread(() -> {
int cnt = 10;
for (CommittedChangeList list : changeLists) {
for (SvnChangeList list : changeLists) {
// at the moment we calculate only "merged" since we don;t have branch copy point
myStatusMap.put(list.getNumber(), toListMergeStatus(myMergeChecker.checkList((SvnChangeList)list)));
myStatusMap.put(list.getNumber(), toListMergeStatus(myMergeChecker.checkList(list)));
--cnt;
if (cnt <= 0) {
@@ -216,11 +215,11 @@ public class ToBeMergedDialog extends DialogWrapper {
}
@NotNull
public List<CommittedChangeList> getSelected() {
public List<SvnChangeList> getSelected() {
Set<Long> selected = myWiseSelection.getSelected();
Set<Long> unselected = myWiseSelection.getUnselected();
// todo: can be made faster
Condition<CommittedChangeList> filter =
Condition<SvnChangeList> filter =
myWiseSelection.areAllSelected() ? list -> !unselected.contains(list.getNumber()) : list -> selected.contains(list.getNumber());
return filter(myRevisionsModel.getItems(), filter);
@@ -237,25 +236,20 @@ public class ToBeMergedDialog extends DialogWrapper {
final ListSelectionListener selectionListener = new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
List<CommittedChangeList> changeLists = myRevisionsList.getSelectedObjects();
myRepositoryChangesBrowser.setChangesToDisplay(emptyList());
List<SvnChangeList> changeLists = myRevisionsList.getSelectedObjects();
myAlreadyMerged.clear();
if (!changeLists.isEmpty()) {
List<SvnChangeList> svnChangeLists = findAll(changeLists, SvnChangeList.class);
for (SvnChangeList svnChangeList : svnChangeLists) {
myAlreadyMerged.addAll(getAlreadyMergedPaths(svnChangeList));
}
myRepositoryChangesBrowser.setChangesToDisplay(CommittedChangesTreeBrowser.collectChanges(svnChangeLists, false));
for (SvnChangeList changeList : changeLists) {
myAlreadyMerged.addAll(getAlreadyMergedPaths(changeList));
}
myRepositoryChangesBrowser.setChangesToDisplay(collectChanges(changeLists, false));
mySplitter.doLayout();
myRepositoryChangesBrowser.repaint();
}
};
final MyListCellRenderer listCellRenderer = new MyListCellRenderer();
myRevisionsList = new TableView<CommittedChangeList>() {
myRevisionsList = new TableView<SvnChangeList>() {
@Override
public TableCellRenderer getCellRenderer(int row, int column) {
return listCellRenderer;
@@ -268,9 +262,9 @@ public class ToBeMergedDialog extends DialogWrapper {
}
};
myRevisionsList.setExpandableItemsEnabled(false);
new TableViewSpeedSearch<CommittedChangeList>(myRevisionsList) {
new TableViewSpeedSearch<SvnChangeList>(myRevisionsList) {
@Override
protected String getItemText(@NotNull CommittedChangeList element) {
protected String getItemText(@NotNull SvnChangeList element) {
return element.getComment();
}
};
@@ -301,7 +295,7 @@ public class ToBeMergedDialog extends DialogWrapper {
mySplitter.setFirstComponent(panel);
myRepositoryChangesBrowser =
new RepositoryChangesBrowser(myMergeContext.getProject(), Collections.<CommittedChangeList>emptyList(), emptyList(), null);
new RepositoryChangesBrowser(myMergeContext.getProject(), Collections.<SvnChangeList>emptyList(), emptyList(), null);
myRepositoryChangesBrowser.getDiffAction()
.registerCustomShortcutSet(myRepositoryChangesBrowser.getDiffAction().getShortcutSet(), myRevisionsList);
setChangesDecorator();
@@ -360,9 +354,7 @@ public class ToBeMergedDialog extends DialogWrapper {
final Rectangle baseRect = myRevisionsList.getCellRect(idx, 0, false);
baseRect.setSize(checkboxWidth, baseRect.height);
if (baseRect.contains(e.getPoint())) {
SvnChangeList changeList = (SvnChangeList)myRevisionsList.getModel().getValueAt(idx, 0);
toggleInclusion(changeList);
toggleInclusion(myRevisionsModel.getRowValue(idx));
myRevisionsList.repaint(baseRect);
}
}
@@ -374,11 +366,9 @@ public class ToBeMergedDialog extends DialogWrapper {
@Override
public void keyReleased(KeyEvent e) {
if (KeyEvent.VK_SPACE == e.getKeyCode()) {
List<CommittedChangeList> selected = myRevisionsList.getSelectedObjects();
List<SvnChangeList> selected = myRevisionsList.getSelectedObjects();
if (!selected.isEmpty()) {
selected.stream()
.filter(SvnChangeList.class::isInstance)
.forEach(ToBeMergedDialog.this::toggleInclusion);
selected.forEach(ToBeMergedDialog.this::toggleInclusion);
myRevisionsList.repaint();
e.consume();
}
@@ -387,7 +377,7 @@ public class ToBeMergedDialog extends DialogWrapper {
});
}
private void toggleInclusion(@NotNull CommittedChangeList list) {
private void toggleInclusion(@NotNull SvnChangeList list) {
long number = list.getNumber();
if (myWiseSelection.isSelected(number)) {
@@ -450,7 +440,7 @@ public class ToBeMergedDialog extends DialogWrapper {
private final long myStartNumber;
private final int myQuantity;
private List<CommittedChangeList> myLists;
private List<SvnChangeList> myLists;
private boolean myIsLastListLoaded;
public LoadChangeListsTask(long startNumber, int quantity) {
@@ -462,7 +452,7 @@ public class ToBeMergedDialog extends DialogWrapper {
@Override
public void run(@NotNull ProgressIndicator indicator) {
try {
Pair<List<CommittedChangeList>, Boolean> loadResult = loadChangeLists(myMergeContext, myStartNumber, getBunchSize(myQuantity));
Pair<List<SvnChangeList>, Boolean> loadResult = loadChangeLists(myMergeContext, myStartNumber, getBunchSize(myQuantity));
myLists = loadResult.first;
myIsLastListLoaded = loadResult.second;
@@ -558,10 +548,10 @@ public class ToBeMergedDialog extends DialogWrapper {
}
}
private static final ColumnInfo FAKE_COLUMN = new ColumnInfo<CommittedChangeList, CommittedChangeList>("fake column") {
private static final ColumnInfo FAKE_COLUMN = new ColumnInfo<SvnChangeList, SvnChangeList>("fake column") {
@Override
public CommittedChangeList valueOf(CommittedChangeList committedChangeList) {
return committedChangeList;
public SvnChangeList valueOf(SvnChangeList changeList) {
return changeList;
}
};
}
plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java
+4 -4
View File
@@ -17,10 +17,10 @@ package org.jetbrains.idea.svn;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.VcsException;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.util.Function;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn.history.SvnChangeList;
import org.jetbrains.idea.svn.integrate.LocalChangesAction;
import org.jetbrains.idea.svn.integrate.QuickMergeContentsVariants;
import org.jetbrains.idea.svn.integrate.QuickMergeInteraction;
@@ -37,10 +37,10 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction {
private QuickMergeContentsVariants myMergeVariant = QuickMergeContentsVariants.all;
private final boolean myReintegrateAnswer;
@Nullable private final Function.Mono<List<CommittedChangeList>> mySelectedListsProvider;
@Nullable private final Function.Mono<List<SvnChangeList>> mySelectedListsProvider;
@NotNull private final List<Exception> myExceptions;
public QuickMergeTestInteraction(boolean reintegrate, @Nullable Function.Mono<List<CommittedChangeList>> selectedListsProvider) {
public QuickMergeTestInteraction(boolean reintegrate, @Nullable Function.Mono<List<SvnChangeList>> selectedListsProvider) {
myReintegrateAnswer = reintegrate;
mySelectedListsProvider = selectedListsProvider;
myExceptions = newArrayList();
@@ -68,7 +68,7 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction {
@NotNull
@Override
public SelectMergeItemsResult selectMergeItems(@NotNull List<CommittedChangeList> lists,
public SelectMergeItemsResult selectMergeItems(@NotNull List<SvnChangeList> lists,
@NotNull MergeChecker mergeChecker,
boolean allStatusesCalculated,
boolean allListsLoaded) {