From f57e0c8acf059d601a4f66fecb4e0cbcf0b4fd80 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Wed, 27 Jan 2016 10:22:27 -0500 Subject: [PATCH] added description control on Build Variables page Change-Id: Ib2f6b30bedb88e6ab2c886306171a5668ac1a415 --- .../cdt/newmake/core/IMakeCommonBuildInfo.java | 16 ++++++++-------- .../cdt/managedbuilder/internal/ui/Messages.java | 1 + .../internal/ui/Messages.properties | 1 + .../ui/properties/CPropertyVarsTab.java | 9 +++++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/IMakeCommonBuildInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/IMakeCommonBuildInfo.java index 024a04a6be9..a922672ceae 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/IMakeCommonBuildInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/IMakeCommonBuildInfo.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IPath; */ public interface IMakeCommonBuildInfo { public final static String ARGS_PREFIX = "org.eclipse.cdt.make.core"; //$NON-NLS-1$ - + public final static String BUILD_LOCATION = ARGS_PREFIX + ".build.location"; //$NON-NLS-1$ public final static String BUILD_COMMAND = ARGS_PREFIX + ".build.command"; //$NON-NLS-1$ public final static String BUILD_ARGUMENTS = ARGS_PREFIX + ".build.arguments"; //$NON-NLS-1$ @@ -34,11 +34,11 @@ public interface IMakeCommonBuildInfo { IPath getBuildLocation(); /** - * @deprecated - use setBuildString(BUILD_LOCATION...) + * @deprecated - use {@link #setBuildAttribute(BUILD_LOCATION, String)} */ @Deprecated void setBuildLocation(IPath location) throws CoreException; - + boolean isStopOnError(); void setStopOnError(boolean on) throws CoreException; boolean supportsStopOnError(boolean on); @@ -52,7 +52,7 @@ public interface IMakeCommonBuildInfo { * Sets maximum number of parallel threads/jobs to be used by builder. * Note that this number can be interpreted by builder in a special way. * @see Builder#setParallelizationNum(int) - * + * * @param jobs - maximum number of jobs. */ void setParallelizationNum(int jobs) throws CoreException; @@ -73,14 +73,14 @@ public interface IMakeCommonBuildInfo { /** * Set parallel execution mode for the builder. * @see Builder#setParallelBuildOn(boolean) - * + * * @param on - the flag to enable or disable parallel mode. */ void setParallelBuildOn(boolean on) throws CoreException; boolean isDefaultBuildCmd(); void setUseDefaultBuildCmd(boolean on) throws CoreException; - + IPath getBuildCommand(); /** @@ -104,10 +104,10 @@ public interface IMakeCommonBuildInfo { Map getEnvironment(); void setEnvironment(Map env) throws CoreException; - + boolean appendEnvironment(); void setAppendEnvironment(boolean append) throws CoreException; - + boolean isManagedBuildOn(); void setManagedBuildOn(boolean on) throws CoreException; boolean supportsBuild(boolean managed); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java index 76e6c865a6d..4ac42755a7c 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.java @@ -77,6 +77,7 @@ public class Messages extends NLS { public static String CMainWizardPage_1; public static String CNewWizard_0; public static String CPropertyVarsTab_0; + public static String CPropertyVarsTab_Description; public static String CWizardHandler_0; public static String CWizardHandler_1; public static String CWizardHandler_2; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties index a4b640700ef..f0ce7bf62b6 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties @@ -47,6 +47,7 @@ ArtifactTab_1=Artifact name: ArtifactTab_2=Artifact extension: ArtifactTab_3=Output prefix: CPropertyVarsTab_0=Show system variables +CPropertyVarsTab_Description=Build Variables are IDE only variables, which can be used for string substitution when defining external builder configuration, such as environment variable value or command line parameter in form of ${VAR}, internal builder may use them directly. DiscoveryTab_0=Discovery profiles scope DiscoveryTab_1=Per Language DiscoveryTab_2=Configuration-wide diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java index 5a385122523..f883e96f898 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/CPropertyVarsTab.java @@ -39,6 +39,7 @@ import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.preference.JFacePreferences; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.ColumnLayoutData; @@ -356,14 +357,14 @@ public class CPropertyVarsTab extends AbstractCPropertyTab { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createControls(Composite parent) { super.createControls(parent); - initButtons(new String[] {ADD_STR, EDIT_STR, DEL_STR}); usercomp.setLayout(new GridLayout(2, true)); + Label desc = new Label(usercomp.getParent(), SWT.WRAP); + desc.setText(Messages.CPropertyVarsTab_Description); + GridDataFactory.fillDefaults().grab(true, false).span(2, 1).applyTo(desc); + initButtons(new String[] {ADD_STR, EDIT_STR, DEL_STR}); createTableControl(); // Create a "show parent levels" button