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

Move utility method from the API

Browse Source 
It is used only in the ShelveChangesManager, no external usages.
This commit is contained in:
Kirill Likhodedov
2016-10-30 14:08:26 +03:00
parent 8eb6907cb3
commit 38de4b523a
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
-2
View File
@@ -282,8 +282,6 @@ public abstract class ProjectLevelVcsManager {
public abstract boolean isFileInContent(final VirtualFile vf);
public abstract boolean isIgnored(VirtualFile vf);
public abstract boolean dvcsUsedInProject();
@NotNull
public abstract VcsAnnotationLocalChangesListener getAnnotationLocalChangesListener();
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
+11 -1
View File
@@ -360,7 +360,7 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
private void baseRevisionsOfDvcsIntoContext(List<Change> textChanges, CommitContext commitContext) {
ProjectLevelVcsManager vcsManager = ProjectLevelVcsManager.getInstance(myProject);
if (vcsManager.dvcsUsedInProject() && VcsConfiguration.getInstance(myProject).INCLUDE_TEXT_INTO_SHELF) {
if (dvcsUsedInProject() && VcsConfiguration.getInstance(myProject).INCLUDE_TEXT_INTO_SHELF) {
final Set<Change> big = SelectFilesToAddTextsToPatchPanel.getBig(textChanges);
final ArrayList<FilePath> toKeep = new ArrayList<>();
for (Change change : textChanges) {
@@ -377,6 +377,16 @@ public class ShelveChangesManager extends AbstractProjectComponent implements JD
}
}
private boolean dvcsUsedInProject() {
AbstractVcs[] allActiveVcss = ProjectLevelVcsManager.getInstance(myProject).getAllActiveVcss();
for (AbstractVcs activeVcs : allActiveVcss) {
if (VcsType.distributed.equals(activeVcs.getType())) {
return true;
}
}
return false;
}
public ShelvedChangeList importFilePatches(final String fileName, final List<FilePatch> patches, final PatchEP[] patchTransitExtensions)
throws IOException {
try {
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
-11
View File
@@ -874,17 +874,6 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
}
}
@Override
public boolean dvcsUsedInProject() {
AbstractVcs[] allActiveVcss = getAllActiveVcss();
for (AbstractVcs activeVcs : allActiveVcss) {
if (VcsType.distributed.equals(activeVcs.getType())) {
return true;
}
}
return false;
}
private boolean isInDirectoryBasedRoot(@Nullable VirtualFile file) {
if (file != null && ProjectKt.isDirectoryBased(myProject)) {
return ProjectKt.getStateStore(myProject).isProjectFile(file);