From 302f9a4778e62c24162a48346e6bb7e43148df9c Mon Sep 17 00:00:00 2001
From: Matt Tucker <matt@jivesoftware.com>
Date: Tue, 17 Jun 2003 20:22:43 +0000
Subject: [PATCH] Code cleanup.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1965 b35dd754-fafc-0310-a699-88a17e54d16e
---
 .../org/jivesoftware/smack/PacketReader.java  | 16 ++++++------
 source/org/jivesoftware/smack/Roster.java     |  5 ----
 .../smack/packet/RosterPacket.java            | 26 +++++++++++++------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/source/org/jivesoftware/smack/PacketReader.java b/source/org/jivesoftware/smack/PacketReader.java
index f744a0a37..0661c8b98 100644
--- a/source/org/jivesoftware/smack/PacketReader.java
+++ b/source/org/jivesoftware/smack/PacketReader.java
@@ -433,16 +433,16 @@ class PacketReader {
                 if (parser.getName().equals("item")) {
                     String jid = parser.getAttributeValue("", "jid");
                     String name = parser.getAttributeValue("", "name");
-                    String subscription = parser.getAttributeValue("", "subscription");
-                    String ask = parser.getAttributeValue("", "ask");
+                    // Create packet.
                     item = new RosterPacket.Item(jid, name);
+                    // Set status.
+                    String ask = parser.getAttributeValue("", "ask");
+                    RosterPacket.ItemStatus status = RosterPacket.ItemStatus.fromString(ask);
+                    item.setItemStatus(status);
+                    // Set type.
+                    String subscription = parser.getAttributeValue("", "subscription");
                     RosterPacket.ItemType type = RosterPacket.ItemType.fromString(subscription);
-                    if (type == RosterPacket.ItemType.NONE && "subscribe".equals(ask)) {
-                        item.setItemType(RosterPacket.ItemType.PENDING);
-                    }
-                    else {
-                        item.setItemType(type);
-                    }
+                    item.setItemType(type);
                 }
                 if (parser.getName().equals("group")) {
                     String groupName = parser.nextText();
diff --git a/source/org/jivesoftware/smack/Roster.java b/source/org/jivesoftware/smack/Roster.java
index 5a4c85bd2..8b9f846f1 100644
--- a/source/org/jivesoftware/smack/Roster.java
+++ b/source/org/jivesoftware/smack/Roster.java
@@ -364,11 +364,6 @@ public class Roster {
             RosterPacket rosterPacket = (RosterPacket)packet;
             for (Iterator i=rosterPacket.getRosterItems(); i.hasNext(); ) {
                 RosterPacket.Item item = (RosterPacket.Item)i.next();
-                if (item.getItemType() == RosterPacket.ItemType.TO ||
-                        item.getItemType() == RosterPacket.ItemType.BOTH)
-                {
-
-                }
                 RosterEntry entry = new RosterEntry(item.getUser(), item.getName(),
                         item.getItemType(), connection);
                 // If the roster entry has any groups, remove it from the list of unfiled
diff --git a/source/org/jivesoftware/smack/packet/RosterPacket.java b/source/org/jivesoftware/smack/packet/RosterPacket.java
index 853820d00..cb818e81e 100644
--- a/source/org/jivesoftware/smack/packet/RosterPacket.java
+++ b/source/org/jivesoftware/smack/packet/RosterPacket.java
@@ -181,6 +181,24 @@ public class RosterPacket extends IQ {
             this.itemType = itemType;
         }
 
+        /**
+         * Returns the roster item status.
+         *
+         * @return the roster item status.
+         */
+        public ItemStatus getItemStatus() {
+            return itemStatus;
+        }
+
+        /**
+         * Sets the roster item status.
+         *
+         * @param itemStatus the roster item status.
+         */
+        public void setItemStatus(ItemStatus itemStatus) {
+            this.itemStatus = itemStatus;
+        }
+
         /**
          * Returns an Iterator for the group names (as Strings) that the roster item
          * belongs to.
@@ -295,11 +313,6 @@ public class RosterPacket extends IQ {
          */
         public static final ItemType NONE = new ItemType("none");
 
-        /**
-         * The subscription request is pending.
-         */
-        public static final ItemType PENDING = new ItemType("pending");
-
         /**
          * The user is interested in receiving presence updates from the subscriber.
          */
@@ -319,9 +332,6 @@ public class RosterPacket extends IQ {
             if ("none".equals(value)) {
                 return NONE;
             }
-            if ("pending".equals(value)) {
-                return PENDING;
-            }
             else if ("to".equals(value)) {
                 return TO;
             }