ui: insets around facet validator component

diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java
index 4c469053ca9df00a9f07457a142a084d8daddd10..41868ba8752945f38c1286888bd18146bb939e4e 100644 (file)
--- a/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java
+++ b/java/idea-ui/src/com/intellij/facet/impl/ui/FacetEditorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.facet.impl.ui;
 
 import com.intellij.facet.Facet;
@@ -61,6 +60,7 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
     }
   }
 
+  @Override
   public void reset() {
     super.reset();
     myErrorPanel.getValidatorsManager().validate();
@@ -73,6 +73,7 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
     return myComponent;
   }
 
+  @Override
   public JComponent createComponent() {
     final JComponent editorComponent;
     if (myEditorTabs.length > 1) {
@@ -83,7 +84,8 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
         tabbedPane.addTab(editorTab.getDisplayName(), c);
       }
       tabbedPane.addChangeListener(new ChangeListener() {
-        public void stateChanged(ChangeEvent e) {
+        @Override
+        public void stateChanged(@NotNull ChangeEvent e) {
           myEditorTabs[mySelectedTabIndex].onTabLeaving();
           mySelectedTabIndex = tabbedPane.getSelectedIndex();
           onTabSelected(myEditorTabs[mySelectedTabIndex]);
@@ -99,10 +101,13 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
     else {
       editorComponent = new JPanel();
     }
+
+    final JComponent errorComponent = myErrorPanel.getComponent();
+    UIUtil.addInsets(errorComponent, new Insets(0, 5, 5, 0));
+
     final JPanel panel = new JPanel(new BorderLayout());
     panel.add(BorderLayout.CENTER, editorComponent);
-    panel.add(BorderLayout.SOUTH, myErrorPanel.getComponent());
-
+    panel.add(BorderLayout.SOUTH, errorComponent);
     return panel;
   }
 
@@ -122,6 +127,7 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
     }
   }
 
+  @Override
   public void disposeUIResources() {
     Disposer.dispose(myDisposable);
     myErrorPanel.disposeUIResources();
@@ -161,10 +167,12 @@ public class FacetEditorImpl extends UnnamedConfigurableGroup implements Unnamed
     }
   }
 
+  @Override
   public FacetEditorTab[] getEditorTabs() {
     return myEditorTabs;
   }
 
+  @Override
   public <T extends FacetEditorTab> T getEditorTab(@NotNull final Class<T> aClass) {
     for (FacetEditorTab editorTab : myEditorTabs) {
       if (aClass.isInstance(editorTab)) {

diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetErrorPanel.java b/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetErrorPanel.java
index 2de03c48df91d5d150586f7763cb451f62dd2bc9..d5402689f415d8f5476d72f35f42e8bfc0addb4e 100644 (file)
--- a/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetErrorPanel.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetErrorPanel.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.facet.impl.ui;
 
 import com.intellij.facet.ui.FacetConfigurationQuickFix;
@@ -52,9 +51,10 @@ public class FacetErrorPanel {
     myValidatorsManager = new FacetValidatorsManagerImpl();
     myWarningLabel = new JLabel();
     myWarningLabel.setIcon(AllIcons.General.WarningDialog);
+    myWarningLabel.setIconTextGap(5);
     myQuickFixButton.addActionListener(new ActionListener() {
       @Override
-      public void actionPerformed(final ActionEvent e) {
+      public void actionPerformed(@NotNull ActionEvent e) {
         if (myCurrentQuickFix != null) {
           myCurrentQuickFix.run(myQuickFixButton);
           myValidatorsManager.validate();