Skip to content

Commit 98219e4

Browse files
akurtakovakurtakov
committed
Remove unused browser helper code
Nowhere in the code checks for Konqueror or Gecko is done so we would better reduce the luggage.
1 parent c51be7a commit 98219e4

File tree

3 files changed

+3
-64
lines changed

3 files changed

+3
-64
lines changed

‎ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/RequestData.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2019 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -56,10 +56,6 @@ public boolean isBot() {
5656
return UrlUtil.isBot(request);
5757
}
5858

59-
public boolean isGecko() {
60-
return UrlUtil.isGecko(request);
61-
}
62-
6359
public boolean isIE() {
6460
return UrlUtil.isIE(request);
6561
}
@@ -68,10 +64,6 @@ public String getIEVersion() {
6864
return UrlUtil.getIEVersion(request);
6965
}
7066

71-
public boolean isKonqueror() {
72-
return UrlUtil.isKonqueror(request);
73-
}
74-
7567
public boolean isMozilla() {
7668
return UrlUtil.isMozilla(request);
7769
}

‎ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/UrlUtil.java

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2019 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -268,22 +268,6 @@ public static boolean isBot(HttpServletRequest request) {
268268
|| request.getParameter("bot") != null;//$NON-NLS-1$
269269
}
270270

271-
public static boolean isGecko(HttpServletRequest request) {
272-
String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
273-
return isGecko(agent);
274-
}
275-
276-
public static boolean isGecko(String agent) {
277-
if (agent==null)
278-
return false;
279-
agent=agent.toLowerCase(Locale.ENGLISH);
280-
// sample substring Gecko/20020508
281-
if (agent.contains("like gecko")) { //$NON-NLS-1$
282-
return false;
283-
}
284-
return agent.contains("gecko"); //$NON-NLS-1$
285-
}
286-
287271
public static boolean isIE(HttpServletRequest request) {
288272
String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
289273
return isIE(agent);
@@ -330,18 +314,6 @@ public static String getIEVersion(String agent) {
330314
return agent.substring(start, end);
331315
}
332316

333-
public static boolean isKonqueror(HttpServletRequest request) {
334-
String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
335-
return isKonqueror(agent);
336-
}
337-
338-
public static boolean isKonqueror(String agent) {
339-
if (agent==null)
340-
return false;
341-
agent=agent.toLowerCase(Locale.ENGLISH);
342-
return agent.contains("konqueror"); //$NON-NLS-1$
343-
}
344-
345317
/**
346318
* Test to see if this is a "mozilla" browser, i.e.
347319
* just about anything other than Internet Explorer

‎ua/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/BrowserIdentificationTest.java

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2006, 2016 IBM Corporation and others.
2+
* Copyright (c) 2006, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -33,9 +33,7 @@ public void testIE_6() {
3333
assertTrue(UrlUtil.isIE(agent));
3434
assertFalse(UrlUtil.isMozilla(agent));
3535
assertFalse(UrlUtil.isOpera(agent));
36-
assertFalse(UrlUtil.isKonqueror(agent));
3736
assertFalse(UrlUtil.isSafari(agent));
38-
assertFalse(UrlUtil.isGecko(agent));
3937
assertEquals("6.0", UrlUtil.getIEVersion(agent));
4038
}
4139

@@ -45,9 +43,7 @@ public void testWindowsFirefox_1_8() {
4543
assertFalse(UrlUtil.isIE(agent));
4644
assertTrue(UrlUtil.isMozilla(agent));
4745
assertFalse(UrlUtil.isOpera(agent));
48-
assertFalse(UrlUtil.isKonqueror(agent));
4946
assertFalse(UrlUtil.isSafari(agent));
50-
assertTrue(UrlUtil.isGecko(agent));
5147
assertEquals("1.8.0.8", UrlUtil.getMozillaVersion(agent));
5248
}
5349

@@ -57,9 +53,7 @@ public void testGTKFirefox_1_4() {
5753
assertFalse(UrlUtil.isIE(agent));
5854
assertTrue(UrlUtil.isMozilla(agent));
5955
assertFalse(UrlUtil.isOpera(agent));
60-
assertFalse(UrlUtil.isKonqueror(agent));
6156
assertFalse(UrlUtil.isSafari(agent));
62-
assertTrue(UrlUtil.isGecko(agent));
6357
assertEquals("1.4", UrlUtil.getMozillaVersion(agent));
6458
}
6559

@@ -69,9 +63,7 @@ public void testGTKKonqueror_3_1() {
6963
assertFalse(UrlUtil.isIE(agent));
7064
assertTrue(UrlUtil.isMozilla(agent));
7165
assertFalse(UrlUtil.isOpera(agent));
72-
assertTrue(UrlUtil.isKonqueror(agent));
7366
assertFalse(UrlUtil.isSafari(agent));
74-
assertFalse(UrlUtil.isGecko(agent));
7567
}
7668

7769
@Test
@@ -80,9 +72,7 @@ public void testMacMozilla1_7_3 () {
8072
assertFalse(UrlUtil.isIE(agent));
8173
assertTrue(UrlUtil.isMozilla(agent));
8274
assertFalse(UrlUtil.isOpera(agent));
83-
assertFalse(UrlUtil.isKonqueror(agent));
8475
assertFalse(UrlUtil.isSafari(agent));
85-
assertTrue(UrlUtil.isGecko(agent));
8676
assertEquals("1.7.3", UrlUtil.getMozillaVersion(agent));
8777
}
8878

@@ -92,9 +82,7 @@ public void testSafari_417_8 () {
9282
assertFalse(UrlUtil.isIE(agent));
9383
assertTrue(UrlUtil.isMozilla(agent));
9484
assertFalse(UrlUtil.isOpera(agent));
95-
assertFalse(UrlUtil.isKonqueror(agent));
9685
assertTrue(UrlUtil.isSafari(agent));
97-
assertFalse(UrlUtil.isGecko(agent));
9886
assertEquals("417", UrlUtil.getSafariVersion(agent));
9987
}
10088

@@ -104,9 +92,7 @@ public void testOpera_9() {
10492
assertFalse(UrlUtil.isIE(agent));
10593
assertFalse(UrlUtil.isMozilla(agent));
10694
assertTrue(UrlUtil.isOpera(agent));
107-
assertFalse(UrlUtil.isKonqueror(agent));
10895
assertFalse(UrlUtil.isSafari(agent));
109-
assertFalse(UrlUtil.isGecko(agent));
11096
assertEquals("9.02", UrlUtil.getOperaVersion(agent));
11197
}
11298

@@ -116,9 +102,7 @@ public void testOpera_9_IEMode () {
116102
assertTrue(UrlUtil.isIE(agent));
117103
assertFalse(UrlUtil.isMozilla(agent));
118104
assertTrue(UrlUtil.isOpera(agent));
119-
assertFalse(UrlUtil.isKonqueror(agent));
120105
assertFalse(UrlUtil.isSafari(agent));
121-
assertFalse(UrlUtil.isGecko(agent));
122106
assertEquals("6.0", UrlUtil.getIEVersion(agent));
123107
}
124108

@@ -128,9 +112,7 @@ public void testXulRunnerOnUbuntu() {
128112
assertFalse(UrlUtil.isIE(agent));
129113
assertTrue(UrlUtil.isMozilla(agent));
130114
assertFalse(UrlUtil.isOpera(agent));
131-
assertFalse(UrlUtil.isKonqueror(agent));
132115
assertFalse(UrlUtil.isSafari(agent));
133-
assertTrue(UrlUtil.isGecko(agent));
134116
assertEquals("1.9", UrlUtil.getMozillaVersion(agent));
135117
}
136118

@@ -140,9 +122,7 @@ public void testXulRunnerTruncated() {
140122
assertFalse(UrlUtil.isIE(agent));
141123
assertTrue(UrlUtil.isMozilla(agent));
142124
assertFalse(UrlUtil.isOpera(agent));
143-
assertFalse(UrlUtil.isKonqueror(agent));
144125
assertFalse(UrlUtil.isSafari(agent));
145-
assertFalse(UrlUtil.isGecko(agent));
146126
}
147127

148128
@Test
@@ -151,12 +131,7 @@ public void testFirefox3() {
151131
assertFalse(UrlUtil.isIE(agent));
152132
assertTrue(UrlUtil.isMozilla(agent));
153133
assertFalse(UrlUtil.isOpera(agent));
154-
assertFalse(UrlUtil.isKonqueror(agent));
155134
assertFalse(UrlUtil.isSafari(agent));
156-
assertTrue(UrlUtil.isGecko(agent));
157135
assertEquals("1.8.1.13", UrlUtil.getMozillaVersion(agent));
158136
}
159-
160-
161-
162137
}

0 commit comments

Comments
 (0)