Renamed ChangesViewBalloonProblemNotifier -> VcsBalloonProblemNotifier to support...
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 15 Sep 2010 11:50:30 +0000 (15:50 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 15 Sep 2010 11:50:30 +0000 (15:50 +0400)
17 files changed:
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ui/VcsBalloonProblemNotifier.java [moved from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewBalloonProblemNotifier.java with 90% similarity]
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ToggleOfflineAction.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsInfo.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorkerImpl.java
plugins/git4idea/src/git4idea/history/browser/CherryPicker.java
plugins/git4idea/src/git4idea/history/browser/GitTreeController.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationManager.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnAuthenticationNotifier.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnCompatibilityChecker.java
plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/NewRootBunch.java
plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java

index b6176b88909fbab3cb0a3ca416d708966df7c237..9c82f6e9988d4623de401fe09fdd56cffad54871 100644 (file)
@@ -49,13 +49,13 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.actions.ShowDiffAction;
 import com.intellij.openapi.vcs.changes.actions.ShowDiffUIContext;
 import com.intellij.openapi.vcs.changes.ui.ChangesComparator;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vcs.impl.BackgroundableActionEnabledHandler;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
 import com.intellij.openapi.vcs.impl.UpToDateLineNumberProviderImpl;
 import com.intellij.openapi.vcs.impl.VcsBackgroundableActions;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
@@ -537,7 +537,7 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware {
               targetPath[0] = pair.getSecond() == null ? new FilePathImpl(myFile) : pair.getSecond();
               final CommittedChangeList cl = pair.getFirst();
               if (cl == null) {
-                ChangesViewBalloonProblemNotifier.showMe(myVcs.getProject(), "Can not load data for show diff", MessageType.ERROR);
+                VcsBalloonProblemNotifier.showMe(myVcs.getProject(), "Can not load data for show diff", MessageType.ERROR);
                 return;
               }
               changes.addAll(cl.getChanges());
@@ -551,7 +551,7 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware {
           @Override
           public void onSuccess() {
             if (exc[0] != null) {
-              ChangesViewBalloonProblemNotifier.showMe(myVcs.getProject(), "Can not show diff: " + exc[0].getMessage(), MessageType.ERROR);
+              VcsBalloonProblemNotifier.showMe(myVcs.getProject(), "Can not show diff: " + exc[0].getMessage(), MessageType.ERROR);
             } else if (! changes.isEmpty()) {
               int idx = findSelfInList(changes, targetPath[0]);
               final ShowDiffUIContext context = new ShowDiffUIContext(true);
index cd198408e961a2ad2f0e1e8f8377e602c1e72faa..95c8807420a7719bd567dee8ab68f2c3cccab38e 100644 (file)
@@ -34,7 +34,7 @@ import com.intellij.openapi.vcs.changes.patch.ApplyPatchForBaseRevisionTexts;
 import com.intellij.openapi.vcs.changes.patch.MergedDiffRequestPresentable;
 import com.intellij.openapi.vcs.changes.patch.PatchMergeRequestFactory;
 import com.intellij.openapi.vcs.changes.ui.ChangesComparator;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -116,7 +116,7 @@ public class DiffShelvedChangesAction extends AnAction implements DumbAware {
     }
     if (! missing.isEmpty()) {
       // 7-8
-      ChangesViewBalloonProblemNotifier.showMe(project, "Show Diff: Cannot find base for: " + StringUtil.join(missing, ",\n"), MessageType.WARNING);
+      VcsBalloonProblemNotifier.showMe(project, "Show Diff: Cannot find base for: " + StringUtil.join(missing, ",\n"), MessageType.WARNING);
     }
 
     ShowDiffAction.showDiffImpl(project, diffRequestPresentables, toSelectIdx, new ShowDiffUIContext(false));
index 326441cc2bce8fca21cce4424ced3f114235f5e9..f0d3d7d9609e7bbb1fee7a289e8b07392c797268 100644 (file)
@@ -460,7 +460,7 @@ public class CommitHelper {
           } else {
             message = VcsBundle.message("message.text.commit.finished.with.warnings");
           }
-          //new ChangesViewBalloonProblemNotifier(myProject, message, MessageType.ERROR).run();
+          //new VcsBalloonProblemNotifier(myProject, message, MessageType.ERROR).run();
           Messages.showErrorDialog(message, VcsBundle.message("message.title.commit"));
 
           if (errorsSize > 0) {
index 1a5fd6dc375377848956088a207493e7ecc50d25..68149a55dfd49b08b60e6fc0efbb390bdde33280 100644 (file)
@@ -55,6 +55,7 @@ import com.intellij.openapi.vcs.ex.ProjectLevelVcsManagerEx;
 import com.intellij.openapi.vcs.history.*;
 import com.intellij.openapi.vcs.merge.MergeProvider;
 import com.intellij.openapi.vcs.merge.MultipleFileMergeDialog;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
 import com.intellij.openapi.vcs.versionBrowser.ChangesBrowserSettingsEditor;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
@@ -187,7 +188,7 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper {
     }
 
     public void reportException(VcsException exception) {
-      ChangesViewBalloonProblemNotifier.showMe(myVcs.getProject(), VcsBundle.message("message.title.could.not.load.file.history") + ": " +
+      VcsBalloonProblemNotifier.showMe(myVcs.getProject(), VcsBundle.message("message.title.could.not.load.file.history") + ": " +
                                                                    exception.getMessage(), MessageType.ERROR);
     }
 
index e6f0d7f3fbaa8d8172d333a96cc6a1846df28be0..82f3dcda0e014d1ae2d44ffa656909dee0cb4f54 100644 (file)
@@ -26,10 +26,10 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.*;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
 import com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy;
 import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
 import com.intellij.openapi.vcs.impl.VcsInitObject;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.EventDispatcher;
@@ -385,7 +385,7 @@ public class NewMappings {
       } else {
         final AbstractVcs vcs = allVcses.getByName(vcsName);
         if (vcs == null) {
-          ChangesViewBalloonProblemNotifier.showMe(myProject, "VCS plugin not found for mapping to : '" + vcsName + "'", MessageType.ERROR);
+          VcsBalloonProblemNotifier.showMe(myProject, "VCS plugin not found for mapping to : '" + vcsName + "'", MessageType.ERROR);
           continue;
         }
         filteredFiles = vcs.filterUniqueRoots(objects, fileConvertor);
similarity index 90%
rename from platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewBalloonProblemNotifier.java
rename to platform/vcs-impl/src/com/intellij/openapi/vcs/ui/VcsBalloonProblemNotifier.java
index 39163c316d292413750aba8b3f3722ff514cd014..e6af9fc093200a7f0d81668c55c67ff4d5b441a5 100644 (file)
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vcs.changes.ui;
+package com.intellij.openapi.vcs.ui;
 
 import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.vcs.changes.ui.ChangesViewContentManager;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.openapi.wm.WindowManager;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.ui.awt.RelativePoint;
 import org.jetbrains.annotations.NotNull;
 
@@ -33,12 +34,12 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
-public class ChangesViewBalloonProblemNotifier implements Runnable {
+public class VcsBalloonProblemNotifier implements Runnable {
   private final Project myProject;
   private final String myMessage;
   private final MessageType myMessageType;
 
-  public ChangesViewBalloonProblemNotifier(final Project project, final String message, final MessageType messageType) {
+  public VcsBalloonProblemNotifier(final Project project, final String message, final MessageType messageType) {
     myProject = project;
     myMessage = message;
     myMessageType = messageType;
@@ -49,7 +50,7 @@ public class ChangesViewBalloonProblemNotifier implements Runnable {
     if (application.isHeadlessEnvironment()) return;
     final Runnable showErrorAction = new Runnable() {
       public void run() {
-        new ChangesViewBalloonProblemNotifier(project, message, type).run();
+        new VcsBalloonProblemNotifier(project, message, type).run();
       }
     };
     if (application.isDispatchThread()) {
index 72b0982e772762334ade7289a4d01858da7d2b2d..defaab5fddadd6593a1f845a856df0cf79406eff 100644 (file)
@@ -22,6 +22,7 @@
  */
 package com.intellij.cvsSupport2.actions;
 
+import com.intellij.CvsBundle;
 import com.intellij.cvsSupport2.actions.cvsContext.CvsContext;
 import com.intellij.cvsSupport2.actions.cvsContext.CvsContextWrapper;
 import com.intellij.cvsSupport2.application.CvsEntriesManager;
@@ -29,9 +30,8 @@ import com.intellij.cvsSupport2.connections.CvsConnectionSettings;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.ui.MessageType;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.CvsBundle;
 
 public class ToggleOfflineAction extends ToggleAction {
   public boolean isSelected(AnActionEvent e) {
@@ -60,7 +60,7 @@ public class ToggleOfflineAction extends ToggleAction {
       settings = entriesManager.getCvsConnectionSettingsFor(firstDirInChain);
     }
     if ((settings != null) && settings.isValid() && (state != settings.isOffline())) {
-      ChangesViewBalloonProblemNotifier.showMe(cvsContext.getProject(),
+      VcsBalloonProblemNotifier.showMe(cvsContext.getProject(),
                                                state ? CvsBundle.message("set.offline.notification.text") :
                                                        CvsBundle.message("set.online.notification.text"),
                                                state ? MessageType.WARNING : MessageType.INFO);
index a1ea43c4d28e6130824399652d24f6762ae3b232..3ea5b8815cda1f48e92693a7dfcfebf8aaac74c2 100644 (file)
@@ -29,8 +29,8 @@ import com.intellij.cvsSupport2.javacvsImpl.io.ReadWriteStatistics;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
 import com.intellij.util.ThreeState;
 import org.jetbrains.annotations.Nullable;
 import org.netbeans.lib.cvsclient.admin.Entries;
@@ -295,7 +295,7 @@ public class CvsInfo {
         public ThreeState silentLogin(boolean forceCheck) {
           ApplicationManager.getApplication().invokeLater(new Runnable() {
             public void run() {
-              new ChangesViewBalloonProblemNotifier(project, CvsBundle.message("message.error.invalid.cvs.root", myStringRepsentation),
+              new VcsBalloonProblemNotifier(project, CvsBundle.message("message.error.invalid.cvs.root", myStringRepsentation),
                                                     MessageType.ERROR).run();
             }
           });
index 31fa69db381c6d66aec4ae18fad6d75c30709562..fb5a09a312d354351b474a6b6af4f2b121dec8ce 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.vcs.CalledInAwt;
 import com.intellij.openapi.vcs.CalledInBackground;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.util.ThreeState;
 import org.netbeans.lib.cvsclient.connection.AuthenticationException;
 
@@ -66,7 +66,7 @@ public abstract class CvsLoginWorkerImpl<T extends CvsConnectionSettings> implem
 
   public void goOffline() {
     mySettings.setOffline(true);
-    ChangesViewBalloonProblemNotifier.showMe(myProject, CvsBundle.message("set.offline.notification.text"), MessageType.WARNING);
+    VcsBalloonProblemNotifier.showMe(myProject, CvsBundle.message("set.offline.notification.text"), MessageType.WARNING);
   }
 
   private ThreeState reportException(final AuthenticationException e) {
@@ -95,6 +95,6 @@ public abstract class CvsLoginWorkerImpl<T extends CvsConnectionSettings> implem
   }
 
   public static void showConnectionErrorMessage(final Project project, final String message) {
-    ChangesViewBalloonProblemNotifier.showMe(project, message, MessageType.ERROR);
+    VcsBalloonProblemNotifier.showMe(project, message, MessageType.ERROR);
   }
 }
index 1ce04c3561009b69f4bb6d5ea69c80adf6a14e8c..d84f1838f2fd49c91b8c9d163245ae08c93b0b99 100644 (file)
@@ -23,8 +23,8 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.ObjectsConvertor;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.*;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
 import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.newvfs.RefreshSessionImpl;
 import com.intellij.util.Consumer;
@@ -95,10 +95,10 @@ public class CherryPicker {
 
   private void showResults() {
     if (myExceptions.isEmpty()) {
-      ChangesViewBalloonProblemNotifier
+      VcsBalloonProblemNotifier
         .showMe(myVcs.getProject(), "Successful cherry-pick into working tree, please commit changes", MessageType.INFO);
     } else {
-      ChangesViewBalloonProblemNotifier.showMe(myVcs.getProject(), "Errors in cherry-pick", MessageType.ERROR);
+      VcsBalloonProblemNotifier.showMe(myVcs.getProject(), "Errors in cherry-pick", MessageType.ERROR);
     }
     if ((! myExceptions.isEmpty()) || (! myWarnings.isEmpty())) {
       myExceptions.addAll(myWarnings);
index d4bffd5641154381b81cb191ac2fba49f03c66ab..38b6d06915708139c5ad116ca7ed68e7e1d0ede5 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.openapi.vcs.CalledInBackground;
 import com.intellij.openapi.vcs.RequestsMerger;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeListImpl;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -373,7 +373,7 @@ class GitTreeController implements ManageGitTreeView {
       hash = GitChangeUtils.commitExistsByComment(myProject, myRoot, reference);
     }
     if (hash == null) {
-      ChangesViewBalloonProblemNotifier.showMe(myProject, "Nothing found for: \"" + reference + "\"", MessageType.WARNING);
+      VcsBalloonProblemNotifier.showMe(myProject, "Nothing found for: \"" + reference + "\"", MessageType.WARNING);
     } else {
       final SHAHash finalHash = hash;
       myAlarm.addRequest(new Runnable() {
index 24ef8845f92a178dd0dce609d59c41ea8b15d569..40dee32bd1747698ad37f64d746270f7f7a5a2a6 100644 (file)
@@ -28,7 +28,7 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.CalledInAwt;
 import com.intellij.openapi.vcs.changes.committed.AbstractCalledLater;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.util.Consumer;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.net.HttpConfigurable;
@@ -178,7 +178,7 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im
           }
           catch (SVNException e) {
             if (myProject != null) {
-              ApplicationManager.getApplication().invokeLater(new ChangesViewBalloonProblemNotifier(myProject,
+              ApplicationManager.getApplication().invokeLater(new VcsBalloonProblemNotifier(myProject,
                                                                                                     "<b>Problem when storing Subversion credentials:</b>&nbsp;" +
                                                                                                     e.getMessage(), MessageType.ERROR));
             }
@@ -583,17 +583,17 @@ public class SvnAuthenticationManager extends DefaultSVNAuthenticationManager im
 
     @Override
     public void warnOnAuthStorageDisabled(SVNURL url) {
-      ChangesViewBalloonProblemNotifier.showMe(myProject, "Cannot store credentials: forbidden by \"store-auth-creds=no\"", MessageType.ERROR);
+      VcsBalloonProblemNotifier.showMe(myProject, "Cannot store credentials: forbidden by \"store-auth-creds=no\"", MessageType.ERROR);
     }
 
     @Override
     public void warnOnPasswordStorageDisabled(SVNURL url) {
-      ChangesViewBalloonProblemNotifier.showMe(myProject, "Cannot store password: forbidden by \"store-passwords=no\"", MessageType.ERROR);
+      VcsBalloonProblemNotifier.showMe(myProject, "Cannot store password: forbidden by \"store-passwords=no\"", MessageType.ERROR);
     }
 
     @Override
     public void warnOnSSLPassphraseStorageDisabled(SVNURL url) {
-      ChangesViewBalloonProblemNotifier.showMe(myProject, "Cannot store passphrase: forbidden by \"store-ssl-client-cert-pp=no\"", MessageType.ERROR);
+      VcsBalloonProblemNotifier.showMe(myProject, "Cannot store passphrase: forbidden by \"store-ssl-client-cert-pp=no\"", MessageType.ERROR);
     }
 
     @Override
index f1d75543c03c94033a782592a2bacdabcc817baa..c2bf256f4bffcb8fa1cfd83050377cdd82f2db0c 100644 (file)
@@ -126,7 +126,7 @@ public class SvnAuthenticationNotifier extends GenericNotifierImpl<SvnAuthentica
   public void ensureNotify(AuthenticationRequest obj) {
     final SVNURL key = getKey(obj);
     myCopiesPassiveResults.remove(key);
-    /*ChangesViewBalloonProblemNotifier.showMe(myVcs.getProject(), "You are not authenticated to '" + obj.getRealm() + "'." +
+    /*VcsBalloonProblemNotifier.showMe(myVcs.getProject(), "You are not authenticated to '" + obj.getRealm() + "'." +
       "To login, see pending notifications.", MessageType.ERROR);*/
     super.ensureNotify(obj);
   }
index 509a3b71914ae05a284130f2e7d04a8ca54d10c2..1c9017dd78c1898147515176eb8c5e565a17a9b5 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import java.util.ArrayList;
@@ -68,7 +68,7 @@ public class SvnCompatibilityChecker {
                                      "Some roots are likely to be of unsupported Subversion format";
               application.invokeLater(new Runnable() {
                 public void run() {
-                  new ChangesViewBalloonProblemNotifier(myProject, message, MessageType.WARNING).run();
+                  new VcsBalloonProblemNotifier(myProject, message, MessageType.WARNING).run();
                 }
               }, ModalityState.NON_MODAL);
             }
index a931ab8d8b919cf3d09575103129626259883f38..43eeea4548631bb25cf9aa87b47a651a3ebd3900 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vcs.CalledInBackground;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.PairConsumer;
@@ -166,7 +166,7 @@ public class NewRootBunch implements SvnBranchConfigManager {
       catch (SVNException e) {
         // already logged inside
         if (InfoReliability.setByUser.equals(myInfoReliability)) {
-          ChangesViewBalloonProblemNotifier.showMe(myProject, "Branches load error: " + e.getMessage(), MessageType.ERROR);
+          VcsBalloonProblemNotifier.showMe(myProject, "Branches load error: " + e.getMessage(), MessageType.ERROR);
         }
       } finally {
         // callback must be called by contract
index c3c7e3b613803a5dc8554babcf3f541d664c2b52..b7c2a37877ee297c86c8cfb589015374cdc5a4c1 100644 (file)
@@ -31,10 +31,10 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeList;
 import com.intellij.openapi.vcs.changes.ChangesUtil;
 import com.intellij.openapi.vcs.changes.ContentRevision;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
 import com.intellij.openapi.vcs.checkin.CheckinEnvironment;
 import com.intellij.openapi.vcs.ui.Refreshable;
 import com.intellij.openapi.vcs.ui.RefreshableOnComponent;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.NullableFunction;
@@ -208,7 +208,7 @@ public class SvnCheckinEnvironment implements CheckinEnvironment {
     if (committedRevisions.length() > 0) {
       ApplicationManager.getApplication().invokeLater(new Runnable() {
         public void run() {
-          new ChangesViewBalloonProblemNotifier(mySvnVcs.getProject(),
+          new VcsBalloonProblemNotifier(mySvnVcs.getProject(),
                                                 SvnBundle.message("status.text.comitted.revision", committedRevisions),
                                                 MessageType.INFO).run();
         }
index ea862f34dd4540d2f4c806db846be80a8b5f1565..190ba8b8b4606534cf93eccea0ce568ef9cf284b 100644 (file)
@@ -30,7 +30,7 @@ import com.intellij.openapi.vcs.*;
 import com.intellij.openapi.vcs.changes.*;
 import com.intellij.openapi.vcs.changes.committed.RunBackgroundable;
 import com.intellij.openapi.vcs.changes.shelf.ShelveChangesManager;
-import com.intellij.openapi.vcs.changes.ui.ChangesViewBalloonProblemNotifier;
+import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
 import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -238,7 +238,7 @@ public class QuickMerge {
     context.next(new TaskDescriptor(message, Where.AWT) {
       @Override
       public void run(ContinuationContext context) {
-        ChangesViewBalloonProblemNotifier.showMe(myProject, message, isError ? MessageType.ERROR : MessageType.WARNING);
+        VcsBalloonProblemNotifier.showMe(myProject, message, isError ? MessageType.ERROR : MessageType.WARNING);
       }
     });
   }