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

[file-history] inline collectChanges method

Browse Source
This commit is contained in:
Julia Beliaeva
2018-09-10 23:18:23 +03:00
parent 90215c574e
commit 4e58597a71
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryPanel.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class FileHistoryPanel extends JPanel implements DataProvider, Disposable
if (VcsDataKeys.CHANGES.is(dataId) || VcsDataKeys.SELECTED_CHANGES.is(dataId)) {
List<VcsFullCommitDetails> details = myUi.getVcsLog().getSelectedDetails();
if (details.isEmpty() || details.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return null;
return ArrayUtil.toObjectArray(myUi.collectChanges(details, true), Change.class);
return ArrayUtil.toObjectArray(VcsLogUtil.collectChanges(details, detail -> myUi.collectRelevantChanges(detail)), Change.class);
}
else if (VcsLogInternalDataKeys.LOG_UI_PROPERTIES.is(dataId)) {
return myUi.getProperties();
platform/vcs-log/impl/src/com/intellij/vcs/log/history/FileHistoryUi.java
-6
View File
@@ -43,7 +43,6 @@ import com.intellij.vcs.log.ui.highlighters.MyCommitsHighlighter;
import com.intellij.vcs.log.ui.highlighters.VcsLogHighlighterFactory;
import com.intellij.vcs.log.ui.table.GraphTableModel;
import com.intellij.vcs.log.ui.table.VcsLogGraphTable;
import com.intellij.vcs.log.util.VcsLogUtil;
import com.intellij.vcs.log.visible.VisiblePack;
import com.intellij.vcs.log.visible.VisiblePackRefresher;
import com.intellij.vcsUtil.VcsUtil;
@@ -163,11 +162,6 @@ public class FileHistoryUi extends AbstractVcsLogUi {
return names;
}
@NotNull
public List<Change> collectChanges(@NotNull List<VcsFullCommitDetails> detailsList, boolean onlyRelevant) {
return VcsLogUtil.collectChanges(detailsList, details -> onlyRelevant ? collectRelevantChanges(details) : details.getChanges());
}
@Override
protected <T> void handleCommitNotFound(@NotNull T commitId,
boolean commitExists,
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CreatePatchFromHistoryActionProvider.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.VcsDataKeys;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction;
import com.intellij.vcs.log.CommitId;
import com.intellij.vcs.log.VcsFullCommitDetails;
import com.intellij.vcs.log.history.FileHistoryUi;
import com.intellij.vcs.log.ui.VcsLogInternalDataKeys;
import com.intellij.vcs.log.util.VcsLogUtil;
@@ -78,7 +79,7 @@ public class CreatePatchFromHistoryActionProvider implements AnActionExtensionPr
String commitMessage = e.getRequiredData(VcsDataKeys.PRESET_COMMIT_MESSAGE);
ui.getVcsLog().requestSelectedDetails(detailsList -> {
List<Change> changes = ui.collectChanges(detailsList, false);
List<Change> changes = VcsLogUtil.collectChanges(detailsList, VcsFullCommitDetails::getChanges);
CreatePatchFromChangesAction.createPatch(project, commitMessage, changes, mySilentClipboard);
});
}