Implemented skype user status change. Fixed documentation and default Presence instance creationv20080104-1223

1 files changed, 6 insertions, 7 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java
index bd60a7b2a..4d75e4cc4 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java
@@ -13,7 +13,6 @@ package org.eclipse.ecf.presence;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.ecf.internal.presence.PresencePlugin;
 
@@ -41,14 +40,13 @@ public class Presence implements IPresence {
 	}
 
 	public Presence(Type type) {
-		this(type, "", Mode.AVAILABLE); //$NON-NLS-1$
+		this(type, null, Mode.AVAILABLE);
 	}
 
-	public Presence(Type type, String status, Mode mode, Map props,
-			byte[] picture) {
-		this.type = type;
+	public Presence(Type type, String status, Mode mode, Map props, byte[] picture) {
+		this.type = (type == null) ? IPresence.Type.AVAILABLE : type;
 		this.status = status;
-		this.mode = mode;
+		this.mode = (mode == null) ? IPresence.Mode.AVAILABLE : mode;
 		this.properties = (props == null) ? new HashMap() : props;
 		this.pictureData = (picture == null) ? new byte[0] : picture;
 	}
@@ -104,7 +102,8 @@ public class Presence implements IPresence {
 	 */
 	public Object getAdapter(Class adapter) {
 		IAdapterManager adapterManager = PresencePlugin.getDefault().getAdapterManager();
-		if (adapterManager == null) return null;
+		if (adapterManager == null)
+			return null;
 		return adapterManager.loadAdapter(this, adapter.getName());
 	}