Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-12-17 01:12:53 -0500
committerslewis2009-12-17 01:12:53 -0500
commitcc1aba6d317b068bf6749926926559e149164021 (patch)
treed62b5eda5dd3bb4dceeac085e5297caedb70008e
parent863025d9d2553792e1b8d9852948d06be2fce738 (diff)
downloadorg.eclipse.ecf-cc1aba6d317b068bf6749926926559e149164021.tar.gz
org.eclipse.ecf-cc1aba6d317b068bf6749926926559e149164021.tar.xz
org.eclipse.ecf-cc1aba6d317b068bf6749926926559e149164021.zip
Fixed bundle version numbers and associated @since tags for new interface
-rw-r--r--framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf/build.properties1
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java17
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java3
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java4
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java4
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java1
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java2
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java1
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java1
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java1
11 files changed, 28 insertions, 9 deletions
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index 130352eac..87ce2c925 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf;singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/framework/bundles/org.eclipse.ecf/build.properties b/framework/bundles/org.eclipse.ecf/build.properties
index 0ee7efb80..1d5a54375 100644
--- a/framework/bundles/org.eclipse.ecf/build.properties
+++ b/framework/bundles/org.eclipse.ecf/build.properties
@@ -23,3 +23,4 @@ src.includes = about.html,\
schema/,\
about.properties,\
about.ini
+jre.compilation.profile = J2SE-1.4
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
index 97c0d7750..3ec83da53 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerFactory.java
@@ -35,6 +35,7 @@ import org.eclipse.ecf.internal.core.*;
*
* @see IContainer
* @see IContainerFactory
+ * @since 4.0
*/
public class ContainerFactory implements IContainerFactory, IContainerManager {
@@ -344,29 +345,29 @@ public class ContainerFactory implements IContainerFactory, IContainerManager {
return createContainer(getDescriptionByNameWithException(containerTypeDescriptionName), new Object[] {containerID});
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String, java.lang.String)
+ /**
+ * @since 4.0
*/
public IContainer createContainer(String containerTypeDescriptionName, String containerId) throws ContainerCreateException {
return createContainer(getDescriptionByNameWithException(containerTypeDescriptionName), containerId);
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.core.IContainerFactory#createContainer(java.lang.String, java.lang.String, java.lang.Object[])
+ /**
+ * @since 4.0
*/
public IContainer createContainer(String containerTypeDescriptionName, String containerId, Object[] parameters) throws ContainerCreateException {
return createContainer(getDescriptionByNameWithException(containerTypeDescriptionName), containerId, parameters);
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.core.IContainerFactory#createContainer(org.eclipse.ecf.core.ContainerTypeDescription, java.lang.String)
+ /**
+ * @since 4.0
*/
public IContainer createContainer(ContainerTypeDescription containerTypeDescription, String containerId) throws ContainerCreateException {
return createContainer(containerTypeDescription, containerId, null);
}
- /* (non-Javadoc)
- * @see org.eclipse.ecf.core.IContainerFactory#createContainer(org.eclipse.ecf.core.ContainerTypeDescription, java.lang.String, java.lang.Object[])
+ /**
+ * @since 4.0
*/
public IContainer createContainer(ContainerTypeDescription containerTypeDescription, String containerId, Object[] parameters) throws ContainerCreateException {
if (containerId == null)
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java
index cdec6ffdb..36a2f153a 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ContainerTypeDescription.java
@@ -229,6 +229,9 @@ public class ContainerTypeDescription {
return result;
}
+ /**
+ * @since 4.0
+ */
public String[] getSupportedConfigTypes() {
String method = "getSupportedConfigTypes"; //$NON-NLS-1$
Trace.entering(ECFPlugin.PLUGIN_ID, ECFDebugOptions.METHODS_ENTERING, this.getClass(), method);
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java
index 2becfd4b7..0c113852b 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainerFactory.java
@@ -145,6 +145,7 @@ public interface IContainerFactory {
* @param containerId the container's new ID. Must not be <code>null</code>.
* @return a valid instance of IContainer
* @throws ContainerCreateException if some problem creating the instance.
+ * @since 4.0
*/
public IContainer createContainer(String containerTypeDescriptionName, String containerId) throws ContainerCreateException;
@@ -159,6 +160,7 @@ public interface IContainerFactory {
* of the IContainerInstantiator
* @return a valid instance of IContainer
* @throws ContainerCreateException if some problem creating the instance.
+ * @since 4.0
*/
public IContainer createContainer(String containerTypeDescriptionName, String containerId, Object[] parameters) throws ContainerCreateException;
@@ -170,6 +172,7 @@ public interface IContainerFactory {
* @param containerId the container's new ID. Must not be <code>null</code>.
* @return a valid instance of IContainer
* @throws ContainerCreateException if some problem creating the instance.
+ * @since 4.0
*/
public IContainer createContainer(ContainerTypeDescription containerTypeDescription, String containerId) throws ContainerCreateException;
@@ -184,6 +187,7 @@ public interface IContainerFactory {
* of the IContainerInstantiator
* @return a valid instance of IContainer
* @throws ContainerCreateException if some problem creating the instance.
+ * @since 4.0
*/
public IContainer createContainer(ContainerTypeDescription containerTypeDescription, String containerId, Object[] parameters) throws ContainerCreateException;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java
index cb27c8d89..f6ce60e03 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseContainerInstantiator.java
@@ -79,4 +79,8 @@ public class BaseContainerInstantiator implements IContainerInstantiator {
return EMPTY_CLASS_ARRAY;
}
+ public String[] getSupportedIntents(ContainerTypeDescription description) {
+ return EMPTY_STRING_ARRAY;
+ }
+
}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java
index 2992e7da9..efafe55c1 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/BaseRemoteServiceContainerInstantiator.java
@@ -16,6 +16,7 @@ import org.eclipse.ecf.core.ContainerTypeDescription;
/**
* Default implemenation of {@link IRemoteServiceContainerInstantiator}. ECF provider implementers
* may subclass as desired.
+ * @since 4.0
*/
public class BaseRemoteServiceContainerInstantiator extends BaseContainerInstantiator implements IRemoteServiceContainerInstantiator {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java
index eb4bf353c..bd2ca1239 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IContainerInstantiator.java
@@ -119,4 +119,6 @@ public interface IContainerInstantiator {
*/
public Class[][] getSupportedParameterTypes(ContainerTypeDescription description);
+ public String[] getSupportedIntents(ContainerTypeDescription description);
+
} \ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java
index 16853fc8a..03950aa79 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/provider/IRemoteServiceContainerInstantiator.java
@@ -13,6 +13,7 @@ import org.eclipse.ecf.core.ContainerTypeDescription;
/**
* Interface that must be implemented by ECF remote service provider implementations.
+ * @since 4.0
*
*/
public interface IRemoteServiceContainerInstantiator {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java
index 57fa0b87b..423e5a0d4 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerFactoryTracker.java
@@ -16,6 +16,7 @@ import org.osgi.util.tracker.ServiceTracker;
/**
* Service tracker customized to handle tracking the ECF container factory service (singleton).
+ * @since 4.0
*
*/
public class ContainerFactoryTracker extends ServiceTracker {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java
index b23ff52d6..6e7faf9a9 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ContainerManagerTracker.java
@@ -15,6 +15,7 @@ import org.osgi.util.tracker.ServiceTracker;
/**
* Service tracker customized to handle tracking the ECF container manager service (singleton).
+ * @since 4.0
*
*/
public class ContainerManagerTracker extends ServiceTracker {

Back to the top