Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-23 23:02:05 +01:00
Code Issues Releases Wiki Activity

Invert if-statements to increase readability

Browse source
This commit is contained in:
Paul Schaub 2019-08-31 17:07:17 +02:00
parent 7fb6e685a7
commit 19c9f36047
1 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
smack-extensions/src/main/java/org/jivesoftware/smackx/avatar/element/MetadataExtension.java
View file

@ -1,6 +1,6 @@
/** /**
* *
* Copyright 2017 Fernando Ramirez * Copyright 2017 Fernando Ramirez, 2019 Paul Schaub
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,6 +32,7 @@ import org.jivesoftware.smackx.avatar.UserAvatarManager;
* This class contains metadata about published avatars. * This class contains metadata about published avatars.
* *
* @author Fernando Ramirez * @author Fernando Ramirez
* @author Paul Schaub
* @see <a href="https://xmpp.org/extensions/xep-0084.html">XEP-0084: User * @see <a href="https://xmpp.org/extensions/xep-0084.html">XEP-0084: User
* Avatar</a> * Avatar</a>
*/ */
@ -110,55 +111,58 @@ public class MetadataExtension implements ExtensionElement {
} }
private void appendInfoElements(XmlStringBuilder xml) { private void appendInfoElements(XmlStringBuilder xml) {
if (infos != null) { if (infos == null) {
xml.rightAngleBracket(); return;
}
for (MetadataInfo info : infos) { xml.rightAngleBracket();
xml.halfOpenElement("info");
xml.attribute("id", info.getId());
xml.attribute("bytes", info.getBytes().longValue());
xml.attribute("type", info.getType());
xml.optAttribute("url", info.getUrl());
if (info.getHeight().nativeRepresentation() > 0) { for (MetadataInfo info : infos) {
xml.attribute("height", info.getHeight().nativeRepresentation()); xml.halfOpenElement("info");
} xml.attribute("id", info.getId());
xml.attribute("bytes", info.getBytes().longValue());
xml.attribute("type", info.getType());
xml.optAttribute("url", info.getUrl());
if (info.getWidth().nativeRepresentation() > 0) { if (info.getHeight().nativeRepresentation() > 0) {
xml.attribute("width", info.getWidth().nativeRepresentation()); xml.attribute("height", info.getHeight().nativeRepresentation());
}
xml.closeEmptyElement();
} }
if (info.getWidth().nativeRepresentation() > 0) {
xml.attribute("width", info.getWidth().nativeRepresentation());
}
xml.closeEmptyElement();
} }
} }
private void appendPointerElements(XmlStringBuilder xml) { private void appendPointerElements(XmlStringBuilder xml) {
if (pointers != null) { if (pointers == null) {
return;
}
for (MetadataPointer pointer : pointers) { for (MetadataPointer pointer : pointers) {
xml.openElement("pointer"); xml.openElement("pointer");
xml.halfOpenElement("x"); xml.halfOpenElement("x");
String namespace = pointer.getNamespace(); String namespace = pointer.getNamespace();
if (namespace != null) { if (namespace != null) {
xml.xmlnsAttribute(namespace); xml.xmlnsAttribute(namespace);
}
xml.rightAngleBracket();
Map<String, Object> fields = pointer.getFields();
if (fields != null) {
for (Map.Entry<String, Object> pair : fields.entrySet()) {
xml.escapedElement(pair.getKey(), String.valueOf(pair.getValue()));
}
}
xml.closeElement("x");
xml.closeElement("pointer");
} }
xml.rightAngleBracket();
Map<String, Object> fields = pointer.getFields();
if (fields != null) {
for (Map.Entry<String, Object> pair : fields.entrySet()) {
xml.escapedElement(pair.getKey(), String.valueOf(pair.getValue()));
}
}
xml.closeElement("x");
xml.closeElement("pointer");
} }
} }
private void closeElement(XmlStringBuilder xml) { private void closeElement(XmlStringBuilder xml) {