Cleanup (annotations; formatting)

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/RefreshAction.java b/platform/platform-impl/src/com/intellij/ide/actions/RefreshAction.java
index 430966ffcf2a3a779088428227dccb9337e2dbf6..1c0678827dae1cd4e46eb4e99ea608736b1a912c 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/actions/RefreshAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/RefreshAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,8 +26,7 @@ import javax.swing.*;
  * provides a convenience method to register its shortcut on a component
  */
 public class RefreshAction extends AnAction implements DumbAware {
-  public RefreshAction() {
-  }
+  public RefreshAction() { }
 
   public RefreshAction(String text) {
     super(text);

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/SynchronizeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/SynchronizeAction.java
index 262d3ff3880c763f26395063378a5028d5f74831..942d78a81e612f62938edf0c390fb51cdf95a9c3 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/actions/SynchronizeAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/SynchronizeAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.vfs.VirtualFileManager;
 
 public class SynchronizeAction extends AnAction implements DumbAware {
+  @Override
   public void actionPerformed(AnActionEvent e) {
     FileDocumentManager.getInstance().saveAllDocuments();
 

diff --git a/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java b/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java
index 21fd7c88f5b67430df881c327a73c9f9e9c53bf5..146c795b982f05bd2f93cb820314a0fd4fc8b24a 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java
+++ b/platform/vcs-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,7 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.application.AccessToken;
-import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
@@ -34,6 +33,7 @@ import com.intellij.openapi.wm.WindowManager;
 import org.jetbrains.annotations.Nullable;
 
 public class SynchronizeCurrentFileAction extends AnAction implements DumbAware {
+  @Override
   public void update(AnActionEvent e) {
     VirtualFile[] files = getFiles(e);
 
@@ -52,46 +52,47 @@ public class SynchronizeCurrentFileAction extends AnAction implements DumbAware
                              : IdeBundle.message("action.synchronize.selected.files");
   }
 
+  @Override
   public void actionPerformed(AnActionEvent e) {
     final Project project = getEventProject(e);
     final VirtualFile[] files = getFiles(e);
     if (project == null || files == null || files.length == 0) return;
 
-    final AccessToken token = WriteAction.start(getClass());
-    try {
-      for (VirtualFile file : files) {
-        final VirtualFileSystem fs = file.getFileSystem();
-        if (fs instanceof LocalFileSystem && file instanceof NewVirtualFile) {
-          ((NewVirtualFile)file).markDirtyRecursively();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        for (VirtualFile file : files) {
+          VirtualFileSystem fs = file.getFileSystem();
+          if (fs instanceof LocalFileSystem && file instanceof NewVirtualFile) {
+            ((NewVirtualFile)file).markDirtyRecursively();
+          }
         }
       }
-    }
-    finally {
-      token.finish();
-    }
+    });
 
-    final Runnable postRefreshAction = new Runnable() {
+    RefreshQueue.getInstance().refresh(true, true, new Runnable() {
       @Override
       public void run() {
-        final VcsDirtyScopeManager dirtyScopeManager = VcsDirtyScopeManager.getInstance(project);
-        for (VirtualFile f : files) {
-          if (f.isDirectory()) {
-            dirtyScopeManager.dirDirtyRecursively(f);
-          }
-          else {
-            dirtyScopeManager.fileDirty(f);
-          }
-        }
+        postRefresh(project, files);
+      }
+    }, files);
+  }
 
-        final StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
-        if (statusBar != null) {
-          final String message = IdeBundle.message("action.sync.completed.successfully", getMessage(files));
-          statusBar.setInfo(message);
-        }
+  private static void postRefresh(Project project, VirtualFile[] files) {
+    VcsDirtyScopeManager dirtyScopeManager = VcsDirtyScopeManager.getInstance(project);
+    for (VirtualFile f : files) {
+      if (f.isDirectory()) {
+        dirtyScopeManager.dirDirtyRecursively(f);
       }
-    };
+      else {
+        dirtyScopeManager.fileDirty(f);
+      }
+    }
 
-    RefreshQueue.getInstance().refresh(true, true, postRefreshAction, files);
+    StatusBar statusBar = WindowManager.getInstance().getStatusBar(project);
+    if (statusBar != null) {
+      statusBar.setInfo(IdeBundle.message("action.sync.completed.successfully", getMessage(files)));
+    }
   }
 
   @Nullable