diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-01-13 16:49:06 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-01-13 16:49:06 +0100 |
commit | 7e44ff92d7d9094207d0a0b1639a88c5fd6e8ccc (patch) | |
tree | b6a0ffea7a3b7cf798c3ec8002e9652ba4908232 /src/main/java/eu/siacs/conversations/parser/AbstractParser.java | |
parent | 06398afd4002cf506e74cb471a2f7dd89f3810f7 (diff) | |
parent | 8644c4676a5fda9d642244ff70e72c5fe524a24d (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/AbstractParser.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/parser/AbstractParser.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java index 51dc398a..2e0852a3 100644 --- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java +++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java @@ -7,15 +7,11 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import javax.xml.datatype.DatatypeConfigurationException; -import javax.xml.datatype.DatatypeFactory; - import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; public abstract class AbstractParser { @@ -28,7 +24,7 @@ public abstract class AbstractParser { /** * Gets the timestamp from the 'delay' element. * Refer to XEP-0203: Delayed Delivery for details. @link{http://xmpp.org/extensions/xep-0203.html} - * @param packet the element to find the child element 'delay' in. + * @param element the element to find the child element 'delay' in. * @return the time in milli seconds of the attribute 'stamp' of the * element 'delay'. In case there is no 'delay' element or no 'stamp' * attribute or the current time is less than the value of the 'stamp' @@ -94,7 +90,7 @@ public abstract class AbstractParser { } } - protected String avatarData(Element items) { + protected static String avatarData(Element items) { Element item = items.findChild("item"); if (item == null) { return null; |