vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-14 15:01:07 +01:00
Code Issues Releases Wiki Activity

Change FormField value(s) type from String to CharSequence

Browse source
This commit is contained in:
Florian Schmaus 2018-04-06 13:24:54 +02:00
parent 9b5dafe541
commit 1d88c857b5
12 changed files with 79 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

10
smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
View file

@ -74,7 +74,7 @@ public class ReportedData {
List<Field> fieldList = new ArrayList<>(columns.size());
for (FormField field : item.getFields()) {
// The field is created with all the values of the data form's field
List<String> values = new ArrayList<>();
List<CharSequence> values = new ArrayList<>();
values.addAll(field.getValues());
fieldList.add(new Field(field.getVariable(), values));
}
@ -205,7 +205,7 @@ public class ReportedData {
* @param variable the variable to match.
* @return the values of the field whose variable matches the requested variable.
*/
public List<String> getValues(String variable) {
public List<CharSequence> getValues(String variable) {
for (Field field : getFields()) {
if (variable.equalsIgnoreCase(field.getVariable())) {
return field.getValues();
@ -226,9 +226,9 @@ public class ReportedData {
public static class Field {
private final String variable;
private final List<String> values;
private final List<? extends CharSequence> values;
public Field(String variable, List<String> values) {
public Field(String variable, List<? extends CharSequence> values) {
this.variable = variable;
this.values = values;
}
@ -247,7 +247,7 @@ public class ReportedData {
*
* @return the returned values of the search.
*/
public List<String> getValues() {
public List<CharSequence> getValues() {
return Collections.unmodifiableList(values);
}
}

2
smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java
View file

@ -85,7 +85,7 @@ class SimpleUserSearch extends IQ {
}
private static String getSingleValue(FormField formField) {
List<String> values = formField.getValues();
List<String> values = formField.getValuesAsString();
if (values.isEmpty()) {
return "";
} else {