Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-05-05 01:13:54 -0400
committerslewis2010-05-05 01:13:54 -0400
commitd4ce8823c9d0083b9d43504d59facf17c1e278e4 (patch)
tree2db5df8a9f98a69e0d5d2b3b2ffd75e8f805bd76 /framework/bundles
parent9a85c6b9534238137b2b78f4322bbf38ba712745 (diff)
downloadorg.eclipse.ecf-d4ce8823c9d0083b9d43504d59facf17c1e278e4.tar.gz
org.eclipse.ecf-d4ce8823c9d0083b9d43504d59facf17c1e278e4.tar.xz
org.eclipse.ecf-d4ce8823c9d0083b9d43504d59facf17c1e278e4.zip
Removed spurious namespace collision warnings.
Diffstat (limited to 'framework/bundles')
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java38
1 files changed, 15 insertions, 23 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
index 401b218b0..344a29f9d 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
@@ -119,8 +119,8 @@ public class Activator implements BundleActivator {
plugin = this;
this.context = ctxt;
// Register IIDFactory service
- idFactoryServiceRegistration = context.registerService(IIDFactory.class
- .getName(), IDFactory.getDefault(), null);
+ idFactoryServiceRegistration = context.registerService(
+ IIDFactory.class.getName(), IDFactory.getDefault(), null);
final IExtensionRegistry reg = getExtensionRegistry();
if (reg != null) {
@@ -223,8 +223,8 @@ public class Activator implements BundleActivator {
logService = getLogService();
if (logService != null)
- logService.log(LogHelper.getLogCode(status), LogHelper
- .getLogMessage(status), status.getException());
+ logService.log(LogHelper.getLogCode(status),
+ LogHelper.getLogMessage(status), status.getException());
}
/**
@@ -263,17 +263,10 @@ public class Activator implements BundleActivator {
// Now add to known namespaces
IDFactory.addNamespace0(ns);
org.eclipse.ecf.core.util.Trace
- .trace(
- Activator.PLUGIN_ID,
+ .trace(Activator.PLUGIN_ID,
IdentityDebugOptions.DEBUG,
"addNamespaceExtensions.addedNamespaceToFactory(" + ns //$NON-NLS-1$
+ ")"); //$NON-NLS-1$
- } else {
- getDefault().log(
- new Status(IStatus.WARNING, Activator.PLUGIN_ID,
- IStatus.WARNING,
- "Namespace collision for name=" + nsName,
- null));
}
} catch (final CoreException e) {
getDefault().log(e.getStatus());
@@ -282,17 +275,16 @@ public class Activator implements BundleActivator {
Activator.class, "addNamespaceExtensions", e); //$NON-NLS-1$
} catch (final Exception e) {
getDefault()
- .log(
- new Status(
- IStatus.ERROR,
- bundleName,
- FACTORY_NAME_COLLISION_ERRORCODE,
- "name=" //$NON-NLS-1$
- + nsName
- + ";extension point id=" //$NON-NLS-1$
- + extension
- .getExtensionPointUniqueIdentifier(),
- null));
+ .log(new Status(
+ IStatus.ERROR,
+ bundleName,
+ FACTORY_NAME_COLLISION_ERRORCODE,
+ "name=" //$NON-NLS-1$
+ + nsName
+ + ";extension point id=" //$NON-NLS-1$
+ + extension
+ .getExtensionPointUniqueIdentifier(),
+ null));
org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID,
IdentityDebugOptions.EXCEPTIONS_CATCHING,
Activator.class, "addNamespaceExtensions", e); //$NON-NLS-1$

Back to the top