From cb0b05343bdba152ad2df3407146145fe8956239 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 25 Mar 2013 17:12:54 +0100
Subject: [PATCH] javafx: extract hasBuilder logic (cherry picked from commit
 bf5d7700621dd1e8ae4c52d07e0c31e5c34343d3)

---
 .../plugins/javaFX/fxml/JavaFxPsiUtil.java    | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
index 435f606d554e..daa1f942ca2d 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -413,33 +413,39 @@ public class JavaFxPsiUtil {
       if (noArgConstructor == null) {
         final PsiMethod valueOf = findValueOfMethod(psiClass);
         if (valueOf == null) {
-          final PsiClass builderClass = JavaPsiFacade.getInstance(project).findClass(JavaFxCommonClassNames.JAVAFX_FXML_BUILDER,
-                                                                                     GlobalSearchScope.allScope(project));
-          if (builderClass != null) {
-            //todo cache this info
-            final PsiMethod[] buildMethods = builderClass.findMethodsByName("build", false);
-            if (buildMethods.length == 1 && buildMethods[0].getParameterList().getParametersCount() == 0) {
-              if (ClassInheritorsSearch.search(builderClass).forEach(new Processor<PsiClass>() {
-                @Override
-                public boolean process(PsiClass aClass) {
-                  PsiType returnType = null;
-                  final PsiMethod method = MethodSignatureUtil.findMethodBySuperMethod(aClass, buildMethods[0], false);
-                  if (method != null) {
-                    returnType = method.getReturnType();
-                  }
-                  return !Comparing.equal(psiClass, PsiUtil.resolveClassInClassTypeOnly(returnType));
-                }
-              })) {
-                return "Unable to instantiate";
-              }
-            }
-          }
+          if (!hasBuilder(psiClass)) return "Unable to instantiate";
         }
       }
     }
     return null;
   }
 
+  public static boolean hasBuilder(final PsiClass psiClass) {
+    final Project project = psiClass.getProject();
+    final PsiClass builderClass = JavaPsiFacade.getInstance(project).findClass(JavaFxCommonClassNames.JAVAFX_FXML_BUILDER,
+                                                                               GlobalSearchScope.allScope(project));
+    if (builderClass != null) {
+      //todo cache this info
+      final PsiMethod[] buildMethods = builderClass.findMethodsByName("build", false);
+      if (buildMethods.length == 1 && buildMethods[0].getParameterList().getParametersCount() == 0) {
+        if (ClassInheritorsSearch.search(builderClass).forEach(new Processor<PsiClass>() {
+          @Override
+          public boolean process(PsiClass aClass) {
+            PsiType returnType = null;
+            final PsiMethod method = MethodSignatureUtil.findMethodBySuperMethod(aClass, buildMethods[0], false);
+            if (method != null) {
+              returnType = method.getReturnType();
+            }
+            return !Comparing.equal(psiClass, PsiUtil.resolveClassInClassTypeOnly(returnType));
+          }
+        })) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
   public static String isClassAcceptable(@Nullable XmlTag parentTag, final PsiClass aClass) {
     if (parentTag == null) {
       return null;