Skip to content

Commit 4a68f5b

Browse files
committed
time to remove IE (issue #735)
1 parent aa4e8bb commit 4a68f5b

7 files changed

Lines changed: 41 additions & 693 deletions

File tree

src/main/java/org/htmlunit/BrowserVersion.java

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ public final class BrowserVersion implements Serializable {
7878
*/
7979
private static final String TIMEZONE_NEW_YORK = "America/New_York";
8080

81-
/**
82-
* The X86 CPU class.
83-
*/
84-
private static final String CPU_CLASS_X86 = "x86";
85-
8681
/**
8782
* The WIN32 platform.
8883
*/
@@ -226,7 +221,6 @@ public final class BrowserVersion implements Serializable {
226221

227222
CHROME.applicationCodeName_ = "Mozilla";
228223
CHROME.vendor_ = "Google Inc.";
229-
CHROME.cpuClass_ = null;
230224
CHROME.productSub_ = "20030107";
231225
CHROME.headerNamesOrdered_ = new String[] {
232226
HttpHeader.HOST,
@@ -273,7 +267,6 @@ public final class BrowserVersion implements Serializable {
273267

274268
EDGE.applicationCodeName_ = "Mozilla";
275269
EDGE.vendor_ = "Google Inc.";
276-
EDGE.cpuClass_ = null;
277270
EDGE.productSub_ = "20030107";
278271
EDGE.headerNamesOrdered_ = new String[] {
279272
HttpHeader.HOST,
@@ -457,13 +450,10 @@ public final class BrowserVersion implements Serializable {
457450
private String productSub_;
458451
private String vendor_ = "";
459452
private Locale browserLocale_ = Locale.forLanguageTag(LANGUAGE_ENGLISH_US);
460-
private String cpuClass_ = CPU_CLASS_X86;
461453
private boolean onLine_ = true;
462454
private String platform_ = PLATFORM_WIN32;
463-
private String systemLanguage_ = LANGUAGE_ENGLISH_US;
464455
private TimeZone systemTimezone_ = TimeZone.getTimeZone(TIMEZONE_NEW_YORK);
465456
private String userAgent_;
466-
private String userLanguage_ = LANGUAGE_ENGLISH_US;
467457
private final Set<PluginConfiguration> plugins_;
468458
private final Set<BrowserVersionFeatures> features_;
469459
private String acceptEncodingHeader_;
@@ -686,16 +676,6 @@ public String getBrowserLanguage() {
686676
return browserLocale_.toLanguageTag();
687677
}
688678

689-
/**
690-
* Returns the type of CPU in the machine, for example "x86".
691-
* Default value is {@link #CPU_CLASS_X86} if not explicitly configured.
692-
* @return the type of CPU in the machine
693-
* @see <a href="http://msdn.microsoft.com/en-us/library/ms533697.aspx">MSDN documentation</a>
694-
*/
695-
public String getCpuClass() {
696-
return cpuClass_;
697-
}
698-
699679
/**
700680
* Returns {@code true} if the browser is currently online.
701681
* Default value is {@code true} if not explicitly configured.
@@ -716,16 +696,6 @@ public String getPlatform() {
716696
return platform_;
717697
}
718698

719-
/**
720-
* Returns the system language, for example "en-us".
721-
* Default value is {@link #LANGUAGE_ENGLISH_US} if not explicitly configured.
722-
* @return the system language
723-
* @see <a href="http://msdn.microsoft.com/en-us/library/ms534653.aspx">MSDN documentation</a>
724-
*/
725-
public String getSystemLanguage() {
726-
return systemLanguage_;
727-
}
728-
729699
/**
730700
* Returns the system {@link TimeZone}.
731701
* Default value is {@code America/New_York} if not explicitly configured.
@@ -743,16 +713,6 @@ public String getUserAgent() {
743713
return userAgent_;
744714
}
745715

746-
/**
747-
* Returns the user language, for example "en-us".
748-
* Default value is {@link #LANGUAGE_ENGLISH_US} if not explicitly configured.
749-
* @return the user language
750-
* @see <a href="http://msdn.microsoft.com/en-us/library/ms534713.aspx">MSDN documentation</a>
751-
*/
752-
public String getUserLanguage() {
753-
return userLanguage_;
754-
}
755-
756716
/**
757717
* Returns the value used by the browser for the {@code Accept_Encoding} header.
758718
* @return the accept encoding header string
@@ -951,12 +911,9 @@ public BrowserVersionBuilder(final BrowserVersion version) {
951911
.setApplicationMinorVersion(version.getApplicationMinorVersion())
952912
.setVendor(version.getVendor())
953913
.setBrowserLanguage(version.getBrowserLanguage())
954-
.setCpuClass(version.getCpuClass())
955914
.setOnLine(version.isOnLine())
956915
.setPlatform(version.getPlatform())
957-
.setSystemLanguage(version.getSystemLanguage())
958916
.setSystemTimezone(version.getSystemTimezone())
959-
.setUserLanguage(version.getUserLanguage())
960917
.setBuildId(version.getBuildId())
961918
.setProductSub(version.getProductSub())
962919
.setAcceptEncodingHeader(version.getAcceptEncodingHeader())
@@ -1044,15 +1001,6 @@ public BrowserVersionBuilder setBrowserLanguage(final String browserLanguage) {
10441001
return this;
10451002
}
10461003

1047-
/**
1048-
* @param cpuClass the cpuClass to set
1049-
* @return this for fluent use
1050-
*/
1051-
public BrowserVersionBuilder setCpuClass(final String cpuClass) {
1052-
workPiece_.cpuClass_ = cpuClass;
1053-
return this;
1054-
}
1055-
10561004
/**
10571005
* @param onLine the onLine to set
10581006
* @return this for fluent use
@@ -1071,15 +1019,6 @@ public BrowserVersionBuilder setPlatform(final String platform) {
10711019
return this;
10721020
}
10731021

1074-
/**
1075-
* @param systemLanguage the systemLanguage to set
1076-
* @return this for fluent use
1077-
*/
1078-
public BrowserVersionBuilder setSystemLanguage(final String systemLanguage) {
1079-
workPiece_.systemLanguage_ = systemLanguage;
1080-
return this;
1081-
}
1082-
10831022
/**
10841023
* @param systemTimezone the systemTimezone to set
10851024
* @return this for fluent use
@@ -1098,15 +1037,6 @@ public BrowserVersionBuilder setUserAgent(final String userAgent) {
10981037
return this;
10991038
}
11001039

1101-
/**
1102-
* @param userLanguage the userLanguage to set
1103-
* @return this for fluent use
1104-
*/
1105-
public BrowserVersionBuilder setUserLanguage(final String userLanguage) {
1106-
workPiece_.userLanguage_ = userLanguage;
1107-
return this;
1108-
}
1109-
11101040
/**
11111041
* @param acceptEncodingHeader the {@code Accept-Encoding} header
11121042
* @return this for fluent use

0 commit comments

Comments
 (0)