Move from Platform deprecated API

9 files changed, 17 insertions, 15 deletions

diff --git a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java
index d9a1022a1..8d4dd3891 100644
--- a/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java
+++ b/org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java
@@ -571,7 +571,7 @@ public class StringVariableManager implements IStringVariableManager, IPropertyC
      */
     public String getContributingPluginId(IStringVariable variable) {
         if (variable instanceof StringVariable) {
-            return ((StringVariable) variable).getConfigurationElement().getNamespace();
+            return ((StringVariable) variable).getConfigurationElement().getContributor().getName();
         }
         return null;
     }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
index 0c3079108..50d260dbe 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
@@ -922,7 +922,7 @@ public class DebugPlugin extends Plugin {
 					fProcessFactories.put(id, configurationElement);
 			} else {
 				// invalid process factory
-				String badDefiner= infos[i].getNamespace();
+				String badDefiner= infos[i].getContributor().getName();
 				log(new Status(IStatus.ERROR, DebugPlugin.PI_DEBUG_CORE, INTERNAL_ERROR, MessageFormat.format(DebugCoreMessages.DebugPlugin_31, new String[] {badDefiner, id}), null)); 
 			}
 		}			
@@ -1326,7 +1326,7 @@ public class DebugPlugin extends Plugin {
 	}
 	
 	/**
-	 * Parses the given command line into seperate arguments that can be passed to
+	 * Parses the given command line into separate arguments that can be passed to
 	 * <code>DebugPlugin.exec(String[], File)</code>. Embedded quotes and slashes
 	 * are escaped.
 	 * 
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
index 6a83bfd75..010903f29 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfigurationType.java
@@ -221,7 +221,7 @@ public class LaunchConfigurationType extends PlatformObject implements ILaunchCo
 	 * @see org.eclipse.debug.core.ILaunchConfigurationType#getPluginId()
 	 */
 	public String getPluginIdentifier() {
-		return fElement.getNamespace();
+		return fElement.getContributor().getName();
 	}
 	
 	/* (non-Javadoc)
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
index cfdbe6cc2..4d45e0788 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchManager.java
@@ -1513,7 +1513,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 				} else {
 					// invalid status handler
 					IStatus s = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR,
-					MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1, new String[] {configurationElement.getNamespace()}), null); 
+					MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_launch_configuration_comparator_extension_defined_by_plug_in__0____attribute_not_specified_1, new String[] {configurationElement.getContributor().getName()}), null); 
 					DebugPlugin.log(s);
 				}
 			}
@@ -1618,7 +1618,7 @@ public class LaunchManager extends PlatformObject implements ILaunchManager, IRe
 				} else {
 					// invalid status handler
 					IStatus s = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugException.INTERNAL_ERROR,
-					MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12, new String[] {configurationElement.getNamespace()} ), null);  
+					MessageFormat.format(DebugCoreMessages.LaunchManager_Invalid_source_locator_extentsion_defined_by_plug_in____0_______id___not_specified_12, new String[] {configurationElement.getContributor().getName()} ), null);  
 					DebugPlugin.log(s);
 				}
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index 3f4bdb710..cf0c66731 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -30,6 +30,7 @@ import javax.xml.transform.stream.StreamResult;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IAdapterManager;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -326,7 +327,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener {
 	public static Object createExtension(final IConfigurationElement element, final String classAttribute) throws CoreException {
 		// If plugin has been loaded create extension.
 		// Otherwise, show busy cursor then create extension.
-		Bundle bundle = Platform.getBundle(element.getNamespace());
+		Bundle bundle = Platform.getBundle(element.getContributor().getName());
 		if (bundle.getState() == Bundle.ACTIVE) {
 			return element.createExecutableExtension(classAttribute);
 		} 
@@ -1024,10 +1025,10 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener {
      * @return image descriptor or <code>null</code>
      */
     public static ImageDescriptor getImageDescriptor(IConfigurationElement element, String attr) {
-		Bundle bundle = Platform.getBundle(element.getNamespace());
+		Bundle bundle = Platform.getBundle(element.getContributor().getName());
 		String iconPath = element.getAttribute(attr);
 		if (iconPath != null) {
-			URL iconURL = Platform.find(bundle , new Path(iconPath));
+			URL iconURL = FileLocator.find(bundle , new Path(iconPath), null);
 			if (iconURL != null) {
 				return ImageDescriptor.createFromURL(iconURL);
 			}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
index 2f797fb8a..5ea8392b3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchShortcutExtension.java
@@ -98,7 +98,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut, IPluginContribu
 	 * on the given configuration element
 	 * 
 	 * @param element the configuration element defining the
-	 *  attribtues of this launch configuration tab extension
+	 *  attributes of this launch configuration tab extension
 	 * @return a new launch configuration tab extension
 	 */
 	public LaunchShortcutExtension(IConfigurationElement element) {
@@ -419,7 +419,7 @@ public class LaunchShortcutExtension implements ILaunchShortcut, IPluginContribu
 	 * @see org.eclipse.ui.IPluginContribution#getPluginId()
 	 */
 	public String getPluginId() {
-		return fConfig.getNamespace();
+		return fConfig.getContributor().getName();
 	}
 }
 
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java
index 9eae5de20..530974986 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsoleFactoryExtension.java
@@ -18,6 +18,7 @@ import org.eclipse.core.expressions.Expression;
 import org.eclipse.core.expressions.ExpressionConverter;
 import org.eclipse.core.expressions.ExpressionTagNames;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
@@ -53,7 +54,7 @@ public class ConsoleFactoryExtension implements IPluginContribution {
      * @see org.eclipse.ui.IPluginContribution#getPluginId()
      */
     public String getPluginId() {
-        return fConfig.getNamespace();
+        return fConfig.getContributor().getName();
     }
 
     public boolean isEnabled() {
@@ -98,7 +99,7 @@ public class ConsoleFactoryExtension implements IPluginContribution {
             String path = fConfig.getAttributeAsIs("icon"); //$NON-NLS-1$
             if (path != null) {
                 Bundle bundle = Platform.getBundle(getPluginId());
-                URL url = Platform.find(bundle, new Path(path));
+                URL url = FileLocator.find(bundle, new Path(path), null);
                 if (url != null) {
                 	fImageDescriptor =  ImageDescriptor.createFromURL(url);
                 }
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java
index e9fff1230..b5920cc0a 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/ConsolePageParticipantExtension.java
@@ -41,7 +41,7 @@ public class ConsolePageParticipantExtension implements IPluginContribution {
      * @see org.eclipse.ui.IPluginContribution#getPluginId()
      */
     public String getPluginId() {
-        return fConfig.getNamespace();
+        return fConfig.getContributor().getName();
     }
     
     public boolean isEnabledFor(IConsole console) throws CoreException {
diff --git a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java
index 85b029cca..2cf220039 100644
--- a/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java
+++ b/org.eclipse.ui.console/src/org/eclipse/ui/internal/console/PatternMatchListenerExtension.java
@@ -126,7 +126,7 @@ public class PatternMatchListenerExtension implements IPluginContribution {
      * @see org.eclipse.ui.IPluginContribution#getPluginId()
      */
     public String getPluginId() {
-        return fConfig.getNamespace();
+        return fConfig.getContributor().getName();
     }
 
     public String getQuickPattern() {