Merge branch 'svn1_8_new'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 9 Oct 2013 11:35:05 +0000 (15:35 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 9 Oct 2013 11:35:05 +0000 (15:35 +0400)
1  2 
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java

index ce9cc5a298c5419291b266b2709f63e832aff788,39bf69ff2d3fb0eb72573cd8e26c1bef0d749bf8..3180738184531b6a2160dd677c720c8c40538380
@@@ -40,20 -34,10 +35,10 @@@ public class MergeFromAction extends Du
    public void actionPerformed(AnActionEvent e) {
      if (! isEnabled(e)) return;
      final DataContext dc = e.getDataContext();
 -    final Project project = PlatformDataKeys.PROJECT.getData(dc);
 +    final Project project = CommonDataKeys.PROJECT.getData(dc);
      if (project == null) return;
-     final ToolWindowManager manager = ToolWindowManager.getInstance(project);
-     if (manager != null) {
-       final ToolWindow window = manager.getToolWindow(ChangesViewContentManager.TOOLWINDOW_ID);
-       if (window != null) {
-         window.show(null);
-         final ContentManager cm = window.getContentManager();
-         final Content content = cm.findContent(SvnBundle.message("dialog.show.svn.map.title"));
-         if (content != null) {
-           cm.setSelectedContent(content, true);
-         }
-       }
-     }
+     WorkingCopiesContent.show(project);
    }
  
    @Override