Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBJ Hargrave2013-05-22 20:50:01 +0000
committerBJ Hargrave2013-05-22 20:57:48 +0000
commit342b62e2c769db0ec047c3694570beb7fc070fee (patch)
tree81c8e138bb4176b23a3cbc97256e6da5c57144e5 /bundles/org.eclipse.osgi/supplement
parent9de0794924fc96e99cf4c0d90a29d9c7830200f0 (diff)
downloadrt.equinox.framework-342b62e2c769db0ec047c3694570beb7fc070fee.tar.gz
rt.equinox.framework-342b62e2c769db0ec047c3694570beb7fc070fee.tar.xz
rt.equinox.framework-342b62e2c769db0ec047c3694570beb7fc070fee.zip
RFC 195: Implement Service Scopes
Adds support for PrototypeServiceFactory and ServiceObjects. Also includes some generics use improvements. Signed-off-by: BJ Hargrave <hargrave@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/supplement')
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties1
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java2
2 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties
index 91e9cadab..72a913562 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/ExternalMessages.properties
@@ -23,6 +23,7 @@ SERVICE_NOT_INSTANCEOF_CLASS_EXCEPTION=The service object is not an instance of
SERVICE_FACTORY_NOT_INSTANCEOF_CLASS_EXCEPTION={0}.getService() returned a service object that is not an instance of the service class {1}
SERVICE_OBJECT_NULL_EXCEPTION={0}.getService() returned a null service object
SERVICE_ARGUMENT_NULL_EXCEPTION=The service parameter is null
+SERVICE_OBJECTS_UNGET_ARGUMENT_EXCEPTION=The service parameter was not provided by this object
SERVICE_ALREADY_UNREGISTERED_EXCEPTION=The service has been unregistered
SERVICE_EMPTY_CLASS_LIST_EXCEPTION=The array of service names is empty
SERVICE_USE_OVERFLOW=The use count for the service overflowed.
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
index 4f66a9e2a..8d77f6155 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/Msg.java
@@ -40,6 +40,8 @@ public class Msg extends NLS {
public static String SERVICE_FACTORY_RECURSION;
public static String SERVICE_USE_OVERFLOW;
+ public static String SERVICE_OBJECTS_UNGET_ARGUMENT_EXCEPTION;
+
public static String BUNDLE_SYSTEMBUNDLE_UNINSTALL_EXCEPTION;
public static String HEADER_DUPLICATE_KEY_EXCEPTION;

Back to the top