diff options
author | Luc Bourlier | 2003-10-21 17:34:35 +0000 |
---|---|---|
committer | Luc Bourlier | 2003-10-21 17:34:35 +0000 |
commit | 459e7a37e00d381973d431e7b1db2a8051e1dcfd (patch) | |
tree | ba3944ddb840f4c3ef99008d91ec46cbbd003057 /org.eclipse.debug.ui | |
parent | ef4184e8b5762b801e7d047b06b84cb9e5bdbb13 (diff) | |
download | eclipse.platform.debug-459e7a37e00d381973d431e7b1db2a8051e1dcfd.tar.gz eclipse.platform.debug-459e7a37e00d381973d431e7b1db2a8051e1dcfd.tar.xz eclipse.platform.debug-459e7a37e00d381973d431e7b1db2a8051e1dcfd.zip |
Bug 43332 - String Substitution Support - org.eclipse.core.variables
Diffstat (limited to 'org.eclipse.debug.ui')
11 files changed, 16 insertions, 13 deletions
diff --git a/org.eclipse.debug.ui/.classpath b/org.eclipse.debug.ui/.classpath index d505bd7a2..f55c0d5bf 100644 --- a/org.eclipse.debug.ui/.classpath +++ b/org.eclipse.debug.ui/.classpath @@ -9,5 +9,6 @@ <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/> <classpathentry kind="src" path="/org.eclipse.help"/> <classpathentry kind="src" path="/org.eclipse.ui.console"/> + <classpathentry kind="src" path="/org.eclipse.core.variables"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/org.eclipse.debug.ui/.project b/org.eclipse.debug.ui/.project index b92199dd9..2d33a84f1 100644 --- a/org.eclipse.debug.ui/.project +++ b/org.eclipse.debug.ui/.project @@ -6,6 +6,7 @@ <project>org.eclipse.core.boot</project> <project>org.eclipse.core.resources</project> <project>org.eclipse.core.runtime</project> + <project>org.eclipse.core.variables</project> <project>org.eclipse.debug.core</project> <project>org.eclipse.help</project> <project>org.eclipse.ui</project> diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml index 5b83dd93f..ffbc2e2b3 100644 --- a/org.eclipse.debug.ui/plugin.xml +++ b/org.eclipse.debug.ui/plugin.xml @@ -14,6 +14,7 @@ </runtime> <requires> <import plugin="org.eclipse.core.resources"/> + <import plugin="org.eclipse.core.variables"/> <import plugin="org.eclipse.ui"/> <import plugin="org.eclipse.ui.console"/> <import plugin="org.eclipse.help"/> @@ -1290,7 +1291,7 @@ <!-- Dynamic (String Substitution) Variables --> <extension - point="org.eclipse.debug.core.dynamicVariables"> + point="org.eclipse.core.variables.dynamicVariables"> <variable name="workspace_loc" resolver="org.eclipse.debug.internal.ui.stringsubstitution.WorkspaceResolver" diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/IArgumentSelector.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/IArgumentSelector.java index e584f7a81..d24ca9286 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/IArgumentSelector.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/IArgumentSelector.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.stringsubstitution; -import org.eclipse.debug.internal.core.stringsubstitution.IStringVariable; +import org.eclipse.core.variables.IStringVariable; import org.eclipse.swt.widgets.Shell; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java index 3792f0989..16520b7b3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java @@ -13,8 +13,8 @@ package org.eclipse.debug.internal.ui.stringsubstitution; import java.text.MessageFormat; -import org.eclipse.debug.internal.core.stringsubstitution.IDynamicVariable; -import org.eclipse.debug.internal.core.stringsubstitution.IDynamicVariableResolver; +import org.eclipse.core.variables.IDynamicVariable; +import org.eclipse.core.variables.IDynamicVariableResolver; import org.eclipse.debug.internal.ui.DebugUIPlugin; /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java index 954c29c1c..034edbc63 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceResolver.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.debug.internal.core.stringsubstitution.IDynamicVariable; -import org.eclipse.debug.internal.core.stringsubstitution.IDynamicVariableResolver; +import org.eclipse.core.variables.IDynamicVariable; +import org.eclipse.core.variables.IDynamicVariableResolver; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.IDebugUIConstants; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java index 3d3c723da..76e0935f9 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/ResourceSelector.java @@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.stringsubstitution; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.debug.internal.core.stringsubstitution.IStringVariable; +import org.eclipse.core.variables.IStringVariable; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ResourceListSelectionDialog; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java index 54cf4443f..2386b4cc3 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableLabelProvider.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.stringsubstitution; -import org.eclipse.debug.internal.core.stringsubstitution.IStringVariable; +import org.eclipse.core.variables.IStringVariable; import org.eclipse.jface.viewers.LabelProvider; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java index 126b603ba..5f6fc67fe 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariablePresentationManager.java @@ -17,7 +17,7 @@ import java.util.Map; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.debug.internal.core.stringsubstitution.IStringVariable; +import org.eclipse.core.variables.IStringVariable; import org.eclipse.debug.internal.ui.DebugUIPlugin; /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableSelectionDialog.java index d6fd138cc..e4cd67e5d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/StringVariableSelectionDialog.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.debug.internal.ui.stringsubstitution; -import org.eclipse.debug.internal.core.stringsubstitution.IStringVariable; -import org.eclipse.debug.internal.core.stringsubstitution.StringVariableManager; +import org.eclipse.core.variables.IStringVariable; +import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.debug.internal.ui.SWTUtil; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -53,7 +53,7 @@ public class StringVariableSelectionDialog extends ElementListSelectionDialog { setTitle(StringSubstitutionMessages.getString("StringVariableSelectionDialog.2")); //$NON-NLS-1$ setMessage(StringSubstitutionMessages.getString("StringVariableSelectionDialog.3")); //$NON-NLS-1$ setMultipleSelection(false); - setElements(StringVariableManager.getDefault().getVariables()); + setElements(VariablesPlugin.getDefault().getStringVariableManager().getVariables()); } /** diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/WorkspaceResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/WorkspaceResolver.java index ae3ae3e2c..3a1c5c415 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/WorkspaceResolver.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/WorkspaceResolver.java @@ -12,7 +12,7 @@ package org.eclipse.debug.internal.ui.stringsubstitution; import org.eclipse.core.resources.IResource; -import org.eclipse.debug.internal.core.stringsubstitution.IDynamicVariable; +import org.eclipse.core.variables.IDynamicVariable; /** * Resolves the <code>${workspace_loc}</code> variable. The variable resolves to the |