1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00

1. Clean up code

2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2006-07-18 05:14:33 +00:00 committed by gato
parent 14b50d790a
commit f57ff10ad9
77 changed files with 995 additions and 932 deletions

View file

@ -42,7 +42,7 @@ class SimpleUserSearch extends IQ {
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:search\">");
buf.append(getItemsToSearch());
buf.append("</query>");
@ -50,7 +50,7 @@ class SimpleUserSearch extends IQ {
}
private String getItemsToSearch() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
if (form == null) {
form = Form.getFormFrom(this);
@ -60,9 +60,9 @@ class SimpleUserSearch extends IQ {
return "";
}
Iterator fields = form.getFields();
Iterator<FormField> fields = form.getFields();
while (fields.hasNext()) {
FormField field = (FormField) fields.next();
FormField field = fields.next();
String name = field.getVariable();
String value = getSingleValue(field);
if (value.trim().length() > 0) {
@ -74,9 +74,9 @@ class SimpleUserSearch extends IQ {
}
private static String getSingleValue(FormField formField) {
Iterator values = formField.getValues();
Iterator<String> values = formField.getValues();
while (values.hasNext()) {
return (String) values.next();
return values.next();
}
return "";
}
@ -87,11 +87,11 @@ class SimpleUserSearch extends IQ {
boolean done = false;
List fields = new ArrayList();
List<ReportedData.Field> fields = new ArrayList<ReportedData.Field>();
while (!done) {
if (parser.getAttributeCount() > 0) {
String jid = parser.getAttributeValue("", "jid");
List valueList = new ArrayList();
List<String> valueList = new ArrayList<String>();
valueList.add(jid);
ReportedData.Field field = new ReportedData.Field("jid", valueList);
fields.add(field);
@ -100,7 +100,7 @@ class SimpleUserSearch extends IQ {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && parser.getName().equals("item")) {
fields = new ArrayList();
fields = new ArrayList<ReportedData.Field>();
}
else if (eventType == XmlPullParser.END_TAG && parser.getName().equals("item")) {
ReportedData.Row row = new ReportedData.Row(fields);
@ -110,7 +110,7 @@ class SimpleUserSearch extends IQ {
String name = parser.getName();
String value = parser.nextText();
List valueList = new ArrayList();
List<String> valueList = new ArrayList<String>();
valueList.add(value);
ReportedData.Field field = new ReportedData.Field(name, valueList);
fields.add(field);

View file

@ -43,7 +43,7 @@ public class UserSearch extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:search\">");
buf.append(getExtensionsXML());
buf.append("</query>");