javadocs fixes

2 files changed, 5 insertions, 7 deletions

diff --git a/framework/bundles/org.eclipse.ecf/javadoc.xml b/framework/bundles/org.eclipse.ecf/javadoc.xml
index 96c827e75..837c3abe7 100644
--- a/framework/bundles/org.eclipse.ecf/javadoc.xml
+++ b/framework/bundles/org.eclipse.ecf/javadoc.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project default="javadoc">
-<target name="javadoc">
-<javadoc access="protected" additionalparam="-J-Xmx256m  " author="false" classpath="C:\eclipse3.3\eclipse\plugins\org.eclipse.equinox.app_1.0.0.v20070606.jar;../org.eclipse.ecf.filetransfer/bin;../org.eclipse.ecf.core.sharedobject/bin;../org.eclipse.ecf.provider/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.core.jobs_3.3.0.v20070423.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.ui.workbench_3.3.0.I20070608-1100.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.osgi_3.3.0.v20070530.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.3.0.v3346.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.osgi.services_3.1.200.v20070605.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.core.contenttype_3.2.100.v20070319.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.core.runtime_3.3.100.v20070530.jar;../org.eclipse.ecf.presence.ui/bin;../org.eclipse.ecf.datashare/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.jface.text_3.3.0.v20070606-0010.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.text_3.3.0.v20070606-0010.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.core.commands_3.3.0.I20070605-0010.jar;../org.eclipse.ecf.presence/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.equinox.preferences_3.2.100.v20070522.jar;../org.eclipse.ecf.discovery/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.swt_3.3.0.v3346.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.equinox.registry_3.3.0.v20070522.jar;bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316\runtime_registry_compatibility.jar;../org.eclipse.ecf.telephony.call/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.ui.forms_3.3.0.v20070511.jar;../org.eclipse.ecf.ui/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.jface_3.3.0.I20070606-0010.jar;../org.eclipse.ecf.core.identity/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.ui_3.3.0.I20070614-0800.jar;C:\eclipse3.3\eclipse\plugins\org.eclipse.ui.editors_3.3.0.v20070606-0010.jar;../org.eclipse.ecf.remoteservice/bin;C:\eclipse3.3\eclipse\plugins\org.eclipse.equinox.common_3.3.0.v20070426.jar" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 1.2.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.core.sharedobject.events,org.eclipse.ecf.presence.history,org.eclipse.ecf.presence.service,org.eclipse.ecf.core.sharedobject.provider,org.eclipse.ecf.presence.ui,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.presence.ui.roster,org.eclipse.ecf.core.sharedobject.util,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.filetransfer.service,org.eclipse.ecf.datashare.service,org.eclipse.ecf.ui.actions,org.eclipse.ecf.presence.roster,org.eclipse.ecf.provider.util,org.eclipse.ecf.core.util,org.eclipse.ecf.ui.wizards,org.eclipse.ecf.telephony.call,org.eclipse.ecf.presence.im,org.eclipse.ecf.discovery.ui.views,org.eclipse.ecf.discovery.service,org.eclipse.ecf.presence.bot,org.eclipse.ecf.telephony.call.service,org.eclipse.ecf.provider.ui.wizards,org.eclipse.ecf.ui.hyperlink,org.eclipse.ecf.telephony.call.ui.actions,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.ui.util,org.eclipse.ecf.presence.collab.ui.view,org.eclipse.ecf.core.identity,org.eclipse.ecf.provider.filetransfer.identity,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.core.provider,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.telephony.call.events,org.eclipse.ecf.presence.collab.ui.url,org.eclipse.ecf.provider.comm,org.eclipse.ecf.presence.chatroom,org.eclipse.ecf.discovery.identity,org.eclipse.ecf.remoteservice,org.eclipse.ecf.presence.ui.chatroom,org.eclipse.ecf.filetransfer.ui,org.eclipse.ecf.core.user,org.eclipse.ecf.core.sharedobject.security,org.eclipse.ecf.core.events,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.datashare,org.eclipse.ecf.datashare.events,org.eclipse.ecf.core.security,org.eclipse.ecf.provider.filetransfer.retrieve,org.eclipse.ecf.core.start,org.eclipse.ecf.presence.bot.impl,org.eclipse.ecf.filetransfer.ui.actions,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.provider.generic,org.eclipse.ecf.presence.bot.application,org.eclipse.ecf.presence.ui.dnd,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.ui,org.eclipse.ecf.remoteservice.service" source="1.4" sourcefiles="../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/OutgoingFileTransferException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java,src/org/eclipse/ecf/core/ContainerAuthenticationException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java,src/org/eclipse/ecf/core/IContainerFactory.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java,src/org/eclipse/ecf/core/ContainerTypeDescription.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java,src/org/eclipse/ecf/core/ContainerFactory.java,src/org/eclipse/ecf/core/IReliableContainer.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java,src/org/eclipse/ecf/core/ContainerCreateException.java,src/org/eclipse/ecf/core/AbstractContainer.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransferContainerAdapter.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java,src/org/eclipse/ecf/core/IContainer.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java,src/org/eclipse/ecf/core/IContainerListener.java,src/org/eclipse/ecf/core/ContainerConnectException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java" sourcepath="../org.eclipse.ecf.filetransfer/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.core.identity/src;../org.eclipse.ecf.provider/src;../org.eclipse.ecf.telephony.call.ui/src;../org.eclipse.ecf.core.sharedobject/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.discovery.ui/src;../org.eclipse.ecf.presence.collab.ui/src;src;../org.eclipse.ecf.presence.ui/src;../org.eclipse.ecf.provider.remoteservice/src;../org.eclipse.ecf.telephony.call/src;../org.eclipse.ecf.provider.ui/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.provider.filetransfer/src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.filetransfer.ui/src;../org.eclipse.ecf.presence.bot/src;../org.eclipse.ecf.remoteservice/src;../org.eclipse.ecf.datashare/src" splitindex="true" use="true" version="true">
-<link href="jar:file:/C:/eclipse3.3/eclipse/plugins/org.eclipse.platform.doc.isv_3.3.0.v20070621.jar!/reference/api"/>
-</javadoc>
-</target>
+    <target name="javadoc">
+        <javadoc access="protected" additionalparam="-J-Xmx256m  " author="false" classpath="../org.eclipse.ecf.datashare/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.core.runtime.compatibility.registry_3.2.200.v20070717\runtime_registry_compatibility.jar;../org.eclipse.ecf.discovery/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.ui.editors_3.4.0.v20070917-1800.jar;../org.eclipse.ecf.provider/bin;../org.eclipse.ecf.core.sharedobject/bin;../org.eclipse.ecf.core.identity/bin;../org.eclipse.ecf.presence/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.core.contenttype_3.2.200.v20070910.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.ui.workbench_3.4.0.I20070919-2000.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.text_3.4.0.v20070917-1800.jar;../org.eclipse.ecf.remoteservice/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.swt.win32.win32.x86_3.4.0.v3410.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.ui_3.4.0.I20070919-2000.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.equinox.app_1.0.100.v20070827.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.osgi.services_3.1.200.v20070605.jar;../org.eclipse.ecf.filetransfer/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.equinox.common_3.4.0.v20070910.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.core.runtime_3.4.0.v20070827.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.ui.forms_3.3.100.v20070910.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.jface_3.4.0.I20070919-0010b.jar;bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.jface.text_3.4.0.v20070917-1800.jar;../org.eclipse.ecf.ui/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.core.jobs_3.3.100.v20070709.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.osgi_3.4.0.v20070914.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.equinox.preferences_3.2.200.v20070827.jar;../org.eclipse.ecf.telephony.call/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.core.commands_3.3.0.I20070917-0010.jar;../org.eclipse.ecf.presence.ui/bin;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.swt_3.4.0.v3410b.jar;C:\eclipse3.4m2\eclipse\plugins\org.eclipse.equinox.registry_3.4.0.v20070827.jar" destdir="../ecf documentation/org.eclipse.ecf.docs/api" doctitle="Eclipse Communication Framework (ECF) 1.2.0" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.ecf.ui.hyperlink,org.eclipse.ecf.filetransfer.ui,org.eclipse.ecf.presence.history,org.eclipse.ecf.presence.collab.ui.view,org.eclipse.ecf.core.start,org.eclipse.ecf.core.security,org.eclipse.ecf.presence.im,org.eclipse.ecf.core.sharedobject.provider,org.eclipse.ecf.ui.actions,org.eclipse.ecf.telephony.call.ui.actions,org.eclipse.ecf.core.sharedobject.events,org.eclipse.ecf.core.provider,org.eclipse.ecf.core.sharedobject,org.eclipse.ecf.remoteservice.service,org.eclipse.ecf.discovery.service,org.eclipse.ecf.core.identity,org.eclipse.ecf.presence.bot,org.eclipse.ecf.remoteservice,org.eclipse.ecf.ui,org.eclipse.ecf.telephony.call.events,org.eclipse.ecf.provider.comm.tcp,org.eclipse.ecf.presence.bot.impl,org.eclipse.ecf.provider.remoteservice.generic,org.eclipse.ecf.presence.ui,org.eclipse.ecf.presence.collab.ui.url,org.eclipse.ecf.presence.ui.chatroom,org.eclipse.ecf.presence.roster,org.eclipse.ecf.core.events,org.eclipse.ecf.datashare.events,org.eclipse.ecf.provider.generic.gmm,org.eclipse.ecf.telephony.call.service,org.eclipse.ecf.filetransfer.identity,org.eclipse.ecf.telephony.call,org.eclipse.ecf.datashare,org.eclipse.ecf.filetransfer.events,org.eclipse.ecf.datashare.service,org.eclipse.ecf.filetransfer.ui.actions,org.eclipse.ecf.datashare.mergeable,org.eclipse.ecf.discovery.ui.views,org.eclipse.ecf.discovery.identity,org.eclipse.ecf.provider.util,org.eclipse.ecf.ui.util,org.eclipse.ecf.presence.ui.roster,org.eclipse.ecf.core.sharedobject.security,org.eclipse.ecf.filetransfer.service,org.eclipse.ecf.presence.service,org.eclipse.ecf.core.util,org.eclipse.ecf.provider.filetransfer.retrieve,org.eclipse.ecf.provider.datashare,org.eclipse.ecf.core.user,org.eclipse.ecf.presence.chatroom,org.eclipse.ecf.provider.filetransfer.identity,org.eclipse.ecf.provider.generic,org.eclipse.ecf.presence.ui.dnd,org.eclipse.ecf.remoteservice.events,org.eclipse.ecf.provider.comm,org.eclipse.ecf.presence.bot.application,org.eclipse.ecf.core.sharedobject.util,org.eclipse.ecf.provider.ui.wizards,org.eclipse.ecf.ui.dialogs,org.eclipse.ecf.ui.wizards" source="1.4" sourcefiles="../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java,src/org/eclipse/ecf/core/ContainerTypeDescription.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceProperties.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMMessage.java,src/org/eclipse/ecf/core/IContainerFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransferContainerAdapter.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceProperties.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferPausable.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/UserCancelledException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransferRequestListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IAccountManager.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IIncomingFileTransfer.java,src/org/eclipse/ecf/core/ContainerFactory.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IRetrieveFileTransferContainerAdapter.java,src/org/eclipse/ecf/core/ContainerCreateException.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/OutgoingFileTransferException.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceEvent.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceTypeListener.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferRateControl.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IncomingFileTransferException.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageListener.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceListener.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresence.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IServiceInfo.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IOutgoingFileTransfer.java,src/org/eclipse/ecf/core/AbstractContainer.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceInfo.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessageEvent.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransferInfo.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/Presence.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/IFileTransfer.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceSender.java,../org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IIMMessage.java,src/org/eclipse/ecf/core/IReliableContainer.java,src/org/eclipse/ecf/core/IContainerListener.java,../org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/ServiceContainerEvent.java,../org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java,src/org/eclipse/ecf/core/ContainerAuthenticationException.java,src/org/eclipse/ecf/core/IContainer.java,src/org/eclipse/ecf/core/ContainerConnectException.java" sourcepath="../org.eclipse.ecf.telephony.call.ui/src;../org.eclipse.ecf.datashare/src;../org.eclipse.ecf.presence.collab.ui/src;../org.eclipse.ecf.presence.bot/src;../org.eclipse.ecf.ui/src;../org.eclipse.ecf.filetransfer/src;../org.eclipse.ecf.provider.remoteservice/src;../org.eclipse.ecf.provider.ui/src;src;../org.eclipse.ecf.discovery/src;../org.eclipse.ecf.filetransfer.ui/src;../org.eclipse.ecf.presence/src;../org.eclipse.ecf.provider.datashare/src;../org.eclipse.ecf.remoteservice/src;../org.eclipse.ecf.provider.filetransfer/src;../org.eclipse.ecf.discovery.ui/src;../org.eclipse.ecf.presence.ui/src;../org.eclipse.ecf.telephony.call/src;../org.eclipse.ecf.core.sharedobject/src;../org.eclipse.ecf.core.identity/src;../org.eclipse.ecf.provider/src" splitindex="true" use="true" version="true"/>
+    </target>
 </project>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java
index f236992c8..786549ac4 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/Proxy.java
@@ -65,7 +65,7 @@ public class Proxy implements Serializable {
 		private static final Type[] VALUES = {DIRECT, HTTP, SOCKS};
 
 		/**
-		 * @return
+		 * @return Object
 		 * @throws ObjectStreamException not thrown by this implementation.
 		 */
 		Object readResolve() throws ObjectStreamException {