Menu
▾
▴
[HtmlUnit] SVN: [14701] trunk/htmlunit/src
|
From: <rb...@us...> - 2017-07-25 08:34:48
|
Revision: 14701
http://sourceforge.net/p/htmlunit/code/14701
Author: rbri
Date: 2017-07-25 08:34:45 +0000 (Tue, 25 Jul 2017)
Log Message:
-----------
more BrowserVersion cleanup
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2017-07-24 18:12:04 UTC (rev 14700)
+++ trunk/htmlunit/src/changes/changes.xml 2017-07-25 08:34:45 UTC (rev 14701)
@@ -11,7 +11,7 @@
<action type="fix" dev="rbri">
BrowserVersion.clone now copies the system-timezone attribute.
</action>
- <action type="remove" dev="rbri">
+ <action type="remove" dev="rbri" issue="1890">
INCOMPATIBLE CHANGE: Support for BrowserVersionFeatures parameter of the BrowserVersion constructor
has been removed.
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-07-24 18:12:04 UTC (rev 14700)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersion.java 2017-07-25 08:34:45 UTC (rev 14701)
@@ -131,9 +131,10 @@
* @since 2.21
*/
public static final BrowserVersion FIREFOX_45 = new BrowserVersion(
- NETSCAPE, "5.0 (Windows)",
+ "5.0 (Windows)",
"Mozilla/5.0 (Windows NT 6.1; rv:45.0) Gecko/20100101 Firefox/45.0",
- 45, "FF45");
+ 45,
+ "FF45");
/**
* Firefox 52 ESR.
@@ -140,30 +141,35 @@
* @since 2.26
*/
public static final BrowserVersion FIREFOX_52 = new BrowserVersion(
- NETSCAPE, "5.0 (Windows)",
+ "5.0 (Windows)",
"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:52.0) Gecko/20100101 Firefox/52.0",
- 52, "FF52");
+ 52,
+ "FF52");
/** Internet Explorer 11. */
public static final BrowserVersion INTERNET_EXPLORER = new BrowserVersion(
- NETSCAPE, "5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
- "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko", 11, "IE");
+ "5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
+ "Mozilla/5.0 (Windows NT 6.1; Trident/7.0; rv:11.0) like Gecko",
+ 11,
+ "IE");
/** Latest Chrome. */
public static final BrowserVersion CHROME = new BrowserVersion(
- NETSCAPE, "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36"
- + " (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36",
+ "5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36"
+ + " (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36",
"Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36"
- + " (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36",
- 59, "Chrome");
+ + " (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36",
+ 59,
+ "Chrome");
/** Microsoft Edge. Work In Progress!!! */
public static final BrowserVersion EDGE = new BrowserVersion(
- NETSCAPE, "5.0 (Windows NT 10.0) AppleWebKit/537.36"
- + " (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
+ "5.0 (Windows NT 10.0) AppleWebKit/537.36"
+ + " (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
"Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36"
- + " (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
- 14, "Edge");
+ + " (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393",
+ 14,
+ "Edge");
/**
* The best supported browser version at the moment.
@@ -378,25 +384,24 @@
public BrowserVersion(final String applicationName, final String applicationVersion,
final String userAgent, final int browserVersionNumeric) {
- this(applicationName, applicationVersion, userAgent,
- browserVersionNumeric, applicationName + browserVersionNumeric);
+ this(applicationVersion, userAgent, browserVersionNumeric, applicationName + browserVersionNumeric);
+ setApplicationName(applicationName);
}
/**
* Creates a new browser version instance.
*
- * @param applicationName the name of the application
* @param applicationVersion the version string of the application
* @param userAgent the user agent string that will be sent to the server
* @param javaScriptVersion the version of JavaScript
* @param browserVersionNumeric the floating number version of the browser
- * @param nickname the short name of the browser (like "FF52", "IE", ...)
+ * @param nickname the short name of the browser (like "FF52", "IE", ...) - has to be unique
*/
- private BrowserVersion(final String applicationName, final String applicationVersion,
+ private BrowserVersion(final String applicationVersion,
final String userAgent, final int browserVersionNumeric,
final String nickname) {
- applicationName_ = applicationName;
+ applicationName_ = NETSCAPE;
setApplicationVersion(applicationVersion);
userAgent_ = userAgent;
browserVersionNumeric_ = browserVersionNumeric;
@@ -926,9 +931,10 @@
*/
@Override
public BrowserVersion clone() {
- final BrowserVersion clone = new BrowserVersion(getApplicationName(), getApplicationVersion(),
+ final BrowserVersion clone = new BrowserVersion(getApplicationVersion(),
getUserAgent(), getBrowserVersionNumeric(), getNickname());
+ clone.setApplicationName(getApplicationName());
clone.setApplicationCodeName(getApplicationCodeName());
clone.setApplicationMinorVersion(getApplicationMinorVersion());
clone.setVendor(getVendor());
|
