vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

SMACK-391 Reformat some new files to Smack standard 

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

91
source/org/jivesoftware/smack/util/DateFormatType.java
View File

@ -17,48 +17,49 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smack.util; package org.jivesoftware.smack.util;
import java.text.SimpleDateFormat; 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 {
XEP_0082_DATE_PROFILE("yyyy-MM-dd"), // @formatter:off
XEP_0082_DATETIME_PROFILE("yyyy-MM-dd'T'HH:mm:ssZ"), XEP_0082_DATE_PROFILE("yyyy-MM-dd"),
XEP_0082_DATETIME_MILLIS_PROFILE("yyyy-MM-dd'T'HH:mm:ss.SSSZ"), XEP_0082_DATETIME_PROFILE("yyyy-MM-dd'T'HH:mm:ssZ"),
XEP_0082_TIME_PROFILE("hh:mm:ss"), XEP_0082_DATETIME_MILLIS_PROFILE("yyyy-MM-dd'T'HH:mm:ss.SSSZ"),
XEP_0082_TIME_ZONE_PROFILE("hh:mm:ssZ"), XEP_0082_TIME_PROFILE("hh:mm:ss"),
XEP_0082_TIME_MILLIS_PROFILE("hh:mm:ss.SSS"), XEP_0082_TIME_ZONE_PROFILE("hh:mm:ssZ"),
XEP_0082_TIME_MILLIS_ZONE_PROFILE("hh:mm:ss.SSSZ"), XEP_0082_TIME_MILLIS_PROFILE("hh:mm:ss.SSS"),
XEP_0091_DATETIME("yyyyMMdd'T'HH:mm:ss"); XEP_0082_TIME_MILLIS_ZONE_PROFILE("hh:mm:ss.SSSZ"),
XEP_0091_DATETIME("yyyyMMdd'T'HH:mm:ss");
private String formatString; // @formatter:on
private DateFormatType(String dateFormat) private String formatString;
{
formatString = dateFormat; private DateFormatType(String dateFormat) {
} formatString = dateFormat;
}
/**
* Get the format string as defined in either XEP-0082 or XEP-0091. /**
* @return The defined string format for the date. * Get the format string as defined in either XEP-0082 or XEP-0091.
*/ *
public String getFormatString() * @return The defined string format for the date.
{ */
return formatString; public String getFormatString() {
} return formatString;
}
/**
* Create a {@link SimpleDateFormat} object with the format defined by {@link #getFormatString()}. /**
* @return A new date formatter. * Create a {@link SimpleDateFormat} object with the format defined by {@link #getFormatString()}.
*/ *
public SimpleDateFormat createFormatter() * @return A new date formatter.
{ */
return new SimpleDateFormat(getFormatString()); public SimpleDateFormat createFormatter() {
} return new SimpleDateFormat(getFormatString());
} }
}

109
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.
@ -17,61 +17,52 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.jivesoftware.smack; package org.jivesoftware.smack;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import org.xmlpull.mxp1.MXParser; 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) {
return getParser(stanza, "presence");
public static XmlPullParser getPresenceParser(String stanza) }
{
return getParser(stanza, "presence"); public static XmlPullParser getParser(String stanza, String startTag) {
} XmlPullParser parser = new MXParser();
try {
public static XmlPullParser getParser(String stanza, String startTag) parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true);
{ parser.setInput(new StringReader(stanza));
XmlPullParser parser = new MXParser(); boolean found = false;
try
{ while (!found) {
parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true); if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag))
parser.setInput(new StringReader(stanza)); found = true;
boolean found = false; }
while (!found) if (!found)
{ throw new IllegalArgumentException("Cannot parse start tag [" + startTag + "] from stanza [" + stanza
if ((parser.next() == XmlPullParser.START_TAG) && parser.getName().equals(startTag)) + "]");
found = true; } catch (XmlPullParserException e) {
} throw new RuntimeException(e);
} catch (IOException e) {
if (!found) throw new RuntimeException(e);
throw new IllegalArgumentException("Cannot parse start tag [" + startTag + "] from stanze [" + stanza + "]"); }
} return parser;
catch (XmlPullParserException e) }
{
throw new RuntimeException(e); }
}
catch (IOException e)
{
throw new RuntimeException(e);
}
return parser;
}
}