time to remove IE (issue #735)

rbri · rbri · commit b6c255030749 · 2024-03-02T09:51:22.000+01:00
diff --git a/src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java b/src/main/java/org/htmlunit/javascript/configuration/JavaScriptConfiguration.java
@@ -236,10 +236,10 @@
 import org.htmlunit.javascript.host.file.FileSystemDirectoryReader;
 import org.htmlunit.javascript.host.file.FileSystemEntry;
 import org.htmlunit.javascript.host.file.FileSystemFileEntry;
-import org.htmlunit.javascript.host.geo.Coordinates;
+import org.htmlunit.javascript.host.geo.GeolocationCoordinates;
 import org.htmlunit.javascript.host.geo.Geolocation;
-import org.htmlunit.javascript.host.geo.Position;
-import org.htmlunit.javascript.host.geo.PositionError;
+import org.htmlunit.javascript.host.geo.GeolocationPosition;
+import org.htmlunit.javascript.host.geo.GeolocationPositionError;
 import org.htmlunit.javascript.host.html.Audio;
 import org.htmlunit.javascript.host.html.DataTransfer;
 import org.htmlunit.javascript.host.html.HTMLAllCollection;
@@ -563,7 +563,7 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         CDATASection.class, ChannelMergerNode.class, ChannelSplitterNode.class, CharacterData.class, ClientRect.class,
         ClientRectList.class, ClipboardEvent.class,
         CloseEvent.class, Comment.class, CompositionEvent.class, ComputedCSSStyleDeclaration.class,
-        ConstantSourceNode.class, ConvolverNode.class, Coordinates.class,
+        ConstantSourceNode.class, ConvolverNode.class,
         Credential.class, CredentialsContainer.class, Crypto.class,
         CryptoKey.class, CSS.class, CSSConditionRule.class,
         CSSCounterStyleRule.class, CSSFontFaceRule.class, CSSGroupingRule.class, CSSImportRule.class,
@@ -586,7 +586,9 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         FileSystemEntry.class, FileSystemFileEntry.class,
         FocusEvent.class, FontFace.class,
         FontFaceSet.class, FormData.class, GainNode.class, Gamepad.class,
-        GamepadButton.class, GamepadEvent.class, Geolocation.class, HashChangeEvent.class, Headers.class, History.class,
+        GamepadButton.class, GamepadEvent.class,
+        Geolocation.class, GeolocationCoordinates.class, GeolocationPosition.class, GeolocationPositionError.class,
+        HashChangeEvent.class, Headers.class, History.class,
         HTMLAllCollection.class, HTMLAnchorElement.class, HTMLAreaElement.class, HTMLAudioElement.class,
         HTMLBaseElement.class, HTMLBGSoundElement.class, HTMLBlockElement.class,
         HTMLBodyElement.class, HTMLBRElement.class, HTMLButtonElement.class,
@@ -646,7 +648,7 @@ public final class JavaScriptConfiguration extends AbstractJavaScriptConfigurati
         PerformanceObserver.class, PerformanceObserverEntryList.class,
         PerformanceResourceTiming.class, PerformanceTiming.class, PeriodicSyncManager.class, PeriodicWave.class,
         Permissions.class, PermissionStatus.class, Plugin.class, PluginArray.class,
-        PointerEvent.class, PopStateEvent.class, Position.class, PositionError.class, Presentation.class,
+        PointerEvent.class, PopStateEvent.class, Presentation.class,
         PresentationAvailability.class, PresentationConnection.class, PresentationConnectionAvailableEvent.class,
         PresentationConnectionCloseEvent.class, PresentationRequest.class,
         ProcessingInstruction.class, ProgressEvent.class, PromiseRejectionEvent.class,
diff --git a/src/main/java/org/htmlunit/javascript/host/geo/Geolocation.java b/src/main/java/org/htmlunit/javascript/host/geo/Geolocation.java
@@ -41,7 +41,7 @@
 import org.htmlunit.javascript.configuration.JsxFunction;
 
 /**
- * A JavaScript object for {@code Geolocation}.
+ * A JavaScript object for Geolocation.
  *
  * @author Ahmed Ashour
  * @author Ronald Brill
@@ -149,10 +149,10 @@ void doGetPosition() {
                 final double longitude = Double.parseDouble(getJSONValue(content, "lng"));
                 final double accuracy = Double.parseDouble(getJSONValue(content, "accuracy"));
 
-                final Coordinates coordinates = new Coordinates(latitude, longitude, accuracy);
+                final GeolocationCoordinates coordinates = new GeolocationCoordinates(latitude, longitude, accuracy);
                 coordinates.setPrototype(getPrototype(coordinates.getClass()));
 
-                final Position position = new Position(coordinates);
+                final GeolocationPosition position = new GeolocationPosition(coordinates);
                 position.setPrototype(getPrototype(position.getClass()));
 
                 final WebWindow ww = getWindow().getWebWindow();
diff --git a/src/main/java/org/htmlunit/javascript/host/geo/GeolocationCoordinates.java b/src/main/java/org/htmlunit/javascript/host/geo/GeolocationCoordinates.java
@@ -14,19 +14,18 @@
  */
 package org.htmlunit.javascript.host.geo;
 
-import static org.htmlunit.javascript.configuration.SupportedBrowser.IE;
-
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxGetter;
 
 /**
- * A JavaScript object for {@code Coordinates}.
+ * A JavaScript object for GeolocationCoordinates.
  *
  * @author Ahmed Ashour
+ * @author Ronald Brill
  */
-@JsxClass(IE)
-public class Coordinates extends HtmlUnitScriptable {
+@JsxClass
+public class GeolocationCoordinates extends HtmlUnitScriptable {
 
     private double latitude_;
     private double longitude_;
@@ -35,10 +34,10 @@ public class Coordinates extends HtmlUnitScriptable {
     /**
      * Creates an instance.
      */
-    public Coordinates() {
+    public GeolocationCoordinates() {
     }
 
-    Coordinates(final double latitude, final double longitude, final double accuracy) {
+    GeolocationCoordinates(final double latitude, final double longitude, final double accuracy) {
         latitude_ = latitude;
         longitude_ = longitude;
         accuracy_ = accuracy;
diff --git a/src/main/java/org/htmlunit/javascript/host/geo/GeolocationPosition.java b/src/main/java/org/htmlunit/javascript/host/geo/GeolocationPosition.java
@@ -14,29 +14,28 @@
  */
 package org.htmlunit.javascript.host.geo;
 
-import static org.htmlunit.javascript.configuration.SupportedBrowser.IE;
-
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxGetter;
 
 /**
- * A JavaScript object for {@code Position}.
+ * A JavaScript object for GeolocationPosition.
  *
  * @author Ahmed Ashour
+ * @author Ronald Brill
  */
-@JsxClass(IE)
-public class Position extends HtmlUnitScriptable {
+@JsxClass
+public class GeolocationPosition extends HtmlUnitScriptable {
 
-    private Coordinates coordinates_;
+    private GeolocationCoordinates coordinates_;
 
     /**
      * Creates an instance.
      */
-    public Position() {
+    public GeolocationPosition() {
     }
 
-    Position(final Coordinates coordinates) {
+    GeolocationPosition(final GeolocationCoordinates coordinates) {
         coordinates_ = coordinates;
     }
 
@@ -45,7 +44,7 @@ public Position() {
      * @return the coordinates
      */
     @JsxGetter
-    public Coordinates getCoords() {
+    public GeolocationCoordinates getCoords() {
         return coordinates_;
     }
 }
diff --git a/src/main/java/org/htmlunit/javascript/host/geo/GeolocationPositionError.java b/src/main/java/org/htmlunit/javascript/host/geo/GeolocationPositionError.java
@@ -14,8 +14,6 @@
  */
 package org.htmlunit.javascript.host.geo;
 
-import static org.htmlunit.javascript.configuration.SupportedBrowser.IE;
-
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstant;
@@ -26,8 +24,8 @@
  * @author Ahmed Ashour
  * @author Ronald Brill
  */
-@JsxClass(IE)
-public class PositionError extends HtmlUnitScriptable {
+@JsxClass
+public class GeolocationPositionError extends HtmlUnitScriptable {
 
     /** The constant for {@code PERMISSION_DENIED}. */
     @JsxConstant
@@ -42,6 +40,6 @@ public class PositionError extends HtmlUnitScriptable {
     /**
      * Default constructor.
      */
-    public PositionError() {
+    public GeolocationPositionError() {
     }
 }
diff --git a/src/test/java/org/htmlunit/general/HostClassNameTest.java b/src/test/java/org/htmlunit/general/HostClassNameTest.java
@@ -1123,7 +1123,7 @@ public void convolverNode() throws Exception {
     }
 
     /**
-     * Test {@link org.htmlunit.javascript.host.geo.Coordinates}.
+     * Test {@link org.htmlunit.javascript.host.geo.GeolocationCoordinates}.
      *
      * @throws Exception if an error occurs
      */
@@ -6170,7 +6170,7 @@ public void portCollection() throws Exception {
     }
 
     /**
-     * Test {@link org.htmlunit.javascript.host.geo.Position}.
+     * Test {@link org.htmlunit.javascript.host.geo.GeolocationPosition}.
      *
      * @throws Exception if an error occurs
      */
diff --git a/src/test/java/org/htmlunit/general/HostTypeOfTest.java b/src/test/java/org/htmlunit/general/HostTypeOfTest.java
@@ -1097,7 +1097,7 @@ public void convolverNode() throws Exception {
     }
 
     /**
-     * Test {@link org.htmlunit.javascript.host.geo.Coordinates}.
+     * Test {@link org.htmlunit.javascript.host.geo.GeolocationCoordinates}.
      *
      * @throws Exception if an error occurs
      */
@@ -6144,7 +6144,7 @@ public void portCollection() throws Exception {
     }
 
     /**
-     * Test {@link org.htmlunit.javascript.host.geo.Position}.
+     * Test {@link org.htmlunit.javascript.host.geo.GeolocationPosition}.
      *
      * @throws Exception if an error occurs
      */

Original file line number	Diff line number	Diff line change
`@@ -1123,7 +1123,7 @@ public void convolverNode() throws Exception {`
`1123`	`1123`	`}`
`1124`	`1124`
`1125`	`1125`	`/**`
`1126`		`- * Test {@link org.htmlunit.javascript.host.geo.Coordinates}.`
	`1126`	`+ * Test {@link org.htmlunit.javascript.host.geo.GeolocationCoordinates}.`
`1127`	`1127`	`*`
`1128`	`1128`	`* @throws Exception if an error occurs`
`1129`	`1129`	`*/`
`@@ -6170,7 +6170,7 @@ public void portCollection() throws Exception {`
`6170`	`6170`	`}`
`6171`	`6171`
`6172`	`6172`	`/**`
`6173`		`- * Test {@link org.htmlunit.javascript.host.geo.Position}.`
	`6173`	`+ * Test {@link org.htmlunit.javascript.host.geo.GeolocationPosition}.`
`6174`	`6174`	`*`
`6175`	`6175`	`* @throws Exception if an error occurs`
`6176`	`6176`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ public void convolverNode() throws Exception {`
`1097`	`1097`	`}`
`1098`	`1098`
`1099`	`1099`	`/**`
`1100`		`- * Test {@link org.htmlunit.javascript.host.geo.Coordinates}.`
	`1100`	`+ * Test {@link org.htmlunit.javascript.host.geo.GeolocationCoordinates}.`
`1101`	`1101`	`*`
`1102`	`1102`	`* @throws Exception if an error occurs`
`1103`	`1103`	`*/`
`@@ -6144,7 +6144,7 @@ public void portCollection() throws Exception {`
`6144`	`6144`	`}`
`6145`	`6145`
`6146`	`6146`	`/**`
`6147`		`- * Test {@link org.htmlunit.javascript.host.geo.Position}.`
	`6147`	`+ * Test {@link org.htmlunit.javascript.host.geo.GeolocationPosition}.`
`6148`	`6148`	`*`
`6149`	`6149`	`* @throws Exception if an error occurs`
`6150`	`6150`	`*/`