diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java
index 48119b1835d9..853daf98d313 100644
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/FrameworkSupportOptionsComponent.java
@@ -51,9 +51,9 @@ public class FrameworkSupportOptionsComponent {
layout.setVerticalFill(true);
myMainPanel = new JPanel(layout);
- if (title != null) {
- myMainPanel.setBorder(IdeBorderFactory.createTitledBorder(title, true));
- }
+ //if (title != null) {
+ // myMainPanel.setBorder(IdeBorderFactory.createTitledBorder(title, true));
+ //}
final JComponent component = myConfigurable.createComponent();
if (component != null) {
diff --git a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
index d5de201f330b..1a861fe5d585 100644
--- a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
+++ b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
@@ -124,7 +124,6 @@ public class PackageChooserDialog extends PackageChooser {
}
);
- myTree.setBorder(BorderFactory.createEtchedBorder());
JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTree);
scrollPane.setPreferredSize(new Dimension(500, 300));
diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index ea958ba0a1e6..fd7b7bb95a51 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -127,8 +127,7 @@ public class UIUtil {
public static final int DEFAULT_HGAP = 10;
public static final int DEFAULT_VGAP = 4;
- public static final int LARGE_HGAP = 30;
- public static final int LARGE_VGAP = 20;
+ public static final int LARGE_VGAP = 12;
public static final Insets PANEL_REGULAR_INSETS = new Insets(8, 12, 8, 12);
public static final Insets PANEL_SMALL_INSETS = new Insets(5, 8, 5, 8);
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.form
index 2eb5c19f0e74..7e84ebd15e67 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.form
@@ -1,6 +1,6 @@
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
index 41e783c55237..5060c84ea488 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.MessageType;
-import com.intellij.openapi.ui.MultiLineLabelUI;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.ui.popup.JBPopupFactory;
@@ -37,6 +36,7 @@ import com.intellij.ui.CollectionComboBoxModel;
import com.intellij.ui.ComboboxWithBrowseButton;
import com.intellij.ui.DocumentAdapter;
import com.intellij.ui.awt.RelativePoint;
+import com.intellij.ui.components.JBLabel;
import com.intellij.util.PairProcessor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.AsyncProcessIcon;
@@ -65,7 +65,7 @@ public class RepositoryAttachDialog extends DialogWrapper {
@NonNls private static final String PROPERTY_ATTACH_JAVADOC = "Repository.Attach.JavaDocs";
@NonNls private static final String PROPERTY_ATTACH_SOURCES = "Repository.Attach.Sources";
- private JLabel myInfoLabel;
+ private JBLabel myInfoLabel;
private JCheckBox myJavaDocCheckBox;
private JCheckBox mySourcesCheckBox;
private final Project myProject;
@@ -73,7 +73,7 @@ public class RepositoryAttachDialog extends DialogWrapper {
private AsyncProcessIcon myProgressIcon;
private ComboboxWithBrowseButton myComboComponent;
private JPanel myPanel;
- private JLabel myCaptionLabel;
+ private JBLabel myCaptionLabel;
private final THashMap> myCoordinates
= new THashMap>();
private final Map myRepositories = new TreeMap();
@@ -88,12 +88,8 @@ public class RepositoryAttachDialog extends DialogWrapper {
myProject = project;
myManaged = managed;
myProgressIcon.suspend();
- myCaptionLabel.setText("Enter keyword, pattern or class name to search by or Maven coordinates,\n" +
- "i.e. 'springframework', 'Logger' or 'org.hibernate:hibernate-core:3.5.0.GA':");
- myCaptionLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
- myCaptionLabel.setUI(new MultiLineLabelUI());
- myInfoLabel.setUI(new MultiLineLabelUI());
- myInfoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0));
+ myCaptionLabel.setText("" + StringUtil.escapeXml("enter keyword, pattern or class name to search by or Maven coordinates," +
+ "i.e. 'springframework', 'Logger' or 'org.hibernate:hibernate-core:3.5.0.GA':") + "");
myInfoLabel.setPreferredSize(
new Dimension(myInfoLabel.getFontMetrics(myInfoLabel.getFont()).stringWidth("Showing: 1000"), myInfoLabel.getPreferredSize().height));
@@ -108,7 +104,7 @@ public class RepositoryAttachDialog extends DialogWrapper {
myCombobox.setModel(new CollectionComboBoxModel(myShownItems, null));
myCombobox.setEditable(true);
final JTextField textField = (JTextField)myCombobox.getEditor().getEditorComponent();
- textField.setColumns(50);
+ textField.setColumns(20);
if (initialFilter != null) {
textField.setText(initialFilter);
}
@@ -257,7 +253,7 @@ public class RepositoryAttachDialog extends DialogWrapper {
}
private void updateInfoLabel() {
- myInfoLabel.setText("Found: " + myCoordinates.size() + "\nShowing: " + myCombobox.getModel().getSize());
+ myInfoLabel.setText("Found: " + myCoordinates.size() + "
Showing: " + myCombobox.getModel().getSize() + "");
}
@Override