Skip to content

Commit cc17109

Browse files
committed
languageSet was not read, so removed from private class and callers
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1152359 13f79535-47bb-0310-9956-ffa450edef68
1 parent 40dee74 commit cc17109

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

src/java/org/apache/commons/codec/language/bm/PhoneticEngine.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ else if (input.length() >= 2 && input.substring(0, 2).equals("d'")) // check for
217217

218218
// loop over each char in the input - we will handle the increment manually
219219
for (int i = 0; i < input.length();) {
220-
RulesApplication rulesApplication = new RulesApplication(rules, languageSet, input, phonemeBuilder, i).invoke();
220+
RulesApplication rulesApplication = new RulesApplication(rules, input, phonemeBuilder, i).invoke();
221221
i = rulesApplication.getI();
222222
phonemeBuilder = rulesApplication.getPhonemeBuilder();
223223
// System.err.println(input + " " + i + ": " + phonemeBuilder.makeString());
@@ -251,7 +251,7 @@ private PhonemeBuilder applyFinalRules(PhonemeBuilder phonemeBuilder, List<Rule>
251251
// System.err.println("Expanding: " + phonemeText);
252252

253253
for (int i = 0; i < phonemeText.length();) {
254-
RulesApplication rulesApplication = new RulesApplication(finalRules, languageSet, phonemeText, subBuilder, i).invoke();
254+
RulesApplication rulesApplication = new RulesApplication(finalRules, phonemeText, subBuilder, i).invoke();
255255
boolean found = rulesApplication.isFound();
256256
subBuilder = rulesApplication.getPhonemeBuilder();
257257

@@ -288,19 +288,17 @@ private static String join(Iterable<String> strings, String sep) {
288288

289289
private static class RulesApplication {
290290
private final List<Rule> finalRules;
291-
private final Languages.LanguageSet languageSet;
292291
private final String input;
293292

294293
private PhonemeBuilder phonemeBuilder;
295294
private int i;
296295
private boolean found;
297296

298-
public RulesApplication(List<Rule> finalRules, Languages.LanguageSet languageSet, String input, PhonemeBuilder phonemeBuilder, int i) {
297+
public RulesApplication(List<Rule> finalRules, String input, PhonemeBuilder phonemeBuilder, int i) {
299298
if (finalRules == null) {
300299
throw new NullPointerException("The finalRules argument must not be null");
301300
}
302301
this.finalRules = finalRules;
303-
this.languageSet = languageSet;
304302
this.phonemeBuilder = phonemeBuilder;
305303
this.input = input;
306304
this.i = i;

0 commit comments

Comments
 (0)