You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/02/02 13:10:43 UTC
svn commit: r1781390 -
/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
Author: solomax
Date: Thu Feb 2 13:10:43 2017
New Revision: 1781390
URL: http://svn.apache.org/viewvc?rev=1781390&view=rev
Log:
[OPENMEETINGS-1546] build should be fixed
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1781390&r1=1781389&r2=1781390&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Thu Feb 2 13:10:43 2017
@@ -30,11 +30,11 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.db.util.FormatHelper;
-import org.apache.wicket.ajax.json.JSONException;
-import org.apache.wicket.ajax.json.JSONWriter;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.Validatable;
+import org.json.JSONException;
+import org.json.JSONStringer;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
@@ -42,7 +42,7 @@ public class UserChoiceProvider extends
private static final long serialVersionUID = 1L;
private final static int PAGE_SIZE = 10;
private Map<String, User> newContacts = new Hashtable<String, User>();
-
+
public static User getUser(String value) {
User u = null;
if (!Strings.isEmpty(value)) {
@@ -55,7 +55,7 @@ public class UserChoiceProvider extends
int idx1 = value.indexOf('>', idx);
if (idx1 > -1) {
email = value.substring(idx + 1, idx1);
-
+
String name = value.substring(0, idx).replace("\"", "");
int idx2 = name.indexOf(' ');
if (idx2 > -1) {
@@ -65,7 +65,7 @@ public class UserChoiceProvider extends
fName = "";
lName = name;
}
-
+
}
} else {
email = value;
@@ -120,9 +120,9 @@ public class UserChoiceProvider extends
}
@Override
- public void toJson(User choice, JSONWriter writer) throws JSONException {
- super.toJson(choice, writer);
- writer.key("contact").value(choice.getType() == Type.contact);
+ public void toJson(User choice, JSONStringer stringer) throws JSONException {
+ super.toJson(choice, stringer);
+ stringer.key("contact").value(choice.getType() == Type.contact);
}
@Override