From 3d5c656e1f1a302d264a9ee500c3cf36312a4cbd Mon Sep 17 00:00:00 2001 From: Matt Tucker Date: Fri, 7 Mar 2003 19:47:08 +0000 Subject: [PATCH] Renamed class. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1841 b35dd754-fafc-0310-a699-88a17e54d16e --- .../org/jivesoftware/smack/packet/Error.java | 141 ------------------ source/org/jivesoftware/smack/packet/IQ.java | 2 +- .../jivesoftware/smack/packet/Message.java | 4 +- .../org/jivesoftware/smack/packet/Packet.java | 6 +- 4 files changed, 6 insertions(+), 147 deletions(-) delete mode 100644 source/org/jivesoftware/smack/packet/Error.java diff --git a/source/org/jivesoftware/smack/packet/Error.java b/source/org/jivesoftware/smack/packet/Error.java deleted file mode 100644 index b93b59251..000000000 --- a/source/org/jivesoftware/smack/packet/Error.java +++ /dev/null @@ -1,141 +0,0 @@ -/** - * $RCSfile$ - * $Revision$ - * $Date$ - * - * Copyright (C) 2002-2003 Jive Software. All rights reserved. - * ==================================================================== - * The Jive Software License (based on Apache Software License, Version 1.1) - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by - * Jive Software (http://www.jivesoftware.com)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Smack" and "Jive Software" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please - * contact webmaster@jivesoftware.com. - * - * 5. Products derived from this software may not be called "Smack", - * nor may "Smack" appear in their name, without prior written - * permission of Jive Software. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL JIVE SOFTWARE OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - */ - -package org.jivesoftware.smack.packet; - -/** - * Represents a XMPP error subpacket. Typically, a server responds to a request that has - * problems by sending the packet back and including an error packet. Each error has a code - * as well as as an optional text explanation. Typical error codes are as follows: - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
CodeDescription
302 Redirect
400 Bad Request
401 Unauthorized
402 Payment Required
403 Forbidden
404 Not Found
405 Not Allowed
406 Not Acceptable
407 Registration Required
408 Request Timeout
409 Conflict
500 Internal Server Error
501 Not Implemented
502 Remote Server Error
503 Service Unavailable
504 Remote Server Timeout
- * - * @author Matt Tucker - */ -public class Error { - - private int code; - private String message; - - /** - * Creates a new error with the specified code and no message.. - * - * @param code the error code. - */ - public Error (int code) { - this.code = code; - this.message = null; - } - - /** - * Creates a new error with the specified code and message. - * - * @param code the error code. - * @param message a message describing the error. - */ - public Error(int code, String message) { - this.code = code; - this.message = message; - } - - /** - * Returns the error code. - * - * @return the error code. - */ - public int getCode() { - return code; - } - - /** - * Returns the message describing the error, or null if there is no message. - * - * @return the message describing the error, or null if there is no message. - */ - public String getMessage() { - return message; - } - - /** - * Returns the error as XML. - * - * @return the error as XML. - */ - public String toXML() { - StringBuffer buf = new StringBuffer(); - buf.append(""); - buf.append("").append(code).append(""); - if (message != null) { - buf.append("").append(message).append(""); - } - buf.append(""); - return buf.toString(); - } -} diff --git a/source/org/jivesoftware/smack/packet/IQ.java b/source/org/jivesoftware/smack/packet/IQ.java index eca37dd02..f5182a458 100644 --- a/source/org/jivesoftware/smack/packet/IQ.java +++ b/source/org/jivesoftware/smack/packet/IQ.java @@ -113,7 +113,7 @@ public class IQ extends Packet { buf.append(propertiesXML); } // Add the error sub-packet, if there is one. - Error error = getError(); + XMPPError error = getError(); if (error != null) { buf.append(error.toXML()); } diff --git a/source/org/jivesoftware/smack/packet/Message.java b/source/org/jivesoftware/smack/packet/Message.java index ef91652df..31500b912 100644 --- a/source/org/jivesoftware/smack/packet/Message.java +++ b/source/org/jivesoftware/smack/packet/Message.java @@ -69,7 +69,7 @@ import org.jivesoftware.smack.util.StringUtils; *

* * - * + * * * * @@ -230,7 +230,7 @@ public class Message extends Packet { } // Append the error subpacket if the message type is an error. if (type == ERROR) { - Error error = getError(); + XMPPError error = getError(); if (error != null) { buf.append(error.toXML()); } diff --git a/source/org/jivesoftware/smack/packet/Packet.java b/source/org/jivesoftware/smack/packet/Packet.java index 2821af712..04e763dc7 100644 --- a/source/org/jivesoftware/smack/packet/Packet.java +++ b/source/org/jivesoftware/smack/packet/Packet.java @@ -96,7 +96,7 @@ public abstract class Packet { private String to = null; private String from = null; private Map properties = null; - private Error error = null; + private XMPPError error = null; /** * Returns the unique ID of the packet. @@ -167,7 +167,7 @@ public abstract class Packet { * * @return the error sub-packet or null if there isn't an error. */ - public Error getError() { + public XMPPError getError() { return error; } @@ -176,7 +176,7 @@ public abstract class Packet { * * @param error the error to associate with this packet. */ - public void setError(Error error) { + public void setError(XMPPError error) { this.error = error; }
 Message type
FieldNormalChatGroup ChatHeadlineError
FieldNormalChatGroup ChatHeadlineXMPPError
subject SHOULDSHOULD NOTSHOULD NOTSHOULD NOTSHOULD NOT
thread OPTIONALSHOULDOPTIONALOPTIONALSHOULD NOT
body SHOULDSHOULDSHOULDSHOULDSHOULD NOT