Code cleanup: unused imports, values, blocks, etc.

core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java

@@ -2,10 +2,6 @@ package org.jivesoftware.smack.initializer;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;

core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java

@@ -21,9 +21,12 @@ import java.io.IOException;
  * 
  * @author Atul Aggarwal
  */
-public class ProxyException 
+public class ProxyException extends IOException {
-    extends IOException
+    /**
-{
+     * 
+     */
+    private static final long serialVersionUID = 1L;
+
     public ProxyException(ProxyInfo.ProxyType type, String ex, Throwable cause)
     {
         super("Proxy Exception " + type.toString() + " : "+ex+", "+cause);

core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java

@@ -74,7 +74,6 @@ public class Socks4ProxySocketFactory
         String proxy_host = proxy.getProxyAddress();
         int proxy_port = proxy.getProxyPort();
         String user = proxy.getProxyUsername();
-        String passwd = proxy.getProxyPassword();
 
         try
         {

core/src/main/java/org/jivesoftware/smack/util/Base64.java

@@ -461,7 +461,6 @@ public class Base64
 
         // Isolate options
         int gzip           = (options & GZIP);
-        int dontBreakLines = (options & DONT_BREAK_LINES);
 
         try
         {
@@ -1220,9 +1219,8 @@ public class Base64
         private int     numSigBytes;    // Number of meaningful bytes in the buffer
         private int     lineLength;
         private boolean breakLines;     // Break lines at less than 80 characters
-		private int     options;        // Record options used to create the stream.
+        private int options; // Record options used to create the stream.
-		private byte[]  alphabet;	    // Local copies to avoid extra method calls
+        private byte[] decodabet; // Local copies to avoid extra method calls
-		private byte[]  decodabet;		// Local copies to avoid extra method calls
 
 
         /**
@@ -1267,9 +1265,8 @@ public class Base64
             this.buffer       = new byte[ bufferLength ];
             this.position     = -1;
             this.lineLength   = 0;
-			this.options      = options; // Record for later, mostly to determine which alphabet to use
+            this.options = options; // Record for later, mostly to determine which alphabet to use
-			this.alphabet     = getAlphabet(options);
+            this.decodabet = getDecodabet(options);
-			this.decodabet    = getDecodabet(options);
         }   // end constructor
 
         /**
@@ -1457,9 +1454,8 @@ public class Base64
         private boolean breakLines;
         private byte[]  b4; // Scratch used in a few places
         private boolean suspendEncoding;
-		private int options; // Record for later
+        private int options; // Record for later
-		private byte[]  alphabet;	    // Local copies to avoid extra method calls
+        private byte[] decodabet; // Local copies to avoid extra method calls
-		private byte[]  decodabet;		// Local copies to avoid extra method calls
 
         /**
          * Constructs a {@link Base64.OutputStream} in ENCODE mode.
@@ -1504,9 +1500,8 @@ public class Base64
             this.lineLength   = 0;
             this.suspendEncoding = false;
             this.b4           = new byte[4];
-			this.options      = options;
+            this.options = options;
-			this.alphabet     = getAlphabet(options);
+            this.decodabet = getDecodabet(options);
-			this.decodabet    = getDecodabet(options);
         }   // end constructor
 
 

core/src/main/java/org/jivesoftware/smack/util/Cache.java

@@ -253,6 +253,7 @@ public class Cache<K, V> implements Map<K, V> {
         return map.containsKey(key);
     }
 
+    @SuppressWarnings("unchecked")
     public void putAll(Map<? extends K, ? extends V> map) {
         for (Entry<? extends K, ? extends V> entry : map.entrySet()) {
             V value = entry.getValue();
@@ -273,6 +274,7 @@ public class Cache<K, V> implements Map<K, V> {
         deleteExpiredEntries();
 
         //noinspection unchecked
+        @SuppressWarnings("unchecked")
         CacheObject<V> cacheObject = new CacheObject<V>((V) value);
 
         return map.containsValue(cacheObject);
@@ -454,6 +456,7 @@ public class Cache<K, V> implements Map<K, V> {
         /**
          * A count of the number of times the object has been read from cache.
          */
+        @SuppressWarnings("unused")
         public int readCount = 0;
 
         /**
@@ -509,6 +512,7 @@ public class Cache<K, V> implements Map<K, V> {
          *
          * @return the first element of the list.
          */
+        @SuppressWarnings("unused")
         public LinkedListNode getFirst() {
             LinkedListNode node = head.next;
             if (node == head) {
@@ -565,6 +569,7 @@ public class Cache<K, V> implements Map<K, V> {
          * @param object the object to add to the end of the list.
          * @return the node created to wrap the object.
          */
+        @SuppressWarnings("unused")
         public LinkedListNode addLast(Object object) {
             LinkedListNode node = new LinkedListNode(object, head, head.previous);
             node.previous.next = node;

extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java

@@ -43,7 +43,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
 
 /**
  * An AdHocCommandManager is responsible for keeping the list of available

extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java

@@ -33,7 +33,6 @@ public class DiscoverInfoProvider implements IQProvider {
     public IQ parseIQ(XmlPullParser parser) throws Exception {
         DiscoverInfo discoverInfo = new DiscoverInfo();
         boolean done = false;
-        DiscoverInfo.Feature feature = null;
         DiscoverInfo.Identity identity = null;
         String category = "";
         String name = "";

extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java

@@ -23,7 +23,6 @@ import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketInterceptor;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.Packet;
@@ -56,7 +55,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.WeakHashMap;

extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java

@@ -17,7 +17,12 @@
 
 package org.jivesoftware.smackx.iqlast;
 
-import org.jivesoftware.smack.*;
+import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.ConnectionCreationListener;
+import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.PacketListener;
+import org.jivesoftware.smack.SmackConfiguration;
+import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.filter.AndFilter;
 import org.jivesoftware.smack.filter.IQTypeFilter;
 import org.jivesoftware.smack.filter.PacketIDFilter;
@@ -113,6 +118,8 @@ public class LastActivityManager {
                     // We assume that only a switch to available and chat indicates user activity
                     // since other mode changes could be also a result of some sort of automatism
                     resetIdleTime();
+                default:
+                    break;
                 }
             }
         }, new PacketTypeFilter(Presence.class));

extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java

@@ -32,13 +32,6 @@ import org.jivesoftware.smack.packet.Packet;
  * @author Larry Kirschner
  */
 class ConnectionDetachedPacketCollector {
-    /**
-     * Max number of packets that any one collector can hold. After the max is
-     * reached, older packets will be automatically dropped from the queue as
-     * new packets are added.
-     */
-    private int maxPackets = SmackConfiguration.getPacketCollectorSize();
-
     private ArrayBlockingQueue<Packet> resultQueue;
 
     /**

extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java

@@ -21,8 +21,6 @@ import org.jivesoftware.smackx.disco.packet.DiscoverInfo;
 import org.jivesoftware.smackx.xdata.Form;
 import org.jivesoftware.smackx.xdata.FormField;
 
-import java.util.Iterator;
-
 /**
  * Represents the room information that was discovered using Service Discovery. It's possible to
  * obtain information about a room before joining the room but only for rooms that are public (i.e.

extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java

@@ -24,7 +24,7 @@ import java.util.List;
  */
 public class AffiliationsExtension extends NodeExtension
 {
-	protected List<Affiliation> items = Collections.EMPTY_LIST;
+	protected List<Affiliation> items = Collections.emptyList();
 	
 	public AffiliationsExtension()
 	{

extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java

@@ -49,7 +49,7 @@ public class ConfigurationEvent extends NodeExtension implements EmbeddedPacketE
 	public List<PacketExtension> getExtensions()
 	{
 		if (getConfiguration() == null)
-			return Collections.EMPTY_LIST;
+			return Collections.emptyList();
 		else
 			return Arrays.asList(((PacketExtension)getConfiguration().getDataFormToSend()));
 	}

extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java

@@ -23,7 +23,7 @@ import java.util.List;
  */
 public class ItemDeleteEvent extends SubscriptionEvent
 {
-	private List<String> itemIds = Collections.EMPTY_LIST;
+	private List<String> itemIds = Collections.emptyList();
 	
 	/**
 	 * Constructs an <tt>ItemDeleteEvent</tt> that indicates the the supplied

extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java

@@ -124,6 +124,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten
 		return type;
 	}
 	
+	@SuppressWarnings("unchecked")
 	public List<PacketExtension> getExtensions()
 	{
 		return (List<PacketExtension>)getItems();

extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java

@@ -63,6 +63,7 @@ public class LeafNode extends Node
 	 * 
 	 * @throws XMPPException
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> List<T> getItems()
 		throws XMPPException
 	{
@@ -84,6 +85,7 @@ public class LeafNode extends Node
 	 * 
 	 * @throws XMPPException
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> List<T> getItems(String subscriptionId)
 		throws XMPPException
 	{
@@ -107,6 +109,7 @@ public class LeafNode extends Node
 	 * 
 	 * @throws XMPPException
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> List<T> getItems(Collection<String> ids)
 		throws XMPPException
 	{
@@ -132,6 +135,7 @@ public class LeafNode extends Node
 	 * 
 	 * @throws XMPPException
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> List<T> getItems(int maxItems)
 		throws XMPPException
 	{
@@ -154,6 +158,7 @@ public class LeafNode extends Node
 	 * 
 	 * @throws XMPPException
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> List<T> getItems(int maxItems, String subscriptionId)
 		throws XMPPException
 	{
@@ -198,6 +203,7 @@ public class LeafNode extends Node
 	 * 
 	 * @param item - The item being sent
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> void publish(T item)
 	{
 		Collection<T> items = new ArrayList<T>(1);
@@ -268,6 +274,7 @@ public class LeafNode extends Node
 	 * 
 	 * @throws XMPPException
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Item> void send(T item)
 		throws XMPPException
 	{

extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java

@@ -149,6 +149,7 @@ final public class PubSubManager
 	 * @return the node
 	 * @throws XMPPException The node does not exist
 	 */
+	@SuppressWarnings("unchecked")
 	public <T extends Node> T getNode(String id)
 		throws XMPPException
 	{

extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java

@@ -14,7 +14,6 @@
 package org.jivesoftware.smackx.pubsub;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;

extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java

@@ -23,7 +23,7 @@ import java.util.List;
  */
 abstract public class SubscriptionEvent extends NodeEvent
 {
-	private List<String> subIds = Collections.EMPTY_LIST;
+	private List<String> subIds = Collections.emptyList();
 
 	/**
 	 * Construct an event with no subscription id's.  This can 

extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java

@@ -23,7 +23,7 @@ import java.util.List;
  */
 public class SubscriptionsExtension extends NodeExtension
 {
-	protected List<Subscription> items = Collections.EMPTY_LIST;
+	protected List<Subscription> items = Collections.emptyList();
 	
 	/**
 	 * Subscriptions to the root node

extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java

@@ -29,6 +29,7 @@ import org.jivesoftware.smackx.pubsub.AffiliationsExtension;
  * @author Robin Collier
  */public class AffiliationsProvider extends EmbeddedExtensionProvider
 {
+	@SuppressWarnings("unchecked")
 	@Override
 	protected PacketExtension createReturnExtension(String currentElement, String currentNamespace, Map<String, String> attributeMap, List<? extends PacketExtension> content)
 	{

extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java

@@ -29,6 +29,7 @@ import org.jivesoftware.smackx.pubsub.SubscriptionsExtension;
  */
 public class SubscriptionsProvider extends EmbeddedExtensionProvider
 {
+	@SuppressWarnings("unchecked")
 	@Override
 	protected PacketExtension createReturnExtension(String currentElement, String currentNamespace, Map<String, String> attributeMap, List<? extends PacketExtension> content)
 	{

extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java

@@ -30,7 +30,7 @@ public class HeadersExtension implements PacketExtension
 {
 	public static final String NAMESPACE = "http://jabber.org/protocol/shim";
 	
-	private Collection<Header> headers = Collections.EMPTY_LIST;
+	private Collection<Header> headers = Collections.emptyList();
 	
 	public HeadersExtension(Collection<Header> headerList)
 	{

extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java

@@ -29,6 +29,7 @@ import org.jivesoftware.smackx.shim.packet.HeadersExtension;
  */
 public class HeadersProvider extends EmbeddedExtensionProvider
 {
+	@SuppressWarnings("unchecked")
 	@Override
 	protected PacketExtension createReturnExtension(String currentElement, String currentNamespace, Map<String, String> attributeMap, List<? extends PacketExtension> content)
 	{

extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java

@@ -98,7 +98,7 @@ public class StreamInitiationProvider implements IQProvider {
                     Date fileDate = new Date();
                     if (date != null) {
                         try {
-                            fileDate = StringUtils.parseXEP0082Date(date);
+                            fileDate = StringUtils.parseDate(date);
                         } catch (ParseException e) {
                             // couldn't parse date, use current date-time
                         }

extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java

@@ -42,7 +42,6 @@ public class DataFormProvider implements PacketExtensionProvider {
 
     public PacketExtension parseExtension(XmlPullParser parser) throws Exception {
         boolean done = false;
-        StringBuilder buffer = null;
         DataForm dataForm = new DataForm(parser.getAttributeValue("", "type"));
         while (!done) {
             int eventType = parser.next();