Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-09-09 18:13:08 +0000
committerslewis2010-09-09 18:13:08 +0000
commit78ec3af59f237b05f7c3e5832c2297432d50d32d (patch)
treebb0ca6dec761dfe0473bb997854bf470a036a258 /providers
parentd810d1fe698cb489423f64985bda5ea8f30d6c91 (diff)
downloadorg.eclipse.ecf-78ec3af59f237b05f7c3e5832c2297432d50d32d.tar.gz
org.eclipse.ecf-78ec3af59f237b05f7c3e5832c2297432d50d32d.tar.xz
org.eclipse.ecf-78ec3af59f237b05f7c3e5832c2297432d50d32d.zip
Removed NLS references.
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/META-INF/MANIFEST.MF3
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/CompositeNamespace.java4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/Messages.java29
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/messages.properties4
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java5
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainerInstantiator.java5
6 files changed, 8 insertions, 42 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.discovery/META-INF/MANIFEST.MF
index b33f80237..89c849e83 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/META-INF/MANIFEST.MF
@@ -2,10 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ecf.provider.discovery;singleton:=true
-Bundle-Version: 2.1.100.qualifier
+Bundle-Version: 2.1.200.qualifier
Bundle-Vendor: %pluginProvider
Import-Package: org.eclipse.equinox.concurrent.future;version="1.0.0",
- org.eclipse.osgi.util,
org.osgi.framework,
org.osgi.util.tracker
Bundle-Localization: plugin
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/CompositeNamespace.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/CompositeNamespace.java
index 2ea270343..e37e23168 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/CompositeNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/CompositeNamespace.java
@@ -25,7 +25,7 @@ public class CompositeNamespace extends Namespace {
*/
public ID createInstance(final Object[] parameters) {
if (parameters == null || parameters.length < 1 || parameters.length > 2) {
- throw new IDCreateException(Messages.CompositeNamespace_WrongParameterCount);
+ throw new IDCreateException("parameter count must be non null and of length >= 1 and =< 2"); //$NON-NLS-1$
} else if (parameters.length == 2 && parameters[0] instanceof String && parameters[1] instanceof URI) {
return new CompositeServiceID(this, new ServiceTypeID(this, (String) parameters[0]), (URI) parameters[1]);
} else if (parameters.length == 2 && parameters[0] instanceof IServiceTypeID && parameters[1] instanceof URI) {
@@ -34,7 +34,7 @@ public class CompositeNamespace extends Namespace {
final IServiceTypeID iServiceTypeID = (IServiceTypeID) parameters[0];
return new ServiceTypeID(this, iServiceTypeID.getName());
} else {
- throw new IDCreateException(Messages.CompositeNamespace_WrongParameters);
+ throw new IDCreateException("wrong parameters"); //$NON-NLS-1$
}
}
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/Messages.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/Messages.java
deleted file mode 100644
index 02d73b6dd..000000000
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/Messages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Versant Corp.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Markus Kuppe (mkuppe <at> versant <dot> com) - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ecf.internal.provider.discovery;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.provider.discovery.messages"; //$NON-NLS-1$
- public static String CompositeDiscoveryContainer_AlreadyConnected;
- public static String CompositeDiscoveryContainerInstantiator;
- public static String CompositeNamespace_WrongParameterCount;
- public static String CompositeNamespace_WrongParameters;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // do nothing
- }
-}
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/messages.properties b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/messages.properties
deleted file mode 100644
index 5c8d03182..000000000
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/internal/provider/discovery/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-CompositeDiscoveryContainerInstantiator=Exception making Composite container
-CompositeDiscoveryContainer_AlreadyConnected=Already connected
-CompositeNamespace_WrongParameterCount=Wrong parameter count
-CompositeNamespace_WrongParameters=Wrong parameters
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
index 9f6acf2b7..640894a58 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainer.java
@@ -22,7 +22,8 @@ import org.eclipse.ecf.core.util.Trace;
import org.eclipse.ecf.discovery.*;
import org.eclipse.ecf.discovery.identity.*;
import org.eclipse.ecf.discovery.service.IDiscoveryService;
-import org.eclipse.ecf.internal.provider.discovery.*;
+import org.eclipse.ecf.internal.provider.discovery.Activator;
+import org.eclipse.ecf.internal.provider.discovery.CompositeNamespace;
public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapter implements IDiscoveryService {
@@ -136,7 +137,7 @@ public class CompositeDiscoveryContainer extends AbstractDiscoveryContainerAdapt
*/
public void connect(final ID aTargetID, final IConnectContext connectContext) throws ContainerConnectException {
if (targetID != null || getConfig() == null) {
- throw new ContainerConnectException(Messages.CompositeDiscoveryContainer_AlreadyConnected);
+ throw new ContainerConnectException("Already connected"); //$NON-NLS-1$
}
targetID = (aTargetID == null) ? getConfig().getID() : aTargetID;
fireContainerEvent(new ContainerConnectingEvent(this.getID(), targetID, connectContext));
diff --git a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainerInstantiator.java b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainerInstantiator.java
index 5e1dc8b25..ff6eb8566 100644
--- a/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainerInstantiator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.discovery/src/org/eclipse/ecf/provider/discovery/CompositeDiscoveryContainerInstantiator.java
@@ -17,7 +17,6 @@ import org.eclipse.ecf.core.identity.IDCreateException;
import org.eclipse.ecf.core.provider.IContainerInstantiator;
import org.eclipse.ecf.discovery.IDiscoveryAdvertiser;
import org.eclipse.ecf.discovery.IDiscoveryLocator;
-import org.eclipse.ecf.internal.provider.discovery.Messages;
public class CompositeDiscoveryContainerInstantiator implements IContainerInstantiator {
@@ -47,11 +46,11 @@ public class CompositeDiscoveryContainerInstantiator implements IContainerInstan
}
return new CompositeDiscoveryContainer(containers);
} catch (final IDCreateException e) {
- final ContainerCreateException excep = new ContainerCreateException(Messages.CompositeDiscoveryContainerInstantiator);
+ final ContainerCreateException excep = new ContainerCreateException(e.getMessage());
excep.setStackTrace(e.getStackTrace());
throw excep;
} catch (final ContainerCreateException e) {
- final ContainerCreateException excep = new ContainerCreateException(Messages.CompositeDiscoveryContainerInstantiator);
+ final ContainerCreateException excep = new ContainerCreateException(e.getMessage());
excep.setStackTrace(e.getStackTrace());
throw excep;
}

Back to the top