From 651d9b9a2ef8a9ef02610e38e22a9510c914ed00 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Wed, 13 Jul 2011 15:27:32 +0400
Subject: [PATCH] replacing title+separator to new titled border. commit
 changes dialog. p.s. previous commit accidentaly made but too valid. comment
 same as this.

---
 .../openapi/vcs/changes/ui/CommitChangeListDialog.java    | 8 +-------
 .../src/com/intellij/openapi/vcs/ui/CommitMessage.java    | 2 +-
 2 files changed, 2 insertions(+), 8 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 7189018fee26..259d5ff2751e 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
@@ -319,7 +319,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
           JPanel vcsOptions = new JPanel(new BorderLayout());
           vcsOptions.add(options.getComponent(), BorderLayout.CENTER);
           vcsOptions.setBorder(IdeBorderFactory.createTitledBorder(vcs.getDisplayName()));
-          //vcsOptions.add(SeparatorFactory.createSeparator(vcs.getDisplayName(), null), BorderLayout.NORTH);
           vcsCommitOptions.add(vcsOptions);
           myPerVcsOptionsPanels.put(vcs, vcsOptions);
           myAdditionalComponents.add(options);
@@ -362,15 +361,12 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
     }
 
     final String actionName = getCommitActionName();
-    final String borderTitleName = actionName.replace("_", "");
-    //final String borderTitleName = actionName;
+    final String borderTitleName = actionName.replace("_", "").replace("&", "");
     if (beforeVisible) {
       beforeBox.add(Box.createVerticalGlue());
       JPanel beforePanel = new JPanel(new BorderLayout());
       beforePanel.add(beforeBox);
       beforePanel.setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("border.standard.checkin.options.group", borderTitleName)));
-      //beforeBox.add(SeparatorFactory.createSeparatorWithBoldTitle(VcsBundle.message("border.standard.checkin.options.group", borderTitleName), null), 0);
-      //optionsBox.add(beforeBox);
       optionsBox.add(beforePanel);
     }
 
@@ -379,8 +375,6 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       JPanel afterPanel = new JPanel(new BorderLayout());
       afterPanel.add(afterBox);
       afterPanel.setBorder(IdeBorderFactory.createTitledBorder(VcsBundle.message("border.standard.after.checkin.options.group", borderTitleName)));
-      //afterBox.add(SeparatorFactory.createSeparatorWithBoldTitle(VcsBundle.message("border.standard.after.checkin.options.group", borderTitleName), null), 0);
-      //optionsBox.add(afterBox);
       optionsBox.add(afterPanel);
     }
 
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index 7001d96c9e42..8695252d7473 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -62,7 +62,7 @@ public class CommitMessage extends JPanel implements Disposable {
 
     JPanel labelPanel = new JPanel(new BorderLayout());
     labelPanel.setBorder(BorderFactory.createEmptyBorder());
-    JComponent separator = SeparatorFactory.createSeparator(VcsBundle.message("label.commit.comment"), myEditorField.getComponent());
+    JComponent separator = SeparatorFactory.createSeparatorWithBoldTitle(VcsBundle.message("label.commit.comment"), myEditorField.getComponent());
     JPanel separatorPanel = new JPanel(new BorderLayout());
     separatorPanel.add(separator, BorderLayout.SOUTH);
     separatorPanel.add(Box.createVerticalGlue(), BorderLayout.NORTH);