From aafb48929f3cc8b3aeaf97f0cf2bbedb966d2bab Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <ampivovarov@gmail.com>
Date: Wed, 23 Nov 2016 16:16:42 +0300
Subject: [PATCH] vcs: cleanup - move check into util method

---
 .../changes/ui/CommitChangeListDialog.java    | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index 5db60aecd4a2..3b2501c90e32 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -643,7 +643,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     saveComments(true);
     final DefaultListCleaner defaultListCleaner = new DefaultListCleaner();
 
-    final Runnable callCommit = new Runnable() {
+    ensureDataIsActual(new Runnable() {
       @Override
       public void run() {
         try {
@@ -663,12 +663,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
           ex.show();
         }
       }
-    };
-    if (myBrowser.isDataIsDirty()) {
-      ensureDataIsActual(callCommit);
-    } else {
-      callCommit.run();
-    }
+    });
   }
 
   private boolean addUnversionedFiles() {
@@ -1179,8 +1174,13 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
   }
 
   private void ensureDataIsActual(final Runnable runnable) {
-    ChangeListManager.getInstance(myProject).invokeAfterUpdate(runnable, InvokeAfterUpdateMode.SYNCHRONOUS_CANCELLABLE,
-                                                               "Refreshing changelists...", ModalityState.current());
+    if (myBrowser.isDataIsDirty()) {
+      ChangeListManager.getInstance(myProject).invokeAfterUpdate(runnable, InvokeAfterUpdateMode.SYNCHRONOUS_CANCELLABLE,
+                                                                 "Refreshing changelists...", ModalityState.current());
+    }
+    else {
+      runnable.run();
+    }
   }
 
   private class CommitExecutorAction extends AbstractAction {
@@ -1193,17 +1193,12 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
 
     @Override
     public void actionPerformed(ActionEvent e) {
-      final Runnable callExecutor = new Runnable() {
+      ensureDataIsActual(new Runnable() {
         @Override
         public void run() {
           execute(myCommitExecutor);
         }
-      };
-      if (myBrowser.isDataIsDirty()) {
-        ensureDataIsActual(callExecutor);
-      } else {
-        callExecutor.run();
-      }
+      });
     }
 
     public void updateEnabled(boolean hasDiffs) {