support modified without checkout files in p4 offline mode (IDEA-79770, IDEA-79771)
authorpeter <peter@jetbrains.com>
Wed, 25 Jan 2012 15:59:01 +0000 (16:59 +0100)
committerpeter <peter@jetbrains.com>
Wed, 25 Jan 2012 18:41:22 +0000 (19:41 +0100)
platform/vcs-api/src/com/intellij/openapi/vcs/changes/ChangeListManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java

index e225103eeb17354236855d1e7b28fde6baa49231..e12b0b8aa9e2801f8eb27dc0f10bcdef259e7397 100644 (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();
+
 }
index 253e56e2d505f60fb03930e9228bfa33d4ca2f44..fc56d4c1803e8eacd988fc9286162ff8a03454a8 100644 (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();
     }