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

support modified without checkout files in p4 offline mode (IDEA-79770, IDEA-79771)

Browse Source
This commit is contained in:
peter
2012-01-25 19:41:22 +01:00
parent 0aaa081bc5
commit 5c8bb8f28d
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java
+5 -10
View File
@@ -120,18 +120,9 @@ public abstract class ChangeListManager implements ChangeListModification {
public abstract void commitChanges(LocalChangeList changeList, List<Change> changes);
/**
*
* @param changeList
* @param changes
* @return if commit successful
*/
public abstract void commitChangesSynchronously(LocalChangeList changeList, List<Change> changes);
/**
*
* @param changeList
* @param changes
* @return if commit successful
*/
public abstract boolean commitChangesSynchronouslyWithResult(LocalChangeList changeList, List<Change> changes);
@@ -155,9 +146,13 @@ public abstract class ChangeListManager implements ChangeListModification {
public static boolean isFileChanged(final Project project, final VirtualFile vf) {
FileStatus status = getInstance(project).getStatus(vf);
if (status == null || FileStatus.NOT_CHANGED.equals(status) || FileStatus.UNKNOWN.equals(status) || FileStatus.IGNORED.equals(status)) {
if (FileStatus.NOT_CHANGED.equals(status) || FileStatus.UNKNOWN.equals(status) || FileStatus.IGNORED.equals(status)) {
return false;
}
return true;
}
public abstract List<VirtualFile> getModifiedWithoutEditing();
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+2 -1
View File
@@ -683,7 +683,8 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
}
}
List<VirtualFile> getModifiedWithoutEditing() {
@Override
public List<VirtualFile> getModifiedWithoutEditing() {
synchronized (myDataLock) {
return myComposite.getVFHolder(FileHolder.HolderType.MODIFIED_WITHOUT_EDITING).getFiles();
}