Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarin Swanson2004-05-05 04:37:34 +0000
committerDarin Swanson2004-05-05 04:37:34 +0000
commit315f04e8330e00ee5249950d9a3f3ef884438b7f (patch)
treeca8cbb3fa86f11f0cc8bcb714cca4a5dcd18d6f3 /org.eclipse.core.variables/src/org/eclipse
parentcba19eb2b5d8f7987cf6dbaf6ffea24b58627481 (diff)
downloadeclipse.platform.debug-315f04e8330e00ee5249950d9a3f3ef884438b7f.tar.gz
eclipse.platform.debug-315f04e8330e00ee5249950d9a3f3ef884438b7f.tar.xz
eclipse.platform.debug-315f04e8330e00ee5249950d9a3f3ef884438b7f.zip
Bug 60364 - debug used deprecated runtime code
Diffstat (limited to 'org.eclipse.core.variables/src/org/eclipse')
-rw-r--r--org.eclipse.core.variables/src/org/eclipse/core/internal/variables/StringVariableManager.java6
-rw-r--r--org.eclipse.core.variables/src/org/eclipse/core/variables/VariablesPlugin.java17
2 files changed, 6 insertions, 17 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 41e66ddd8..4c0241d9d 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -203,7 +203,7 @@ public class StringVariableManager implements IStringVariableManager {
* Loads contributed dynamic variables
*/
private void loadDynamicVariables() {
- IExtensionPoint point= VariablesPlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_DYNAMIC_VARIABLES);
+ IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(VariablesPlugin.PI_CORE_VARIABLES, EXTENSION_POINT_DYNAMIC_VARIABLES);
IConfigurationElement elements[]= point.getConfigurationElements();
for (int i = 0; i < elements.length; i++) {
IConfigurationElement element = elements[i];
@@ -271,7 +271,7 @@ public class StringVariableManager implements IStringVariableManager {
* merged with existing persisted values.
*/
private void loadContributedValueVariables() {
- IExtensionPoint point= VariablesPlugin.getDefault().getDescriptor().getExtensionPoint(EXTENSION_POINT_VALUE_VARIABLES);
+ IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(VariablesPlugin.PI_CORE_VARIABLES, EXTENSION_POINT_VALUE_VARIABLES);
IConfigurationElement elements[]= point.getConfigurationElements();
for (int i = 0; i < elements.length; i++) {
IConfigurationElement element = elements[i];
diff --git a/org.eclipse.core.variables/src/org/eclipse/core/variables/VariablesPlugin.java b/org.eclipse.core.variables/src/org/eclipse/core/variables/VariablesPlugin.java
index 0756a5455..fa82ad928 100644
--- a/org.eclipse.core.variables/src/org/eclipse/core/variables/VariablesPlugin.java
+++ b/org.eclipse.core.variables/src/org/eclipse/core/variables/VariablesPlugin.java
@@ -12,7 +12,6 @@
package org.eclipse.core.variables;
import org.eclipse.core.internal.variables.StringVariableManager;
-import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
@@ -52,12 +51,9 @@ public class VariablesPlugin extends Plugin {
* when the facilities provided by the Variables plug-in are required.
* <b>Clients must never explicitly instantiate a plug-in runtime class.</b>
* </p>
- *
- * @param pluginDescriptor the plug-in descriptor for the
- * Variables plug-in
*/
- public VariablesPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public VariablesPlugin() {
+ super();
plugin = this;
}
@@ -102,13 +98,7 @@ public class VariablesPlugin extends Plugin {
* Convenience method which returns the unique identifier of this plugin.
*/
public static String getUniqueIdentifier() {
- if (getDefault() == null) {
- // If the default instance is not yet initialized,
- // return a static identifier. This identifier must
- // match the plugin id defined in plugin.xml
- return PI_CORE_VARIABLES;
- }
- return getDefault().getDescriptor().getUniqueIdentifier();
+ return PI_CORE_VARIABLES;
}
/**
@@ -119,5 +109,4 @@ public class VariablesPlugin extends Plugin {
public IStringVariableManager getStringVariableManager() {
return StringVariableManager.getDefault();
}
-
}

Back to the top