diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java index ce61246cf7f6..a0fb41c9f7c3 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java @@ -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 lists, @NotNull String title) { + protected void runChangeListsMerge(@NotNull List lists, @NotNull String title) { next(new LocalChangesPromptTask(myMergeProcess, lists), new MergeTask(myMergeProcess, new ChangeListsMergerFactory(lists, false, false, true), title)); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ChangeListsMergerFactory.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ChangeListsMergerFactory.java index cec49b062abb..f97811055e9d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ChangeListsMergerFactory.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ChangeListsMergerFactory.java @@ -32,7 +32,7 @@ public class ChangeListsMergerFactory implements MergerFactory { private final boolean myInvertRange; private final boolean myGroupSequentialChangeLists; - public ChangeListsMergerFactory(@NotNull List changeLists, + public ChangeListsMergerFactory(@NotNull List changeLists, boolean recordOnly, boolean invertRange, boolean groupSequentialChangeLists) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LoadRecentBranchRevisions.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LoadRecentBranchRevisions.java index 5b60c001e624..843ab3982ccd 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LoadRecentBranchRevisions.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LoadRecentBranchRevisions.java @@ -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 myCallback; @NotNull private final OneShotMergeInfoHelper myMergeChecker; - @NotNull private final List myCommittedChangeLists; + @NotNull private final List myCommittedChangeLists; public LoadRecentBranchRevisions(@NotNull QuickMerge mergeProcess, @NotNull Consumer 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, Boolean> loadResult = loadChangeLists(myMergeContext, -1, getBunchSize(-1)); + Pair, 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, Boolean> loadChangeLists(@NotNull MergeContext mergeContext, long beforeRevision, int size) + public static Pair, Boolean> loadChangeLists(@NotNull MergeContext mergeContext, long beforeRevision, int size) throws VcsException { - List changeLists = - getNotMergedChangeLists(getChangeListsBefore(mergeContext, beforeRevision, size), beforeRevision); + List 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 getNotMergedChangeLists(@NotNull List> changeLists, - long revision) { - List result = newArrayList(); + private static List getNotMergedChangeLists(@NotNull List> changeLists, + long revision) { + List result = newArrayList(); for (Pair pair : changeLists) { // do not take first since it's equal @@ -137,7 +135,7 @@ public class LoadRecentBranchRevisions extends BaseMergeTask { } @NotNull - public List getChangeLists() { + public List getChangeLists() { return myCommittedChangeLists; } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LocalChangesPromptTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LocalChangesPromptTask.java index 88d1c22d07c8..462e8d95a834 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LocalChangesPromptTask.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/LocalChangesPromptTask.java @@ -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 myChangeListsToMerge; + @Nullable private final List myChangeListsToMerge; public LocalChangesPromptTask(@NotNull QuickMerge mergeProcess) { super(mergeProcess, "local changes intersection check", Where.AWT); myChangeListsToMerge = null; } - public LocalChangesPromptTask(@NotNull QuickMerge mergeProcess, @NotNull List changeListsToMerge) { + public LocalChangesPromptTask(@NotNull QuickMerge mergeProcess, @NotNull List 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 localChangeLists, - @NotNull List changeListsToMerge) { + @NotNull List changeListsToMerge) { Set pathsToMerge = collectPaths(changeListsToMerge); @@ -104,9 +103,8 @@ public class LocalChangesPromptTask extends BaseMergeTask { } @NotNull - private Set collectPaths(@NotNull List lists) { + private Set collectPaths(@NotNull List lists) { return lists.stream() - .map(SvnChangeList.class::cast) .flatMap(list -> list.getAffectedPaths().stream()) .map(this::getLocalPath) .filter(Objects::nonNull) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java index 9783c7143f2b..fa45d72892c0 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeCalculatorTask.java @@ -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 myNotMergedChangeLists; + @NotNull private final List myNotMergedChangeLists; @NotNull private final Consumer myCallback; public MergeCalculatorTask(@NotNull QuickMerge mergeProcess, @@ -62,7 +61,7 @@ public class MergeCalculatorTask extends BaseMergeTask { } @NotNull - public List getChangeLists() { + public List getChangeLists() { return myNotMergedChangeLists; } @@ -106,8 +105,8 @@ public class MergeCalculatorTask extends BaseMergeTask { } @NotNull - private List getNotMergedChangeLists(@NotNull List> changeLists) { - List result = newArrayList(); + private List getNotMergedChangeLists(@NotNull List> changeLists) { + List result = newArrayList(); ProgressManager.getInstance().getProgressIndicator().setText("Checking merge information..."); for (Pair pair : changeLists) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java index 10466365900a..46a49d02e350 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java @@ -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 lists, + SelectMergeItemsResult selectMergeItems(@NotNull List lists, @NotNull MergeChecker mergeChecker, boolean allStatusesCalculated, boolean allListsLoaded); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java index 4a55657054ed..84d3f245c2ff 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteractionImpl.java @@ -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 lists, + public SelectMergeItemsResult selectMergeItems(@NotNull List 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 selectedLists = resultCode == QuickMergeContentsVariants.select ? dialog.getSelected() : emptyList(); + List selectedLists = resultCode == QuickMergeContentsVariants.select ? dialog.getSelected() : emptyList(); return new SelectMergeItemsResult(resultCode, selectedLists); } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectMergeItemsResult.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectMergeItemsResult.java index af0448734dfa..e27ab9f35d4c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectMergeItemsResult.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SelectMergeItemsResult.java @@ -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 myLists; + @NotNull private final List myLists; - public SelectMergeItemsResult(@NotNull QuickMergeContentsVariants resultCode, @NotNull List lists) { + public SelectMergeItemsResult(@NotNull QuickMergeContentsVariants resultCode, @NotNull List lists) { myResultCode = resultCode; myLists = lists; } @@ -35,7 +35,7 @@ public class SelectMergeItemsResult { } @NotNull - public List getSelectedLists() { + public List getSelectedLists() { return myLists; } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java index 78eb85669a00..5d99f4871dc8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ShowRevisionSelector.java @@ -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 myChangeLists; + @NotNull private final List myChangeLists; @NotNull private final MergeChecker myMergeChecker; private final boolean myAllStatusesCalculated; private final boolean myAllListsLoaded; public ShowRevisionSelector(@NotNull QuickMerge mergeProcess, - @NotNull List changeLists, + @NotNull List changeLists, @NotNull MergeChecker mergeChecker, boolean allStatusesCalculated, boolean allListsLoaded) { @@ -55,7 +55,7 @@ public class ShowRevisionSelector extends BaseMergeTask { next(getMergeAllTasks(true)); break; default: - List lists = result.getSelectedLists(); + List lists = result.getSelectedLists(); if (!lists.isEmpty()) { runChangeListsMerge(lists, myMergeContext.getTitle()); 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 53c0768a90a9..cee31264a5eb 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ToBeMergedDialog.java @@ -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 myRevisionsModel; - private TableView myRevisionsList; + @NotNull private final ListTableModel myRevisionsModel; + private TableView 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 changeLists, + @NotNull List 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 changeLists) { + public void addMoreLists(@NotNull List 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 changeLists) { + private void refreshListStatus(@NotNull final List 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 getSelected() { + public List getSelected() { Set selected = myWiseSelection.getSelected(); Set unselected = myWiseSelection.getUnselected(); // todo: can be made faster - Condition filter = + Condition 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 changeLists = myRevisionsList.getSelectedObjects(); - myRepositoryChangesBrowser.setChangesToDisplay(emptyList()); + List changeLists = myRevisionsList.getSelectedObjects(); + myAlreadyMerged.clear(); - if (!changeLists.isEmpty()) { - List 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() { + myRevisionsList = new TableView() { @Override public TableCellRenderer getCellRenderer(int row, int column) { return listCellRenderer; @@ -268,9 +262,9 @@ public class ToBeMergedDialog extends DialogWrapper { } }; myRevisionsList.setExpandableItemsEnabled(false); - new TableViewSpeedSearch(myRevisionsList) { + new TableViewSpeedSearch(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.emptyList(), emptyList(), null); + new RepositoryChangesBrowser(myMergeContext.getProject(), Collections.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 selected = myRevisionsList.getSelectedObjects(); + List 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 myLists; + private List 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, Boolean> loadResult = loadChangeLists(myMergeContext, myStartNumber, getBunchSize(myQuantity)); + Pair, 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("fake column") { + private static final ColumnInfo FAKE_COLUMN = new ColumnInfo("fake column") { @Override - public CommittedChangeList valueOf(CommittedChangeList committedChangeList) { - return committedChangeList; + public SvnChangeList valueOf(SvnChangeList changeList) { + return changeList; } }; } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java index 70f72508301a..12c1369daefb 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/QuickMergeTestInteraction.java @@ -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> mySelectedListsProvider; + @Nullable private final Function.Mono> mySelectedListsProvider; @NotNull private final List myExceptions; - public QuickMergeTestInteraction(boolean reintegrate, @Nullable Function.Mono> selectedListsProvider) { + public QuickMergeTestInteraction(boolean reintegrate, @Nullable Function.Mono> selectedListsProvider) { myReintegrateAnswer = reintegrate; mySelectedListsProvider = selectedListsProvider; myExceptions = newArrayList(); @@ -68,7 +68,7 @@ public class QuickMergeTestInteraction implements QuickMergeInteraction { @NotNull @Override - public SelectMergeItemsResult selectMergeItems(@NotNull List lists, + public SelectMergeItemsResult selectMergeItems(@NotNull List lists, @NotNull MergeChecker mergeChecker, boolean allStatusesCalculated, boolean allListsLoaded) {