From d14cc80149e304da5ee1bfc8ea609f51c16a4ee1 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 7 Oct 2011 10:16:54 +0400
Subject: [PATCH] project structure error highlighting: fixed position of
 quickfixes popup

---
 .../ui/configuration/ConfigurationError.java  |  3 +-
 .../ConfigurationErrorsComponent.java         | 21 +++++-----
 .../daemon/ProjectConfigurationProblem.java   | 38 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationError.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationError.java
index c0ffe7a36a11..565687d5c2e5 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationError.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationError.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.ui.awt.RelativePoint;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -67,7 +68,7 @@ public abstract class ConfigurationError implements Comparable<ConfigurationErro
   /**
    * Called when user invokes "Fix" action
    */
-  public void fix(JComponent contextComponent) {
+  public void fix(JComponent contextComponent, RelativePoint relativePoint) {
   }
 
   public boolean canBeFixed() {
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java
index feb105110cf9..1d88a0cb7ad1 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.impl.content.GraphicsConfig;
+import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.ui.components.labels.LinkLabel;
@@ -217,7 +218,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
             if (deepestComponentAt instanceof ToolbarAlikeButton) {
               final String name = ((ToolbarAlikeButton)deepestComponentAt).getButtonName();
               if (FIX_ACTION_NAME.equals(name)) {
-                onClickFix(error, (JComponent)deepestComponentAt);
+                onClickFix(error, (JComponent)deepestComponentAt, e);
               }
               else if (NAVIGATE_ACTION_NAME.equals(name)) {
                 error.navigate();
@@ -239,8 +240,8 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
       }
     }
 
-    private void onClickFix(@NotNull final ConfigurationError error, JComponent component) {
-      error.fix(component);
+    private void onClickFix(@NotNull final ConfigurationError error, JComponent component, MouseEvent e) {
+      error.fix(component, new RelativePoint(e));
     }
 
     @Override
@@ -269,7 +270,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
         }
 
         @Override
-        public void onClick() {
+        public void onClick(MouseEvent e) {
           onViewChange();
         }
       }, BorderLayout.NORTH);
@@ -305,7 +306,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
       myBehavior = new BaseButtonBehavior(this, TimedDeadzone.NULL) {
         @Override
         protected void execute(MouseEvent e) {
-          onClick();
+          onClick(e);
         }
       };
 
@@ -316,7 +317,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
       return myName;
     }
 
-    public void onClick() {}
+    public void onClick(MouseEvent e) {}
 
     @Override
     public Insets getInsets() {
@@ -577,10 +578,10 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
           }
 
           @Override
-          public void onClick() {
+          public void onClick(MouseEvent e) {
             final Object o = myModel.getElementAt(0);
             if (o instanceof ConfigurationError) {
-              ((ConfigurationError)o).fix(this);
+              ((ConfigurationError)o).fix(this, new RelativePoint(e));
               updateView();
               final Container ancestor = SwingUtilities.getAncestorOfClass(ConfigurationErrorsComponent.class, this);
               if (ancestor != null && ancestor instanceof JComponent) {
@@ -600,7 +601,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
         }
 
         @Override
-        public void onClick() {
+        public void onClick(MouseEvent e) {
           final Object o = myModel.getElementAt(0);
           if (o instanceof ConfigurationError) {
             ((ConfigurationError)o).navigate();
@@ -616,7 +617,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
         }
 
         @Override
-        public void onClick() {
+        public void onClick(MouseEvent e) {
           final Object o = myModel.getElementAt(0);
           if (o instanceof ConfigurationError) {
             ((ConfigurationError)o).ignore(!((ConfigurationError)o).isIgnored());
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java
index c2dc5d183ee1..4775345514f0 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/daemon/ProjectConfigurationProblem.java
@@ -18,10 +18,10 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.awt.RelativePoint;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.util.List;
 
 /**
 * @author nik
@@ -63,25 +63,23 @@ class ProjectConfigurationProblem extends ConfigurationError {
   }
 
   @Override
-  public void fix(final JComponent contextComponent) {
-    final List<ConfigurationErrorQuickFix> fixes = myDescription.getFixes();
-    if (fixes.size() == 1) {
-      fixes.get(0).performFix();
-    }
-    else {
-      JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<ConfigurationErrorQuickFix>(null, fixes) {
-        @NotNull
-        @Override
-        public String getTextFor(ConfigurationErrorQuickFix value) {
-          return value.getActionName();
-        }
+  public void fix(final JComponent contextComponent, RelativePoint relativePoint) {
+    JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep<ConfigurationErrorQuickFix>(null, myDescription.getFixes()) {
+      @NotNull
+      @Override
+      public String getTextFor(ConfigurationErrorQuickFix value) {
+        return value.getActionName();
+      }
 
-        @Override
-        public PopupStep onChosen(ConfigurationErrorQuickFix selectedValue, boolean finalChoice) {
-          selectedValue.performFix();
-          return FINAL_CHOICE;
-        }
-      }).showUnderneathOf(contextComponent);
-    }
+      @Override
+      public PopupStep onChosen(final ConfigurationErrorQuickFix selectedValue, boolean finalChoice) {
+        return doFinalStep(new Runnable() {
+          @Override
+          public void run() {
+            selectedValue.performFix();
+          }
+        });
+      }
+    }).show(relativePoint);
   }
 }