Fixed some javadocs errors (with full javadocs errors on).

4 files changed, 22 insertions, 38 deletions

diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/ChatSession.java b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/ChatSession.java
index f8457b180..d554a2f90 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/ChatSession.java
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/ChatSession.java
@@ -13,7 +13,6 @@ package org.eclipse.ecf.protocol.msn;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.util.ArrayList;
-
 import org.eclipse.ecf.protocol.msn.events.IChatSessionListener;
 import org.eclipse.ecf.protocol.msn.internal.encode.StringUtils;
 
@@ -207,7 +206,7 @@ public final class ChatSession extends Session {
 	}
 
 	/**
-	 * Notifies attached {@link ChatSessionListeners} that this session has now
+	 * Notifies attached {@link IChatSessionListener} that this session has now
 	 * timed out.
 	 */
 	private void fireSessionTimedOutEvent() {
diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/Contact.java b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/Contact.java
index 0e1995d05..0db129a35 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/Contact.java
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/Contact.java
@@ -11,10 +11,7 @@
 package org.eclipse.ecf.protocol.msn;
 
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
+import java.util.*;
 import org.eclipse.ecf.protocol.msn.events.IContactListener;
 import org.eclipse.ecf.protocol.msn.internal.encode.StringUtils;
 
@@ -95,31 +92,31 @@ public final class Contact {
 	/**
 	 * Invokes the {@link IContactListener#statusChanged(Status)} method on
 	 * every listener within {@link #listeners}. This method is automatically
-	 * invoked when {@link #setStatus(int)} is called.
+	 * invoked when {@link #setStatus(Status)} is called.
 	 * 
-	 * @param status
+	 * @param status1
 	 *            the status that this contact has now switched to
 	 */
-	private void fireStatusChanged(Status status) {
+	private void fireStatusChanged(Status status1) {
 		synchronized (listeners) {
 			for (int i = 0; i < listeners.size(); i++) {
-				((IContactListener) listeners.get(i)).statusChanged(status);
+				((IContactListener) listeners.get(i)).statusChanged(status1);
 			}
 		}
 	}
 
 	/**
-	 * Invokes the {@link IContactListener#nameChanged(Status)} method on every
+	 * Invokes the {@link IContactListener#nameChanged(String)} method on every
 	 * listener within {@link #listeners}. This method is automatically invoked
 	 * when {@link #setDisplayName(String)} is called.
 	 * 
-	 * @param name
+	 * @param name1
 	 *            the new name of this contact
 	 */
-	private void fireNameChanged(String name) {
+	private void fireNameChanged(String name1) {
 		synchronized (listeners) {
 			for (int i = 0; i < listeners.size(); i++) {
-				((IContactListener) listeners.get(i)).nameChanged(name);
+				((IContactListener) listeners.get(i)).nameChanged(name1);
 			}
 		}
 	}
@@ -155,7 +152,7 @@ public final class Contact {
 	/**
 	 * Sets this contact's status to the given status. Developers are highly
 	 * discouraged from calling this method since if the user's status actually
-	 * did change, the {@link IContactListener#nameChanged(Status)} method will
+	 * did change, the {@link IContactListener#nameChanged(String)} method will
 	 * be invoked on all the listeners attached to this contact.
 	 * 
 	 * @param status
@@ -181,7 +178,7 @@ public final class Contact {
 	 * Sets the user name of this contact with the given name. Developers are
 	 * highly discouraged from calling this method since if the value of
 	 * <code>newName</code> differs from the current name, the
-	 * {@link IContactListener#nameChanged(Status)} method will be invoked on
+	 * {@link IContactListener#nameChanged(String)} method will be invoked on
 	 * all the listeners attached to this contact.
 	 * 
 	 * @param newName
diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/DispatchSession.java b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/DispatchSession.java
index 295d21ee6..2951d4e3c 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/DispatchSession.java
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/DispatchSession.java
@@ -12,7 +12,6 @@ package org.eclipse.ecf.protocol.msn;
 
 import java.io.IOException;
 import java.net.ConnectException;
-
 import org.eclipse.ecf.protocol.msn.internal.encode.ResponseCommand;
 
 /**
@@ -43,8 +42,6 @@ class DispatchSession extends Session {
 	 *            the host to be connected to
 	 * @param port
 	 *            the corresponding port number
-	 * @param client
-	 *            the client that that invoked this dispatch session
 	 * @throws IOException
 	 *             If an I/O error occurs while attempting to open the
 	 *             SocketChannel
diff --git a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/net/ClientTicketRequest.java b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/net/ClientTicketRequest.java
index ead17bbea..2b19109ed 100644
--- a/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/net/ClientTicketRequest.java
+++ b/protocols/bundles/org.eclipse.ecf.protocol.msn/src/org/eclipse/ecf/protocol/msn/internal/net/ClientTicketRequest.java
@@ -12,10 +12,7 @@
 package org.eclipse.ecf.protocol.msn.internal.net;
 
 import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-
+import java.net.*;
 import org.eclipse.ecf.protocol.msn.internal.encode.StringUtils;
 
 /**
@@ -40,7 +37,7 @@ public final class ClientTicketRequest {
 	 * TODO: documentation
 	 */
 	private String daLoginURL;
-	
+
 	private boolean cancelled = false;
 
 	/**
@@ -49,14 +46,14 @@ public final class ClientTicketRequest {
 	public ClientTicketRequest() {
 		HttpURLConnection.setFollowRedirects(true);
 	}
-	
+
 	public void setCancelled(boolean cancelled) {
 		this.cancelled = cancelled;
 	}
 
 	/**
 	 * Retrieves information from {@link #PASSPORT_NEXUS} and stores it in
-	 * {@link #passportInfo}.
+	 * {@link #daLoginURL}.
 	 * 
 	 * @return <code>true</code> if the retrieval process completed
 	 *         successfully
@@ -67,8 +64,7 @@ public final class ClientTicketRequest {
 	private boolean getLoginServerAddress() throws IOException {
 		request = (HttpURLConnection) new URL(PASSPORT_NEXUS).openConnection();
 		if (request.getResponseCode() == HttpURLConnection.HTTP_OK) {
-			daLoginURL = StringUtils.splitSubstring(request
-					.getHeaderField("PassportURLs"), ",", 1); //$NON-NLS-1$ //$NON-NLS-2$
+			daLoginURL = StringUtils.splitSubstring(request.getHeaderField("PassportURLs"), ",", 1); //$NON-NLS-1$ //$NON-NLS-2$
 			daLoginURL = "https://" //$NON-NLS-1$
 					+ daLoginURL.substring(daLoginURL.indexOf('=') + 1);
 			request.disconnect();
@@ -93,23 +89,20 @@ public final class ClientTicketRequest {
 	 *             If an I/O error occurs while connecting to the Passport Nexus
 	 *             page or when getting the response codes from the connection
 	 */
-	public synchronized String getTicket(String username, String password,
-			String challengeString) throws IOException {
+	public synchronized String getTicket(String username, String password, String challengeString) throws IOException {
 		if (getLoginServerAddress()) {
 			username = URLEncoder.encode(username);
 			password = URLEncoder.encode(password);
 			try {
 				while (!cancelled) {
-					request = (HttpURLConnection) new URL(daLoginURL)
-							.openConnection();
+					request = (HttpURLConnection) new URL(daLoginURL).openConnection();
 					request.setRequestProperty("Authorization", //$NON-NLS-1$
 							"Passport1.4 OrgVerb=GET,OrgURL=http%3A%2F%2Fmessenger%2Emsn%2Ecom,sign-in=" //$NON-NLS-1$
 									+ username + ",pwd=" + password + ',' //$NON-NLS-1$
 									+ challengeString);
 					if (request.getResponseCode() == HttpURLConnection.HTTP_OK) {
 						password = null;
-						String authenticationInfo = request
-								.getHeaderField("Authentication-Info"); //$NON-NLS-1$
+						String authenticationInfo = request.getHeaderField("Authentication-Info"); //$NON-NLS-1$
 						int start = authenticationInfo.indexOf('\'');
 						int end = authenticationInfo.lastIndexOf('\'');
 						request.disconnect();
@@ -118,10 +111,8 @@ public final class ClientTicketRequest {
 						daLoginURL = request.getHeaderField("Location"); //$NON-NLS-1$
 						// truncate the uri as the received string is of the
 						// form [http://www.msn.com/]
-						daLoginURL = daLoginURL.substring(1, daLoginURL
-								.length() - 1);
-					}
-					else if(request.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED){
+						daLoginURL = daLoginURL.substring(1, daLoginURL.length() - 1);
+					} else if (request.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED) {
 						request.disconnect();
 						return null;
 					}