Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2010-09-09 21:46:08 +0000
committerslewis2010-09-09 21:46:08 +0000
commit746c8e07e7c01ad3a72a816028c12f897b02e7ac (patch)
treeda2825125b5f9bdd8171f9c3a24dc320bf608c41 /providers
parentc3914fab959b2c495015895edd06c12433b0d72b (diff)
downloadorg.eclipse.ecf-746c8e07e7c01ad3a72a816028c12f897b02e7ac.tar.gz
org.eclipse.ecf-746c8e07e7c01ad3a72a816028c12f897b02e7ac.tar.xz
org.eclipse.ecf-746c8e07e7c01ad3a72a816028c12f897b02e7ac.zip
Removed NLS references.
Diffstat (limited to 'providers')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF1
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/RemoteServiceImpl.java3
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java3
3 files changed, 2 insertions, 5 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF
index 9505bce5b..85355b6f5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.r_osgi;singleton:=true
Bundle-Version: 3.1.0.qualifier
Import-Package: org.eclipse.equinox.concurrent.future;version="1.0.0",
- org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="1.3.0",
org.osgi.util.tracker;version="1.3.3"
Require-Bundle: org.eclipse.ecf;bundle-version="3.1.0",
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/RemoteServiceImpl.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/RemoteServiceImpl.java
index 096514e74..b9a6b80f5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/RemoteServiceImpl.java
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/internal/provider/r_osgi/RemoteServiceImpl.java
@@ -20,7 +20,6 @@ import org.eclipse.ecf.remoteservice.*;
import org.eclipse.ecf.remoteservice.events.IRemoteCallCompleteEvent;
import org.eclipse.ecf.remoteservice.events.IRemoteCallStartEvent;
import org.eclipse.equinox.concurrent.future.*;
-import org.eclipse.osgi.util.NLS;
/**
* The R-OSGi adapter implementation of the IRemoteService interface.
@@ -123,7 +122,7 @@ final class RemoteServiceImpl extends AbstractRemoteService {
// If thread interrupted, then just return null
return null;
} catch (TimeoutException e) {
- throw new ECFException(NLS.bind("callSync timed out after {0} ms", Long.toString(call.getTimeout())), new TimeoutException(call.getTimeout())); //$NON-NLS-1$
+ throw new ECFException("callSync timed out after " + Long.toString(call.getTimeout()) + "ms", new TimeoutException(call.getTimeout())); //$NON-NLS-1$ //$NON-NLS-2$
}
IStatus status = future.getStatus();
if (!status.isOK())
diff --git a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java
index b1a0f7ca2..78a4a2f4b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java
+++ b/providers/bundles/org.eclipse.ecf.provider.r_osgi/src/org/eclipse/ecf/provider/r_osgi/identity/R_OSGiNamespace.java
@@ -12,7 +12,6 @@
package org.eclipse.ecf.provider.r_osgi.identity;
import org.eclipse.ecf.core.identity.*;
-import org.eclipse.osgi.util.NLS;
/**
* The R-OSGi default transport namespace (r-osgi://).
@@ -90,7 +89,7 @@ public class R_OSGiNamespace extends Namespace {
return new R_OSGiID(init);
return new R_OSGiID((String) parameters[0]);
} catch (Exception e) {
- throw new IDCreateException(NLS.bind("{0} createInstance()", getName()), e); //$NON-NLS-1$
+ throw new IDCreateException(getName() + " createInstance()", e); //$NON-NLS-1$
}
}

Back to the top