Fixes for compiler warnings

9 files changed, 27 insertions, 47 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
index c030ba2b7..4fcb034e5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
@@ -14,9 +14,7 @@ import java.util.Map;
 
 import javax.security.auth.callback.Callback;
 
-import org.eclipse.ecf.core.ISharedObjectContainer;
 import org.eclipse.ecf.core.SharedObjectAddException;
-import org.eclipse.ecf.core.SharedObjectContainerInstantiationException;
 import org.eclipse.ecf.core.SharedObjectContainerJoinException;
 import org.eclipse.ecf.core.comm.AsynchConnectionEvent;
 import org.eclipse.ecf.core.comm.ConnectionInstantiationException;
@@ -37,7 +35,6 @@ import org.eclipse.ecf.presence.IPresence;
 import org.eclipse.ecf.presence.IPresenceContainer;
 import org.eclipse.ecf.presence.IPresenceListener;
 import org.eclipse.ecf.presence.IPresenceSender;
-import org.eclipse.ecf.presence.ISharedObjectMessageListener;
 import org.eclipse.ecf.presence.ISubscribeListener;
 import org.eclipse.ecf.presence.IMessageListener.Type;
 import org.eclipse.ecf.provider.generic.ClientSOContainer;
@@ -123,7 +120,6 @@ public class XMPPClientSOContainer extends ClientSOContainer {
 
 	protected ISynchAsynchConnection makeConnection(ID remoteSpace,
 			Object data) throws ConnectionInstantiationException {
-		Object[] args = { new Integer(keepAlive) };
 		ISynchAsynchConnection conn = null;
 		conn = new ChatConnection(receiver);
 		Object res = conn.getAdapter(IIMMessageSender.class);
@@ -244,20 +240,20 @@ public class XMPPClientSOContainer extends ClientSOContainer {
 		synchronized (getConnectLock()) {
 			// If we are currently connected
 			if (isConnected()) {
-				ISynchAsynchConnection connection = getConnection();
-				synchronized (connection) {
+				ISynchAsynchConnection conn = getConnection();
+				synchronized (conn) {
 					synchronized (getGroupMembershipLock()) {
 						memberLeave(groupID, null);
 					}
 					try {
-						connection.disconnect();
+						conn.disconnect();
 					} catch (IOException e) {
 						dumpStack("Exception disconnecting", e);
 					}
 				}
 			}
 			connectionState = UNCONNECTED;
-			connection = null;
+			this.connection = null;
 			remoteServerID = null;
 		}
 		// notify listeners
@@ -265,17 +261,16 @@ public class XMPPClientSOContainer extends ClientSOContainer {
 				groupID));
 	}
 
-	protected SOContext makeSharedObjectContext(SOConfig config,
+	protected SOContext makeSharedObjectContext(SOConfig soconfig,
 			IQueueEnqueue queue) {
-		return new XMPPContainerContext(config.getSharedObjectID(), config
-				.getHomeContainerID(), this, config.getProperties(), queue);
+		return new XMPPContainerContext(soconfig.getSharedObjectID(), soconfig
+				.getHomeContainerID(), this, soconfig.getProperties(), queue);
 	}
 
 	protected void processAsynch(AsynchConnectionEvent e) {
 		try {
 			if (e instanceof ChatConnectionPacketEvent) {
 				// It's a regular message...just print for now
-				ChatConnectionPacketEvent evt = (ChatConnectionPacketEvent) e;
 				Packet chatMess = (Packet) e.getData();
 				handleXMPPMessage(chatMess);
 				return;
@@ -286,7 +281,6 @@ public class XMPPClientSOContainer extends ClientSOContainer {
 				Object cm = deserializeContainerMessage((byte[]) obj);
                 if (cm == null) throw new IOException("deserialized object is null");
 				ContainerMessage contMessage = (ContainerMessage) cm;
-				Object cmdata = contMessage.getData();
 				handleContainerMessage(contMessage);
 			} else {
 				// Unexpected type...
@@ -339,10 +333,6 @@ public class XMPPClientSOContainer extends ClientSOContainer {
                     sharedObject.addMessageListener(listener);
                 }
 
-                public void addSharedObjectMessageListener(ISharedObjectMessageListener listener) {
-                    sharedObject.addSharedObjectMessageListener(listener);
-                }
-
                 public IMessageSender getMessageSender() {
                     return new IMessageSender() {
 
@@ -420,10 +410,6 @@ public class XMPPClientSOContainer extends ClientSOContainer {
 						}
 					};
 				}
-                public ISharedObjectContainer makeSharedObjectContainer(Class[] types, Object[] args) throws SharedObjectContainerInstantiationException {
-                    return null;
-                }
-
 				public void addSubscribeListener(ISubscribeListener listener) {
 					sharedObject.addSubscribeListener(listener);
 				}
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
index 83211f9c5..e07484766 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
@@ -146,9 +146,9 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer {
         String password = "";
         try {
             addSharedObjectToContainer(remote);
-            IGroupChatContainerConfig config = getGroupChatConfig();
-            nickname = config.getNickname();
-            password = config.getPassword();
+            IGroupChatContainerConfig soconfig = getGroupChatConfig();
+            nickname = soconfig.getNickname();
+            password = soconfig.getPassword();
             multiuserchat.join(nickname,password);
         } catch (XMPPException e) {
             cleanUpConnectFail();
@@ -170,20 +170,20 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer {
         synchronized (getConnectLock()) {
             // If we are currently connected
             if (isConnected()) {
-                ISynchAsynchConnection connection = getConnection();
-                synchronized (connection) {
+                ISynchAsynchConnection conn = getConnection();
+                synchronized (conn) {
                     synchronized (getGroupMembershipLock()) {
                         memberLeave(groupID, null);
                     }
                     try {
-                        connection.disconnect();
+                    	conn.disconnect();
                     } catch (IOException e) {
                         dumpStack("Exception disconnecting", e);
                     }
                 }
             }
             connectionState = UNCONNECTED;
-            connection = null;
+            this.connection = null;
             remoteServerID = null;
         }
         // notify listeners
@@ -191,17 +191,16 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer {
                 groupID));
     }
 
-    protected SOContext makeSharedObjectContext(SOConfig config,
+    protected SOContext makeSharedObjectContext(SOConfig soconfig,
             IQueueEnqueue queue) {
-        return new XMPPContainerContext(config.getSharedObjectID(), config
-                .getHomeContainerID(), this, config.getProperties(), queue);
+        return new XMPPContainerContext(soconfig.getSharedObjectID(), soconfig
+                .getHomeContainerID(), this, soconfig.getProperties(), queue);
     }
 
     protected void processAsynch(AsynchConnectionEvent e) {
         try {
             if (e instanceof ChatConnectionPacketEvent) {
                 // It's a regular message...just print for now
-                ChatConnectionPacketEvent evt = (ChatConnectionPacketEvent) e;
                 Packet chatMess = (Packet) e.getData();
                 handleXMPPMessage(chatMess);
                 return;
@@ -213,7 +212,6 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer {
                 if (cm == null)
                     throw new IOException("deserialized object is null");
                 ContainerMessage contMessage = (ContainerMessage) cm;
-                Object cmdata = contMessage.getData();
                 handleContainerMessage(contMessage);
             } else {
                 // Unexpected type...
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java
index 13a3cb2af..f91221559 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPPresenceSharedObject.java
@@ -301,11 +301,6 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
     protected void handlePresenceEvent(PresenceEvent evt) {
         Presence xmppPresence = evt.getPresence();
         String from = canonicalizePresenceFrom(xmppPresence.getFrom());
-        String to = xmppPresence.getTo();
-        Mode mode = xmppPresence.getMode();
-        Type type = xmppPresence.getType();
-        int priority = xmppPresence.getPriority();
-        String status = xmppPresence.getStatus();
         IPresence newPresence = makeIPresence(xmppPresence);
         ID fromID = makeIDFromName(from);
 		if (newPresence.getType().equals(IPresence.Type.SUBSCRIBE) || 
@@ -378,8 +373,6 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
     }
 
     protected IPresence makeIPresence(Presence xmppPresence) {
-        Mode mode = xmppPresence.getMode();
-        Type type = xmppPresence.getType();
         int priority = xmppPresence.getPriority();
         String status = xmppPresence.getStatus();
         IPresence newPresence = new org.eclipse.ecf.presence.impl.Presence(
@@ -389,8 +382,6 @@ public class XMPPPresenceSharedObject implements ISharedObject, IAccountManager
     }
 
     protected Presence makePresence(IPresence ipresence) {
-        IPresence.Mode mode = ipresence.getMode();
-        IPresence.Type type = ipresence.getType();
         int priority = ipresence.getPriority();
         String status = ipresence.getStatus();
         Presence newPresence = new Presence(
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/IQEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/IQEvent.java
index 54b26771a..e491f2724 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/IQEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/IQEvent.java
@@ -17,7 +17,8 @@ import org.jivesoftware.smack.packet.IQ;
  */
 public class IQEvent implements Event {
     
-    protected IQ iq = null;
+	private static final long serialVersionUID = 8136148813492923513L;
+	protected IQ iq = null;
     
     public IQEvent(IQ iq) {
         this.iq = iq;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/MessageEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/MessageEvent.java
index 7dd1205bd..b57463989 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/MessageEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/MessageEvent.java
@@ -17,7 +17,8 @@ import org.jivesoftware.smack.packet.Message;
  */
 public class MessageEvent implements Event {
     
-    protected Message message = null;
+	private static final long serialVersionUID = 6940577888021931351L;
+	protected Message message = null;
     
     public MessageEvent(Message message) {
         this.message = message;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/PresenceEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/PresenceEvent.java
index f379019aa..876ffe01b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/PresenceEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/events/PresenceEvent.java
@@ -17,7 +17,8 @@ import org.jivesoftware.smack.packet.Presence;
  */
 public class PresenceEvent implements Event {
     
-    protected Presence presence = null;
+	private static final long serialVersionUID = -8207158000504357229L;
+	protected Presence presence = null;
     
     public PresenceEvent(Presence presence) {
         this.presence = presence;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnection.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnection.java
index 15c7a54d3..629260560 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnection.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnection.java
@@ -119,7 +119,6 @@ public class ChatConnection implements ISynchAsynchConnection, IIMMessageSender
 		XMPPID jabberURI = getXMPPID(remote);
 		String username = jabberURI.getUsername();
 		serverName = jabberURI.getHostname();
-		String password = getPasswordForObject(data);
 		try {
 			if (serverPort == -1) {
 				connection = new XMPPConnection(serverName);
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionObjectPacketEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionObjectPacketEvent.java
index a2966892b..0c6d483cf 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionObjectPacketEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionObjectPacketEvent.java
@@ -14,7 +14,8 @@ import org.jivesoftware.smack.packet.Packet;
 
 public class ChatConnectionObjectPacketEvent extends AsynchConnectionEvent {
 
-    Object value;
+	private static final long serialVersionUID = -1618091206033717358L;
+	Object value;
 	/**
 	 * @param source
 	 * @param param
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionPacketEvent.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionPacketEvent.java
index 8c0fc32fe..46c815824 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionPacketEvent.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/smack/ChatConnectionPacketEvent.java
@@ -14,6 +14,8 @@ import org.jivesoftware.smack.packet.Packet;
 
 public class ChatConnectionPacketEvent extends AsynchConnectionEvent {
 
+	private static final long serialVersionUID = 7000820721266245824L;
+
 	/**
 	 * @param source
 	 * @param param