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

SMACK-391 Reformat some new files to Smack standard

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13602 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2013-04-07 13:17:26 +00:00
parent b28037bc79
commit 4155e9ca80
2 changed files with 96 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/org/jivesoftware/smack/util/DateFormatType.java
View file

@ -23,11 +23,12 @@ import java.text.SimpleDateFormat;
/** /**
* Defines the various date and time profiles used in XMPP along with their associated formats. * Defines the various date and time profiles used in XMPP along with their associated formats.
*
* @author Robin Collier * @author Robin Collier
* *
*/ */
public enum DateFormatType public enum DateFormatType {
{ // @formatter:off
XEP_0082_DATE_PROFILE("yyyy-MM-dd"), XEP_0082_DATE_PROFILE("yyyy-MM-dd"),
XEP_0082_DATETIME_PROFILE("yyyy-MM-dd'T'HH:mm:ssZ"), XEP_0082_DATETIME_PROFILE("yyyy-MM-dd'T'HH:mm:ssZ"),
XEP_0082_DATETIME_MILLIS_PROFILE("yyyy-MM-dd'T'HH:mm:ss.SSSZ"), XEP_0082_DATETIME_MILLIS_PROFILE("yyyy-MM-dd'T'HH:mm:ss.SSSZ"),
@ -36,29 +37,29 @@ public enum DateFormatType
XEP_0082_TIME_MILLIS_PROFILE("hh:mm:ss.SSS"), XEP_0082_TIME_MILLIS_PROFILE("hh:mm:ss.SSS"),
XEP_0082_TIME_MILLIS_ZONE_PROFILE("hh:mm:ss.SSSZ"), XEP_0082_TIME_MILLIS_ZONE_PROFILE("hh:mm:ss.SSSZ"),
XEP_0091_DATETIME("yyyyMMdd'T'HH:mm:ss"); XEP_0091_DATETIME("yyyyMMdd'T'HH:mm:ss");
// @formatter:on
private String formatString; private String formatString;
private DateFormatType(String dateFormat) private DateFormatType(String dateFormat) {
{
formatString = dateFormat; formatString = dateFormat;
} }
/** /**
* Get the format string as defined in either XEP-0082 or XEP-0091. * Get the format string as defined in either XEP-0082 or XEP-0091.
*
* @return The defined string format for the date. * @return The defined string format for the date.
*/ */
public String getFormatString() public String getFormatString() {
{
return formatString; return formatString;
} }
/** /**
* Create a {@link SimpleDateFormat} object with the format defined by {@link #getFormatString()}. * Create a {@link SimpleDateFormat} object with the format defined by {@link #getFormatString()}.
*
* @return A new date formatter. * @return A new date formatter.
*/ */
public SimpleDateFormat createFormatter() public SimpleDateFormat createFormatter() {
{
return new SimpleDateFormat(getFormatString()); return new SimpleDateFormat(getFormatString());
} }
} }

37
test-unit/org/jivesoftware/smack/TestUtils.java
View file

@ -3,7 +3,7 @@
* $Revision$ * $Revision$
* $Date$ * $Date$
* *
* Copyright 2003-2007 Jive Software. * Copyright 2013 Robin Collier
* *
* All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); * All rights reserved. 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.
@ -26,49 +26,40 @@ import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
final public class TestUtils final public class TestUtils {
{ private TestUtils() {
private TestUtils() {} }
public static XmlPullParser getIQParser(String stanza) public static XmlPullParser getIQParser(String stanza) {
{
return getParser(stanza, "iq"); return getParser(stanza, "iq");
} }
public static XmlPullParser getMessageParser(String stanza) public static XmlPullParser getMessageParser(String stanza) {
{
return getParser(stanza, "message"); return getParser(stanza, "message");
} }
public static XmlPullParser getPresenceParser(String stanza) public static XmlPullParser getPresenceParser(String stanza) {
{
return getParser(stanza, "presence"); return getParser(stanza, "presence");
} }
public static XmlPullParser getParser(String stanza, String startTag) public static XmlPullParser getParser(String stanza, String startTag) {
{
XmlPullParser parser = new MXParser(); XmlPullParser parser = new MXParser();
try try {
{
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
parser.setInput(new StringReader(stanza)); parser.setInput(new StringReader(stanza));
boolean found = false; boolean found = false;
while (!found) while (!found) {
{
if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag)) if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag))
found = true; found = true;
} }
if (!found) if (!found)
throw new IllegalArgumentException("Cannot parse start tag [" + startTag + "] from stanze [" + stanza + "]"); throw new IllegalArgumentException("Cannot parse start tag [" + startTag + "] from stanza [" + stanza
} + "]");
catch (XmlPullParserException e) } catch (XmlPullParserException e) {
{
throw new RuntimeException(e); throw new RuntimeException(e);
} } catch (IOException e) {
catch (IOException e)
{
throw new RuntimeException(e); throw new RuntimeException(e);
} }
return parser; return parser;