Complex condition moved into separate method.

gluonhq · Apr 10, 2024 · 19028d6 · 19028d6
1 parent 5847ac1
commit 19028d6
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java b/kit/src/main/java/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java
@@ -110,10 +110,8 @@ public void load(String fxmlText, FXOMDocumentSwitch ... switches) throws java.i
             setSceneGraphRoot(fxmlLoader.load(is));
         } catch (RuntimeException | IOException x) {
             Throwable cause = x.getCause();
-            if (cause instanceof ClassNotFoundException missingTypeError && 
-                    (Set.of(switches).contains(FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS) 
-                            || document.hasUnresolvableImports())) {
-                    String missingClassName = missingTypeError.getMessage();
+            if (handlingOfUnresolvedImportsIsEnabled(cause, switches)) {
+                    String missingClassName = cause.getMessage();
                     String modifiedFxml = removeUnresolvableTypeFromFXML(fxmlText, missingClassName);
                     LOGGER.log(Level.WARNING, "Failed to resolve class from FXML imports. "
                                             + "Try loading FXML without {0}", missingClassName);
@@ -124,6 +122,14 @@ public void load(String fxmlText, FXOMDocumentSwitch ... switches) throws java.i
         }
     }
 
+    private boolean handlingOfUnresolvedImportsIsEnabled(Throwable cause, FXOMDocumentSwitch... switches) {
+        if (!(cause instanceof ClassNotFoundException)) {
+            return false;
+        }
+        return Set.of(switches).contains(FXOMDocumentSwitch.PRESERVE_UNRESOLVED_IMPORTS) 
+                || document.hasUnresolvableImports();
+    }
+
     private String removeUnresolvableTypeFromFXML(String fxmlText, String unresolvableType) {
         FXOMImportsRemover remover = new FXOMImportsRemover(document::addUnresolvableType);
         return remover.removeImports(fxmlText, List.of(unresolvableType));