Skip to content
Snippets Groups Projects
Commit 5652f7a1 authored by srosse's avatar srosse
Browse files

OO-2954: allow ; as separator

parent 6257a5b7
No related branches found
No related tags found
No related merge requests found
...@@ -231,8 +231,26 @@ public class FIBTextEntrySettingsController extends FormBasicController { ...@@ -231,8 +231,26 @@ public class FIBTextEntrySettingsController extends FormBasicController {
List<TextEntryAlternative> alternatives = new ArrayList<>(alternativeRows.size()); List<TextEntryAlternative> alternatives = new ArrayList<>(alternativeRows.size());
for(AlternativeRow row:alternativeRows) { for(AlternativeRow row:alternativeRows) {
TextEntryAlternative alternative = row.getAlternative(); TextEntryAlternative alternative = row.getAlternative();
alternative.setAlternative(row.getAlternativeEl().getValue()); String val = row.getAlternativeEl().getValue();
alternatives.add(alternative); int indexSeparator = val.indexOf(';');
// Don't split single ;, or &auml;
if(indexSeparator >= 0 && val.length() > 1 && indexSeparator != val.length() - 1) {
String[] valArr = val.split("[;]");
for(int i=0;i<valArr.length; i++) {
if(i==0) {
alternative.setAlternative(valArr[i]);
alternatives.add(alternative);
} else {
TextEntryAlternative newAlternative = new TextEntryAlternative();
newAlternative.setAlternative(valArr[i]);
newAlternative.setScore(alternative.getScore());
alternatives.add(newAlternative);
}
}
} else {
alternative.setAlternative(val);
alternatives.add(alternative);
}
} }
interaction.setAlternatives(alternatives); interaction.setAlternatives(alternatives);
interaction.setCaseSensitive(caseSensitiveEl.isAtLeastSelected(1)); interaction.setCaseSensitive(caseSensitiveEl.isAtLeastSelected(1));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment