unify and simplify code

Author: rbri

src/main/java/org/htmlunit/javascript/HtmlUnitScriptable.java

@@ -117,22 +117,17 @@ public void put(final String name, final Scriptable start, final Object value) {
     /**
      * Gets a named property from the object.
      * Normally HtmlUnit objects don't need to overwrite this method as properties are defined
-     * on the prototypes from the XML configuration. In some cases where "content" of object
+     * on the prototypes. In some cases where "content" of object
      * has priority compared to the properties consider using utility {@link #getWithPreemption(String)}.
+     *
      * {@inheritDoc}
      */
     @Override
     public Object get(final String name, final Scriptable start) {
         // Try to get property configured on object itself.
-        Object response = super.get(name, start);
-        if (response != NOT_FOUND) {
-            return response;
-        }
-        if (this == start) {
-            response = getWithPreemption(name);
-        }
-        if (response == NOT_FOUND && start instanceof Window) {
-            response = ((Window) start).getWithFallback(name);
+        final Object response = super.get(name, start);
+        if (response == NOT_FOUND && this == start) {
+            return getWithPreemption(name);
         }
         return response;
     }

src/main/java/org/htmlunit/javascript/host/Window.java

@@ -1450,40 +1450,38 @@ private void setHandlerForJavaScript(final String eventName, final Object handle
     }
 
     /**
-     * To be called when the property detection fails in normal scenarios.
-     *
-     * @param name the name
-     * @return the found object, or {@link Scriptable#NOT_FOUND}
+     * {@inheritDoc}
      */
-    public Object getWithFallback(final String name) {
-        Object result = NOT_FOUND;
-
+    @Override
+    protected Object getWithPreemption(final String name) {
         final DomNode domNode = getDomNodeOrNull();
-        if (domNode != null) {
+        if (domNode == null) {
+            return NOT_FOUND;
+        }
 
-            // May be attempting to retrieve a frame by name.
-            final HtmlPage page = (HtmlPage) domNode.getPage();
-            result = getFrameWindowByName(page, name);
 
-            if (result == NOT_FOUND) {
-                result = getElementsByName(page, name);
+        // May be attempting to retrieve a frame by name.
+        final HtmlPage page = (HtmlPage) domNode.getPage();
+        Object result = getFrameWindowByName(page, name);
 
-                if (result == NOT_FOUND) {
-                    // May be attempting to retrieve element by ID (try map-backed operation again instead of XPath).
-                    try {
-                        final HtmlElement htmlElement = page.getHtmlElementById(name);
-                        result = getScriptableFor(htmlElement);
-                    }
-                    catch (final ElementNotFoundException e) {
-                        result = NOT_FOUND;
-                    }
+        if (result == NOT_FOUND) {
+            result = getElementsByName(page, name);
+
+            if (result == NOT_FOUND) {
+                // May be attempting to retrieve element by ID (try map-backed operation again instead of XPath).
+                try {
+                    final HtmlElement htmlElement = page.getHtmlElementById(name);
+                    result = getScriptableFor(htmlElement);
+                }
+                catch (final ElementNotFoundException e) {
+                    result = NOT_FOUND;
                 }
             }
+        }
 
-            if (result instanceof Window) {
-                final WebWindow webWindow = ((Window) result).getWebWindow();
-                result = getProxy(webWindow);
-            }
+        if (result instanceof Window) {
+            final WebWindow webWindow = ((Window) result).getWebWindow();
+            result = getProxy(webWindow);
         }
 
         return result;