Skip to content

Commit 4447fe1

Browse files
committed
remove the index based access from AbstractJavaScriptConfiguration
1 parent 1eb2522 commit 4447fe1

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

src/main/java/org/htmlunit/javascript/configuration/AbstractJavaScriptConfiguration.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -385,20 +385,6 @@ public static boolean isCompatible(final SupportedBrowser browser1, final Suppor
385385
return browser1 == browser2;
386386
}
387387

388-
/**
389-
* Gets the class configuration for the supplied JavaScript class name.
390-
* @param hostClassName the JavaScript class name
391-
* @return the class configuration for the supplied JavaScript class name
392-
*/
393-
public ClassConfiguration getClassConfiguration(final String hostClassName) {
394-
for (final ClassConfiguration classConfig : configuration_) {
395-
if (hostClassName.equals(classConfig.getClassName())) {
396-
return classConfig;
397-
}
398-
}
399-
return null;
400-
}
401-
402388
/**
403389
* Returns an immutable map containing the DOM to JavaScript mappings. Keys are
404390
* java classes for the various DOM classes (e.g. HtmlInput.class) and the values

src/test/java/org/htmlunit/general/DedicatedWorkerGlobalScopeConstantsTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Collection;
2222
import java.util.Collections;
2323
import java.util.Comparator;
24+
import java.util.HashMap;
2425
import java.util.List;
2526
import java.util.Set;
2627

@@ -132,8 +133,13 @@ private String[] getExpectedString(final String className) {
132133

133134
final WorkerJavaScriptConfiguration javaScriptConfig
134135
= WorkerJavaScriptConfiguration.getInstance(getBrowserVersion());
136+
final HashMap<String, ClassConfiguration> classConfigurationIndex = new HashMap<>();
137+
for (final ClassConfiguration config : javaScriptConfig.getAll()) {
138+
classConfigurationIndex.put(config.getClassName(), config);
139+
}
140+
135141
final List<String> constants = new ArrayList<>();
136-
ClassConfiguration classConfig = javaScriptConfig.getClassConfiguration(className);
142+
ClassConfiguration classConfig = classConfigurationIndex.get(className);
137143

138144
boolean first = true;
139145
while (classConfig != null) {
@@ -148,7 +154,7 @@ private String[] getExpectedString(final String className) {
148154
}
149155
}
150156
}
151-
classConfig = javaScriptConfig.getClassConfiguration(classConfig.getExtendedClassName());
157+
classConfig = classConfigurationIndex.get(classConfig.getExtendedClassName());
152158
first = false;
153159
}
154160

src/test/java/org/htmlunit/general/HostConstantsTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Collection;
2121
import java.util.Collections;
2222
import java.util.Comparator;
23+
import java.util.HashMap;
2324
import java.util.List;
2425
import java.util.Set;
2526

@@ -124,8 +125,13 @@ private String[] getExpectedString() throws Exception {
124125
}
125126

126127
final JavaScriptConfiguration javaScriptConfig = JavaScriptConfiguration.getInstance(getBrowserVersion());
128+
final HashMap<String, ClassConfiguration> classConfigurationIndex = new HashMap<>();
129+
for (final ClassConfiguration config : javaScriptConfig.getAll()) {
130+
classConfigurationIndex.put(config.getClassName(), config);
131+
}
132+
127133
final List<String> constants = new ArrayList<>();
128-
ClassConfiguration classConfig = javaScriptConfig.getClassConfiguration(host_);
134+
ClassConfiguration classConfig = classConfigurationIndex.get(host_);
129135

130136
boolean first = true;
131137
while (classConfig != null) {
@@ -140,7 +146,7 @@ private String[] getExpectedString() throws Exception {
140146
}
141147
}
142148
}
143-
classConfig = javaScriptConfig.getClassConfiguration(classConfig.getExtendedClassName());
149+
classConfig = classConfigurationIndex.get(classConfig.getExtendedClassName());
144150
first = false;
145151
}
146152

0 commit comments

Comments
 (0)