removing empty changelists
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 15 Mar 2010 14:32:39 +0000 (17:32 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 15 Mar 2010 14:32:39 +0000 (17:32 +0300)
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java

index fdb3459ee10b1dc77b3e392b17471cb9c1af4f41..f013d7c3f93b901b9f14e3ab2829cd7113d93249 100644 (file)
@@ -29,6 +29,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.*;
 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.conflicts.ChangelistConflictTracker;
 import com.intellij.openapi.vcs.changes.ui.CommitHelper;
@@ -141,7 +142,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
                     public void setValue(Value value) {
                       config.REMOVE_EMPTY_INACTIVE_CHANGELISTS = value;
                     }
-                  }, "<html>The empty changelist is no longer active.<br>" +
+                  }, "<html>The empty changelist '" + StringUtil.last(oldDefaultList.getName(), 30, true) + "' is no longer active.<br>" +
                      "Do you want to remove it?</html>", "Remember my choice");
                   dialog.show();
                   if (!dialog.isOK()) {
index def76962e97c82230a943a4f4209d1c6526b8ca7..547be42efa2bfd0421ba8f9242c2ad9868f58a8e 100644 (file)
@@ -38,7 +38,7 @@ public class VcsConfirmationDialog extends OptionsDialog {
     myOption = option;
     myMessage = message;
     myDoNotShowMessage = doNotShowMessage;
-
+    setTitle("Confirmation");
     init();
   }
 
@@ -59,9 +59,9 @@ public class VcsConfirmationDialog extends OptionsDialog {
 
   @Override
   protected JComponent createCenterPanel() {
-    JPanel panel = new JPanel(new BorderLayout());
+    JPanel panel = new JPanel(new BorderLayout(15, 0));
     panel.add(new JLabel(myMessage));
-    panel.add(new JLabel(Messages.getQuestionIcon()));
+    panel.add(new JLabel(Messages.getQuestionIcon()), BorderLayout.WEST);
     return panel;
   }