Changed execution environment to CDC 1.0/Foundation 1.0 for identity, ecf, sharedobject, discovery, datashare, filetransfer, and remoteservice APIs

10 files changed, 41 insertions, 40 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java
index f35d4ba77..f75d9310f 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IChatID.java
@@ -10,21 +10,18 @@
  *****************************************************************************/
 package org.eclipse.ecf.presence;
 
-import org.eclipse.ecf.core.identity.ID;
-
 /**
  * Adapter interface for chatIDs. The typical usage of this interface is as
  * follows:
  * 
  * <pre>
- *   ID myID = ...
- *   IChatID chatID = (IChatID) myID.getAdapter(IChatID.class);
- *   if (chatID != null) {
- *     ...use chatID here
- *   }
+ *    ID myID = ...
+ *    IChatID chatID = (IChatID) myID.getAdapter(IChatID.class);
+ *    if (chatID != null) {
+ *      ...use chatID here
+ *    }
  * </pre>
  * 
- * @see ID
  */
 public interface IChatID {
 	/**
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IParticipantListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IParticipantListener.java
index 5fb1989d9..cf9d54589 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IParticipantListener.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IParticipantListener.java
@@ -11,13 +11,11 @@
 package org.eclipse.ecf.presence;
 
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.presence.chat.IChatParticipantListener;
 
 /**
  * Super interface receiving participant presence messages.
  * 
  * @see IPresenceListener
- * @see IChatParticipantListener
  * 
  */
 public interface IParticipantListener {
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java
index 54637b45c..90f3e669d 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java
@@ -12,7 +12,6 @@ package org.eclipse.ecf.presence;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.ecf.presence.chat.IChatRoomManager;
-import org.eclipse.ecf.core.IContainer;
 
 /**
  * Entry poing presence container adapter. For setting up listeners for presence
@@ -23,22 +22,21 @@ import org.eclipse.ecf.core.IContainer;
  * To use this adapter:
  * 
  * <pre>
- *   IPresenceContainerAdapter presenceContainer = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class);
- *   if (presenceContainer != null) {
- *      ...use presenceContainer
- *   } else {
- *      ...presence not supported by provider
- *   }
+ *    IPresenceContainerAdapter presenceContainer = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class);
+ *    if (presenceContainer != null) {
+ *       ...use presenceContainer
+ *    } else {
+ *       ...presence not supported by provider
+ *    }
  * </pre>
  * 
- * @see IContainer#getAdapter(Class)
  */
 public interface IPresenceContainerAdapter extends IAdaptable {
 
 	/**
-	 * Setup listener for handling roster subscription requests. The given listener
-	 * will asynchronously be called when a subscription request is received by
-	 * this connected account.
+	 * Setup listener for handling roster subscription requests. The given
+	 * listener will asynchronously be called when a subscription request is
+	 * received by this connected account.
 	 * 
 	 * @param listener
 	 *            for receiving subscription requests. Must not be null.
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IRosterEntry.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IRosterEntry.java
index ef85f297f..3a9891be1 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IRosterEntry.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IRosterEntry.java
@@ -27,7 +27,8 @@ public interface IRosterEntry {
 	 * Add this roster entry to the given group.
 	 * 
 	 * @param group
-	 *            the group to add this entry to.  If group is null, it will be ignored.
+	 *            the group to add this entry to. If group is null, it will be
+	 *            ignored.
 	 */
 	public void add(IRosterGroup group);
 
@@ -51,7 +52,7 @@ public interface IRosterEntry {
 	/**
 	 * Get service ID associated with this roster entry
 	 * 
-	 * @return ID that is service ID for this entry.  Will not be null
+	 * @return ID that is service ID for this entry. Will not be null
 	 */
 	public ID getServiceID();
 
@@ -87,7 +88,7 @@ public interface IRosterEntry {
 	/**
 	 * Get presence state for this roster entry.
 	 * 
-	 * @return IPresence information for this roster entry.  May be null.
+	 * @return IPresence information for this roster entry. May be null.
 	 */
 	public IPresence getPresenceState();
 
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 5fccb934c..1e3dbc989 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
@@ -47,7 +47,7 @@ public class Presence implements IPresence {
 		this.priority = priority;
 		this.status = status;
 		this.mode = mode;
-		this.properties = (props == null)?new HashMap():props;
+		this.properties = (props == null) ? new HashMap() : props;
 	}
 
 	public Presence(Type type, int priority, String status, Mode mode) {
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterEntry.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterEntry.java
index 87254a4b7..0354454fd 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterEntry.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterEntry.java
@@ -136,12 +136,14 @@ public class RosterEntry implements IRosterEntry {
 	 * @see org.eclipse.ecf.ui.presence.IRosterEntry#addGroup(org.eclipse.ecf.ui.presence.IRosterGroup)
 	 */
 	public void add(IRosterGroup group) {
-		if (group == null) return;
+		if (group == null)
+			return;
 		groups.add(group);
 	}
 
 	public void addAll(Collection grps) {
-		if (grps == null) return;
+		if (grps == null)
+			return;
 		groups.addAll(grps);
 	}
 
@@ -151,7 +153,8 @@ public class RosterEntry implements IRosterEntry {
 	 * @see org.eclipse.ecf.ui.presence.IRosterEntry#remvoe(org.eclipse.ecf.ui.presence.IRosterGroup)
 	 */
 	public void remove(IRosterGroup group) {
-		if (group == null) return;
+		if (group == null)
+			return;
 		groups.remove(group);
 	}
 
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterGroup.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterGroup.java
index fa977526b..4406bc8af 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterGroup.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/RosterGroup.java
@@ -28,7 +28,8 @@ public class RosterGroup implements IRosterGroup {
 
 	protected String name;
 
-	public RosterGroup(String name, Collection /* <IRosterEntry> */ existingEntries) {
+	public RosterGroup(String name,
+			Collection /* <IRosterEntry> */existingEntries) {
 		super();
 		this.name = name;
 		entries = new HashMap();
@@ -58,8 +59,9 @@ public class RosterGroup implements IRosterGroup {
 			return null;
 	}
 
-	public void addAll(Collection /* <IRosterEntry> */ existingEntryies) {
-		if (existingEntryies == null) return;
+	public void addAll(Collection /* <IRosterEntry> */existingEntryies) {
+		if (existingEntryies == null)
+			return;
 		synchronized (entries) {
 			for (Iterator i = existingEntryies.iterator(); i.hasNext();) {
 				IRosterEntry entry = (IRosterEntry) i.next();
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java
index 3e6450f87..c61b4702e 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/chat/IChatRoomManager.java
@@ -18,7 +18,6 @@ import org.eclipse.ecf.presence.IPresenceContainerAdapter;
  * this manager. Access to objects implementing this interface is provided by
  * {@link IPresenceContainerAdapter#getChatRoomManager()}
  * 
- * @see IPresenceContainerAdapter#getChatRoomManager()
  */
 public interface IChatRoomManager extends IAdaptable {
 	/**
diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index 72d758321..73d33a32e 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -9,11 +9,13 @@ Bundle-Localization: plugin
 Eclipse-LazyStart: true
 Eclipse-AutoStart: true
 Provide-Package: org.eclipse.ecf.provider.comm.tcp, org.eclipse.ecf.provider.app, org.eclipse.ecf.provider.generic, org.eclipse.ecf.provider.generic.gmm
-Export-Package: org.eclipse.ecf.provider.app,
+Export-Package: org.eclipse.ecf.internal.provider;x-internal:=true,
+ org.eclipse.ecf.provider.app,
  org.eclipse.ecf.provider.comm,
  org.eclipse.ecf.provider.comm.tcp,
  org.eclipse.ecf.provider.generic,
- org.eclipse.ecf.provider.generic.gmm
+ org.eclipse.ecf.provider.generic.gmm,
+ org.eclipse.ecf.provider.util
 Eclipse-BuddyPolicy: global
 Bundle-ManifestVersion: 2
 Bundle-RequiredExecutionEnvironment: J2SE-1.4,
diff --git a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
index 9ea8f132b..64ef5b9f2 100644
--- a/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.ui/META-INF/MANIFEST.MF
@@ -11,13 +11,16 @@ Provide-Package: org.eclipse.ecf.ui,
  org.eclipse.ecf.ui.dialogs,
  org.eclipse.ecf.ui.views,
  org.eclipse.ecf.ui.wizards
-Export-Package:  org.eclipse.ecf.ui.views, org.eclipse.ecf.ui.dialogs
+Export-Package: org.eclipse.ecf.ui,
+ org.eclipse.ecf.ui.dialogs,
+ org.eclipse.ecf.ui.util,
+ org.eclipse.ecf.ui.views,
+ org.eclipse.ecf.ui.wizards
 Eclipse-RegisterBuddy: org.eclipse.ecf
 Eclipse-BuddyPolicy: dependent
 Bundle-RequiredExecutionEnvironment: J2SE-1.4,
  CDC-1.1/Foundation-1.1
-Import-Package: org.eclipse.core.commands.common,
- org.eclipse.core.runtime,
+Import-Package: org.eclipse.core.runtime,
  org.eclipse.core.runtime.jobs,
  org.eclipse.ecf.core,
  org.eclipse.ecf.core.events,
@@ -30,7 +33,6 @@ Import-Package: org.eclipse.core.commands.common,
  org.eclipse.ecf.discovery.identity,
  org.eclipse.ecf.presence,
  org.eclipse.ecf.presence.chat,
- org.eclipse.jface,
  org.eclipse.jface.text,
  org.eclipse.swt,
  org.eclipse.swt.widgets,
@@ -40,6 +42,5 @@ Import-Package: org.eclipse.core.commands.common,
  org.eclipse.ui.plugin,
  org.eclipse.ui.progress,
  org.osgi.framework;specification-version="1.3.0"
-Require-Bundle: org.eclipse.swt,
- org.eclipse.jface
+Require-Bundle: org.eclipse.jface