diff options
| author | Thomas Watson | 2013-09-05 21:41:21 +0000 |
|---|---|---|
| committer | Thomas Watson | 2013-09-06 18:45:46 +0000 |
| commit | 75092469f948217c94704f6cb298d81b75d9f9d6 (patch) | |
| tree | 260bb433e66ddca77cbd23f01415d2c15488a3a5 /bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime | |
| parent | ee16ee5520224d7e0604596c01d2737b25bd3449 (diff) | |
| download | rt.equinox.framework-75092469f948217c94704f6cb298d81b75d9f9d6.tar.gz rt.equinox.framework-75092469f948217c94704f6cb298d81b75d9f9d6.tar.xz rt.equinox.framework-75092469f948217c94704f6cb298d81b75d9f9d6.zip | |
Externalize Strings.I20130906-2000
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime')
2 files changed, 3 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java index 70ecc42aa..ddb3ca82b 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java @@ -590,7 +590,7 @@ public class EclipseStarter { } Location installLocation = installLocRef == null ? null : context.getService(installLocRef.iterator().next()); if (installLocation == null) { - throw new IllegalStateException("No install location found."); + throw new IllegalStateException(Msg.EclipseStarter_InstallLocation); } for (int i = 0; i < installEntries.length; i++) { String name = installEntries[i]; diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java index 44333b900..8dc026775 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/ConsoleManager.java @@ -12,7 +12,6 @@ package org.eclipse.core.runtime.internal.adaptor; import org.eclipse.osgi.internal.framework.EquinoxConfiguration; import org.osgi.framework.*; -import org.osgi.service.packageadmin.PackageAdmin; public class ConsoleManager { @@ -51,8 +50,8 @@ public class ConsoleManager { if ("none".equals(consolePort)) //$NON-NLS-1$ return; // otherwise we need to check for the equinox console bundle and start it - ServiceReference<PackageAdmin> paRef = context.getServiceReference(PackageAdmin.class); - PackageAdmin pa = paRef == null ? null : context.getService(paRef); + ServiceReference<org.osgi.service.packageadmin.PackageAdmin> paRef = context.getServiceReference(org.osgi.service.packageadmin.PackageAdmin.class); + org.osgi.service.packageadmin.PackageAdmin pa = paRef == null ? null : context.getService(paRef); Bundle[] consoles = pa.getBundles(consoleBundle, null); if (consoles == null || consoles.length == 0) { if (consolePort != null) |