diff options
21 files changed, 82 insertions, 159 deletions
diff --git a/org.eclipse.debug.ui/plugin.xml b/org.eclipse.debug.ui/plugin.xml index 42d1daa24..58145d990 100644 --- a/org.eclipse.debug.ui/plugin.xml +++ b/org.eclipse.debug.ui/plugin.xml @@ -1213,17 +1213,17 @@ point="org.eclipse.debug.core.contextLaunchVariables"> <variable name="string_prompt" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.StringPromptExpander" + expanderClass="org.eclipse.debug.internal.ui.launchVariables.StringPromptExpander" description="%string_prompt.description"> </variable> <variable name="file_prompt" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.FilePromptExpander" + expanderClass="org.eclipse.debug.internal.ui.launchVariables.FilePromptExpander" description="%file_prompt.description"> </variable> <variable name="folder_prompt" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.FolderPromptExpander" + expanderClass="org.eclipse.debug.internal.ui.launchVariables.FolderPromptExpander" description="%folder_prompt.description"> </variable> </extension> @@ -1237,22 +1237,22 @@ <variable name="project" description="%project.description" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.ProjectExpander"> + expanderClass="org.eclipse.debug.internal.core.variables.ProjectExpander"> </variable> <variable name="container" description="%container.description" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.ContainerExpander"> + expanderClass="org.eclipse.debug.internal.core.variables.ContainerExpander"> </variable> <variable name="resource" description="%resource.description" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.ResourceExpander"> + expanderClass="org.eclipse.debug.internal.core.variables.ResourceExpander"> </variable> <variable name="working_set" description="%working_set.description" - expanderClass="org.eclipse.debug.ui.launchVariables.expanders.WorkingSetExpander"> + expanderClass="org.eclipse.debug.internal.ui.launchVariables.WorkingSetExpander"> </variable> </extension> <!-- Variable Components --> 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 2583235be..4726154f9 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 @@ -51,7 +51,7 @@ import org.eclipse.debug.internal.ui.views.variables.VariablesContentProviderMan import org.eclipse.debug.ui.IDebugModelPresentation; import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.debug.ui.launchVariables.ILaunchVariableComponentManager; -import org.eclipse.debug.ui.launchVariables.VariableContextManager; +import org.eclipse.debug.ui.launchVariables.LaunchVariableContextManager; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -323,7 +323,7 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener { new Runnable() { public void run() { //initialize the variable context manager - VariableContextManager.getDefault(); + LaunchVariableContextManager.getDefault(); } }); } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ContextVariableComponentManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ContextVariableComponentManager.java index 556c7e62a..f8f0d4f31 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ContextVariableComponentManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ContextVariableComponentManager.java @@ -18,8 +18,16 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.debug.ui.IDebugUIConstants; -import org.eclipse.debug.ui.launchVariables.IVariableComponent; +import org.eclipse.debug.ui.launchVariables.*; import org.eclipse.debug.ui.launchVariables.ILaunchVariableComponentManager; +import org.eclipse.debug.ui.launchVariables.IVariableComponent; +import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; +import org.eclipse.jface.resource.JFaceColors; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; /** * Manager which returns the variable editing component associated with @@ -80,5 +88,41 @@ public class ContextVariableComponentManager implements ILaunchVariableComponent fVariableMap.put(variableName, element); } } + + /** + * Default variable component implementation which does not + * allow variable value editing visually. + */ + private static class DefaultVariableComponent extends AbstractVariableComponent { + private boolean showError = false; + private Label message = null; + + public DefaultVariableComponent(boolean showError) { + super(); + this.showError = showError; + } + + /* (non-Javadoc) + * Method declared on IVariableComponent. + */ + public Control getControl() { + return message; + } + + /* (non-Javadoc) + * Method declared on IVariableComponent. + */ + public void createContents(Composite parent, String varTag, IVariableComponentContainer page) { + container= page; + if (showError) { + message = new Label(parent, SWT.NONE); + GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); + message.setLayoutData(data); + message.setFont(parent.getFont()); + message.setText(LaunchVariableMessages.getString("DefaultVariableComponent.0")); //$NON-NLS-1$ + message.setForeground(JFaceColors.getErrorText(message.getDisplay())); + } + } + } } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/DefaultVariableComponent.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/DefaultVariableComponent.java deleted file mode 100644 index e594f4710..000000000 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/DefaultVariableComponent.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 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 - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.debug.internal.ui.launchVariables; - -import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; -import org.eclipse.jface.resource.JFaceColors; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; - -/** - * Default variable component implementation which does not - * allow variable value editing visually. - */ -final class DefaultVariableComponent extends AbstractVariableComponent { - private boolean showError = false; - private Label message = null; - - public DefaultVariableComponent(boolean showError) { - super(); - this.showError = showError; - } - - /* (non-Javadoc) - * Method declared on IVariableComponent. - */ - public Control getControl() { - return message; - } - - /* (non-Javadoc) - * Method declared on IVariableComponent. - */ - public void createContents(Composite parent, String varTag, IVariableComponentContainer page) { - container= page; - if (showError) { - message = new Label(parent, SWT.NONE); - GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - message.setLayoutData(data); - message.setFont(parent.getFont()); - message.setText(LaunchVariableMessages.getString("DefaultVariableComponent.0")); //$NON-NLS-1$ - message.setForeground(JFaceColors.getErrorText(message.getDisplay())); - } - } -}
\ No newline at end of file diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/FilePromptExpander.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/FilePromptExpander.java index f37d330a7..1bdd608aa 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/FilePromptExpander.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/FilePromptExpander.java @@ -9,7 +9,7 @@ * Matt Conway - initial implementation * IBM Corporation - integration and code cleanup *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables.expanders; +package org.eclipse.debug.internal.ui.launchVariables; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.swt.widgets.FileDialog; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/FolderPromptExpander.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/FolderPromptExpander.java index 1cec82386..6dcf4f453 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/FolderPromptExpander.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/FolderPromptExpander.java @@ -9,7 +9,7 @@ * Matt Conway - initial implementation * IBM Corporation - integration and code cleanup *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables.expanders; +package org.eclipse.debug.internal.ui.launchVariables; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.swt.widgets.DirectoryDialog; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/PromptExpanderBase.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/PromptExpanderBase.java index 5f74e7a5d..224863118 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/PromptExpanderBase.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/PromptExpanderBase.java @@ -9,7 +9,7 @@ * Matt Conway - initial implementation * IBM Corporation - integration and code cleanup *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables.expanders; +package org.eclipse.debug.internal.ui.launchVariables; import java.text.MessageFormat; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ResourceComponent.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ResourceComponent.java index 1b54d5209..6f4af7f82 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ResourceComponent.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/ResourceComponent.java @@ -13,6 +13,7 @@ package org.eclipse.debug.internal.ui.launchVariables; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.debug.ui.launchVariables.*; import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/StringPromptExpander.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/StringPromptExpander.java index cfe6bc998..fa5f6ad35 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/StringPromptExpander.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/StringPromptExpander.java @@ -9,7 +9,7 @@ * Matt Conway - initial implementation * IBM Corporation - integration and code cleanup *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables.expanders; +package org.eclipse.debug.internal.ui.launchVariables; import org.eclipse.jface.dialogs.InputDialog; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/WorkingSetComponent.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/WorkingSetComponent.java index d90b02fa0..c7b9b6305 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/WorkingSetComponent.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/WorkingSetComponent.java @@ -15,9 +15,9 @@ import java.io.StringWriter; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.debug.internal.ui.DebugUIPlugin; +import org.eclipse.debug.ui.launchVariables.*; import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; import org.eclipse.debug.ui.launchVariables.IVariableConstants; -import org.eclipse.debug.ui.launchVariables.expanders.WorkingSetExpander; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.wizard.WizardDialog; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/WorkingSetExpander.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/WorkingSetExpander.java index 027d370b6..9098c1992 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/WorkingSetExpander.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/WorkingSetExpander.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables.expanders; +package org.eclipse.debug.internal.ui.launchVariables; import java.io.StringReader; import java.text.MessageFormat; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/AbstractVariableComponent.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/AbstractVariableComponent.java index a3ad6d1ee..620bc3fc5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchVariables/AbstractVariableComponent.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/AbstractVariableComponent.java @@ -8,11 +8,9 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.debug.internal.ui.launchVariables; +package org.eclipse.debug.ui.launchVariables; import org.eclipse.debug.core.variables.LaunchVariableUtil; -import org.eclipse.debug.ui.launchVariables.IVariableComponent; -import org.eclipse.debug.ui.launchVariables.IVariableComponentContainer; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -23,6 +21,7 @@ import org.eclipse.swt.widgets.Group; /** * The AbstractVariableComponent provides the base implementation of an * <code>IVariableComponent</code>. + * * @since 3.0 */ public abstract class AbstractVariableComponent implements IVariableComponent { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchConfigurationVariableForm.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchConfigurationVariableForm.java index 270d8feee..0bd8c1ba6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchConfigurationVariableForm.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchConfigurationVariableForm.java @@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.List; * Visual grouping of controls that allows the user to * select a variable and configure it with extra * information. + * * @since 3.0 */ public class LaunchConfigurationVariableForm { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/VariableContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableContextManager.java index 133d4eaae..ff852d6c5 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/VariableContextManager.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableContextManager.java @@ -30,14 +30,14 @@ import org.eclipse.ui.PlatformUI; * Maintains the context used to expand variables. The context is based on * the selected resource. */ -public class VariableContextManager implements IWindowListener, ISelectionListener { +public class LaunchVariableContextManager implements IWindowListener, ISelectionListener { // singleton - private static VariableContextManager fgDefault; + private static LaunchVariableContextManager fgDefault; private IResource fSelectedResource = null; - private VariableContextManager() { + private LaunchVariableContextManager() { IWorkbench workbench = PlatformUI.getWorkbench(); if (workbench != null) { //may be running headless workbench.addWindowListener(this); @@ -53,9 +53,9 @@ public class VariableContextManager implements IWindowListener, ISelectionListen * * @return VariableContextManager */ - public static VariableContextManager getDefault() { + public static LaunchVariableContextManager getDefault() { if (fgDefault == null) { - fgDefault = new VariableContextManager(); + fgDefault = new LaunchVariableContextManager(); } return fgDefault; } diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableMessages.java deleted file mode 100644 index 38eeff30d..000000000 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableMessages.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 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 - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class LaunchVariableMessages { - - private static final String BUNDLE_NAME = "org.eclipse.debug.internal.ui.launchVariables.LaunchVariableMessages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - - private LaunchVariableMessages() { - - // TODO Auto-generated constructor stub - } - public static String getString(String key) { - // TODO Auto-generated method stub - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/VariableSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableSelectionDialog.java index 0b65a3433..2fda6a4c1 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/VariableSelectionDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/LaunchVariableSelectionDialog.java @@ -13,6 +13,7 @@ package org.eclipse.debug.ui.launchVariables; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.variables.ILaunchVariable; import org.eclipse.debug.internal.ui.IDebugHelpContextIds; +import org.eclipse.debug.internal.ui.launchVariables.LaunchVariableMessages; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -32,10 +33,10 @@ import org.eclipse.ui.help.WorkbenchHelp; * Dialog that prompts the user to select a launch configuration variable. * @since 3.0 */ -public class VariableSelectionDialog extends SelectionDialog { +public class LaunchVariableSelectionDialog extends SelectionDialog { private LaunchConfigurationVariableForm form; private Composite formComposite; - public VariableSelectionDialog(Shell parent) { + public LaunchVariableSelectionDialog(Shell parent) { super(parent); setShellStyle(getShellStyle() | SWT.RESIZE); setTitle(LaunchVariableMessages.getString("VariableSelectionDialog.0")); //$NON-NLS-1$ @@ -98,7 +99,7 @@ public class VariableSelectionDialog extends SelectionDialog { form.createContents(formComposite, new IVariableComponentContainer() { public void setErrorMessage(String errorMessage) { - VariableSelectionDialog.this.setMessage(errorMessage); + LaunchVariableSelectionDialog.this.setMessage(errorMessage); } public void updateValidState() { diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/RefreshTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/RefreshTab.java index e0ea302cf..98684ab97 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/RefreshTab.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/RefreshTab.java @@ -356,6 +356,6 @@ public class RefreshTab extends AbstractLaunchConfigurationTab implements IVaria return null; } - return variable.getExpander().getResources(varDef.name, varDef.argument, VariableContextManager.getDefault().getVariableContext()); + return variable.getExpander().getResources(varDef.name, varDef.argument, LaunchVariableContextManager.getDefault().getVariableContext()); } }
\ No newline at end of file diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/LaunchVariableMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/LaunchVariableMessages.java deleted file mode 100644 index ae1d12c0c..000000000 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/launchVariables/expanders/LaunchVariableMessages.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 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 - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.debug.ui.launchVariables.expanders; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -public class LaunchVariableMessages { - - private static final String BUNDLE_NAME = "org.eclipse.debug.internal.ui.launchVariables.LaunchVariableMessages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - - private LaunchVariableMessages() { - - // TODO Auto-generated constructor stub - } - public static String getString(String key) { - // TODO Auto-generated method stub - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java index 3ca85ed89..20bf96ad3 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsMainTab.java @@ -25,7 +25,7 @@ import org.eclipse.debug.core.variables.ILaunchVariableConstants; import org.eclipse.debug.core.variables.ILaunchVariableManager; import org.eclipse.debug.core.variables.LaunchVariableUtil; import org.eclipse.debug.ui.AbstractLaunchConfigurationTab; -import org.eclipse.debug.ui.launchVariables.VariableSelectionDialog; +import org.eclipse.debug.ui.launchVariables.LaunchVariableSelectionDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -243,7 +243,7 @@ public abstract class ExternalToolsMainTab extends AbstractLaunchConfigurationTa variableButton.setLayoutData(gridData); variableButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - VariableSelectionDialog dialog= new VariableSelectionDialog(getShell()); + LaunchVariableSelectionDialog dialog= new LaunchVariableSelectionDialog(getShell()); if (dialog.open() == SelectionDialog.OK) { argumentField.insert(dialog.getForm().getSelectedVariable()); } diff --git a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java index 71e551bda..cc982b77e 100644 --- a/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java +++ b/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/launchConfigurations/ExternalToolsUtil.java @@ -28,7 +28,7 @@ import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.variables.LaunchVariableUtil; import org.eclipse.debug.ui.launchVariables.RefreshTab; -import org.eclipse.debug.ui.launchVariables.VariableContextManager; +import org.eclipse.debug.ui.launchVariables.LaunchVariableContextManager; import org.eclipse.ui.externaltools.internal.model.IExternalToolConstants; import org.eclipse.ui.externaltools.internal.registry.ExternalToolMigration; @@ -80,7 +80,7 @@ public class ExternalToolsUtil { abort(MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Location_not_specified_by_{0}_1"), new String[] { configuration.getName()}), null, 0); //$NON-NLS-1$ } else { MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_location._3"), null); //$NON-NLS-1$ - String expandedLocation = LaunchVariableUtil.expandVariables(location, status, VariableContextManager.getDefault().getVariableContext()); + String expandedLocation = LaunchVariableUtil.expandVariables(location, status, LaunchVariableContextManager.getDefault().getVariableContext()); if (status.isOK()) { if (expandedLocation == null || expandedLocation.length() == 0) { String msg = MessageFormat.format(ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.invalidLocation_{0}"), new Object[] { configuration.getName()}); //$NON-NLS-1$ @@ -135,7 +135,7 @@ public class ExternalToolsUtil { String location = configuration.getAttribute(IExternalToolConstants.ATTR_WORKING_DIRECTORY, (String) null); if (location != null) { MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_working_directory._4"), null); //$NON-NLS-1$ - String expandedLocation = LaunchVariableUtil.expandVariables(location, status, VariableContextManager.getDefault().getVariableContext()); + String expandedLocation = LaunchVariableUtil.expandVariables(location, status, LaunchVariableContextManager.getDefault().getVariableContext()); if (status.isOK()) { if (expandedLocation != null && expandedLocation.length() > 0) { File path = new File(expandedLocation); @@ -169,7 +169,7 @@ public class ExternalToolsUtil { String args = configuration.getAttribute(IExternalToolConstants.ATTR_TOOL_ARGUMENTS, (String) null); if (args != null) { MultiStatus status = new MultiStatus(IExternalToolConstants.PLUGIN_ID, 0, ExternalToolsLaunchConfigurationMessages.getString("ExternalToolsUtil.Could_not_resolve_an_argument._1"), null); //$NON-NLS-1$ - String[] expandedArgs = LaunchVariableUtil.expandStrings(args, status, VariableContextManager.getDefault().getVariableContext()); + String[] expandedArgs = LaunchVariableUtil.expandStrings(args, status, LaunchVariableContextManager.getDefault().getVariableContext()); if (status.isOK()) { return expandedArgs; } else { diff --git a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java index 27009acdc..5c792e8c5 100644 --- a/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java +++ b/org.eclipse.ui.externaltools/Program Tools Support/org/eclipse/ui/externaltools/internal/program/launchConfigurations/ProgramLaunchDelegate.java @@ -28,7 +28,7 @@ import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.variables.LaunchVariableUtil; import org.eclipse.debug.ui.launchVariables.RefreshTab; -import org.eclipse.debug.ui.launchVariables.VariableContextManager; +import org.eclipse.debug.ui.launchVariables.LaunchVariableContextManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.ui.IWindowListener; import org.eclipse.ui.IWorkbenchWindow; @@ -137,7 +137,7 @@ public class ProgramLaunchDelegate implements ILaunchConfigurationDelegate { return; } - String[] envp = LaunchVariableUtil.getEnvironment(configuration, VariableContextManager.getDefault().getVariableContext()); + String[] envp = LaunchVariableUtil.getEnvironment(configuration, LaunchVariableContextManager.getDefault().getVariableContext()); if (monitor.isCanceled()) { return; |