Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blewitt2016-04-23 10:33:27 -0400
committerAlex Blewitt2016-04-25 17:53:30 -0400
commit12904409a3d93f4ef47fb40c47b44eb6c4ead01b (patch)
treed0ff3ca029709f6c925bcc3f08f9b18e2d9397a4 /build/org.eclipse.cdt.autotools.core/src
parentb2db3a489c2e367718f93db7060b8e8c0b2c05a2 (diff)
downloadorg.eclipse.cdt-12904409a3d93f4ef47fb40c47b44eb6c4ead01b.tar.gz
org.eclipse.cdt-12904409a3d93f4ef47fb40c47b44eb6c4ead01b.tar.xz
org.eclipse.cdt-12904409a3d93f4ef47fb40c47b44eb6c4ead01b.zip
Bug 492304 - Fix NLS warnings
Eclipse warns if a String literal does not have a `//$NON-NLS-<n>$` entry at the end of the line. However, for historic or formatting reasons, many such occurrences in the CDT source have an intermediate whitespace, such as `// $NON-NLS-<n>$` Fix these so that the whitespace is removed between the // and $ characters. Change-Id: Idc12398fe6e9d619af1d0b1b73fb8b6180da223c Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>
Diffstat (limited to 'build/org.eclipse.cdt.autotools.core/src')
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java4
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java92
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java10
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java42
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java26
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java34
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java6
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java6
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java4
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java6
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java6
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java8
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java6
13 files changed, 125 insertions, 125 deletions
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
index 161985bb07..dee3dad79e 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsNewProjectNature.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2015 Red Hat Inc.. and others
+ * Copyright (c) 2008, 2016 Red Hat Inc. and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -42,7 +42,7 @@ public class AutotoolsNewProjectNature implements IProjectNature {
/**
* @since 1.3
*/
- public static final String REMOTE_BUILDER_ID = "org.eclipse.ptp.rdt.sync.cdt.core.SyncBuilder"; // $NON-NLS-1$
+ public static final String REMOTE_BUILDER_ID = "org.eclipse.ptp.rdt.sync.cdt.core.SyncBuilder"; //$NON-NLS-1$
public static final String OLD_AUTOTOOLS_BUILDER_ID = "org.eclipse.linuxtools.cdt.autotools.genmakebuilder"; //$NON-NLS-1$
private IProject project;
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
index 171bdb0c0a..44b916bc93 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/autotools/core/AutotoolsOptionConstants.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Red Hat Inc. and others.
+ * Copyright (c) 2012, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,59 +12,59 @@ package org.eclipse.cdt.autotools.core;
*/
public class AutotoolsOptionConstants {
// IAutotoolOption Names
- public static final String TOOL_CONFIGURE = "configure"; // $NON-NLS-1$
- public static final String CATEGORY_GENERAL = "general"; // $NON-NLS-1$
- public static final String OPT_CONFIGDIR = "configdir"; // $NON-NLS-1$
- public static final String OPT_CACHE_FILE = "cache-file"; // $NON-NLS-1$
- public static final String OPT_HELP = "help"; // $NON-NLS-1$
- public static final String OPT_NO_CREATE = "no-create"; // $NON-NLS-1$
- public static final String OPT_QUIET = "quiet"; // $NON-NLS-1$
- public static final String OPT_VERSION = "version"; // $NON-NLS-1$
- public static final String CATEGORY_PLATFORM = "platform"; // $NON-NLS-1$
- public static final String OPT_HOST = "host"; // $NON-NLS-1$
- public static final String OPT_BUILD = "build"; // $NON-NLS-1$
- public static final String OPT_TARGET = "target"; // $NON-NLS-1$
- public static final String CATEGORY_DIRECTORIES = "directories"; // $NON-NLS-1$
- public static final String OPT_PREFIX = "prefix"; // $NON-NLS-1$
- public static final String OPT_EXEC_PREFIX = "exec-prefix"; // $NON-NLS-1$
- public static final String OPT_LIBDIR = "libdir"; // $NON-NLS-1$
- public static final String OPT_BINDIR = "bindir"; // $NON-NLS-1$
- public static final String OPT_SBINDIR = "sbindir"; // $NON-NLS-1$
- public static final String OPT_INCLUDEDIR = "includedir"; // $NON-NLS-1$
- public static final String OPT_DATADIR = "datadir"; // $NON-NLS-1$
- public static final String OPT_SYSCONFDIR = "sysconfdir"; // $NON-NLS-1$
- public static final String OPT_INFODIR = "infodir"; // $NON-NLS-1$
- public static final String OPT_MANDIR = "mandir"; // $NON-NLS-1$
- public static final String OPT_SRCDIR = "srcdir"; // $NON-NLS-1$
- public static final String OPT_LOCALSTATEDIR = "localstatedir"; // $NON-NLS-1$
- public static final String OPT_SHAREDSTATEDIR = "sharedstatedir"; // $NON-NLS-1$
- public static final String OPT_LIBEXECDIR = "libexecdir"; // $NON-NLS-1$
- public static final String OPT_OLDINCLUDEDIR = "oldincludedir"; // $NON-NLS-1$
- public static final String CATEGORY_FILENAMES = "filenames"; // $NON-NLS-1$
- public static final String OPT_PROGRAM_PREFIX = "program-prefix"; // $NON-NLS-1$
- public static final String OPT_PROGRAM_SUFFIX = "program-suffix"; // $NON-NLS-1$
- public static final String OPT_PROGRAM_TRANSFORM_NAME = "program-transform-name"; // $NON-NLS-1$
- public static final String CATEGORY_FEATURES = "features"; // $NON-NLS-1$
- public static final String OPT_ENABLE_MAINTAINER_MODE = "enable-maintainer-mode"; // $NON-NLS-1$
- public static final String FLAG_CFLAGS = "CFLAGS"; // $NON-NLS-1$
+ public static final String TOOL_CONFIGURE = "configure"; //$NON-NLS-1$
+ public static final String CATEGORY_GENERAL = "general"; //$NON-NLS-1$
+ public static final String OPT_CONFIGDIR = "configdir"; //$NON-NLS-1$
+ public static final String OPT_CACHE_FILE = "cache-file"; //$NON-NLS-1$
+ public static final String OPT_HELP = "help"; //$NON-NLS-1$
+ public static final String OPT_NO_CREATE = "no-create"; //$NON-NLS-1$
+ public static final String OPT_QUIET = "quiet"; //$NON-NLS-1$
+ public static final String OPT_VERSION = "version"; //$NON-NLS-1$
+ public static final String CATEGORY_PLATFORM = "platform"; //$NON-NLS-1$
+ public static final String OPT_HOST = "host"; //$NON-NLS-1$
+ public static final String OPT_BUILD = "build"; //$NON-NLS-1$
+ public static final String OPT_TARGET = "target"; //$NON-NLS-1$
+ public static final String CATEGORY_DIRECTORIES = "directories"; //$NON-NLS-1$
+ public static final String OPT_PREFIX = "prefix"; //$NON-NLS-1$
+ public static final String OPT_EXEC_PREFIX = "exec-prefix"; //$NON-NLS-1$
+ public static final String OPT_LIBDIR = "libdir"; //$NON-NLS-1$
+ public static final String OPT_BINDIR = "bindir"; //$NON-NLS-1$
+ public static final String OPT_SBINDIR = "sbindir"; //$NON-NLS-1$
+ public static final String OPT_INCLUDEDIR = "includedir"; //$NON-NLS-1$
+ public static final String OPT_DATADIR = "datadir"; //$NON-NLS-1$
+ public static final String OPT_SYSCONFDIR = "sysconfdir"; //$NON-NLS-1$
+ public static final String OPT_INFODIR = "infodir"; //$NON-NLS-1$
+ public static final String OPT_MANDIR = "mandir"; //$NON-NLS-1$
+ public static final String OPT_SRCDIR = "srcdir"; //$NON-NLS-1$
+ public static final String OPT_LOCALSTATEDIR = "localstatedir"; //$NON-NLS-1$
+ public static final String OPT_SHAREDSTATEDIR = "sharedstatedir"; //$NON-NLS-1$
+ public static final String OPT_LIBEXECDIR = "libexecdir"; //$NON-NLS-1$
+ public static final String OPT_OLDINCLUDEDIR = "oldincludedir"; //$NON-NLS-1$
+ public static final String CATEGORY_FILENAMES = "filenames"; //$NON-NLS-1$
+ public static final String OPT_PROGRAM_PREFIX = "program-prefix"; //$NON-NLS-1$
+ public static final String OPT_PROGRAM_SUFFIX = "program-suffix"; //$NON-NLS-1$
+ public static final String OPT_PROGRAM_TRANSFORM_NAME = "program-transform-name"; //$NON-NLS-1$
+ public static final String CATEGORY_FEATURES = "features"; //$NON-NLS-1$
+ public static final String OPT_ENABLE_MAINTAINER_MODE = "enable-maintainer-mode"; //$NON-NLS-1$
+ public static final String FLAG_CFLAGS = "CFLAGS"; //$NON-NLS-1$
/**
* @since 1.4
*/
- public static final String FLAG_CFLAGS_FLAGS = "CFLAGS|CXXFLAGS"; // $NON-NLS-1$
- public static final String OPT_CFLAGS_DEBUG = "cflags-debug"; // $NON-NLS-1$
- public static final String OPT_CFLAGS_GPROF = "cflags-gprof"; // $NON-NLS-1$
- public static final String OPT_CFLAGS_GCOV = "cflags-gcov"; // $NON-NLS-1$
- public static final String OPT_USER = "user"; // $NON-NLS-1$
- public static final String TOOL_AUTOGEN = "autogen"; // $NON-NLS-1$
- public static final String CATEGORY_OPTIONS = "options"; // $NON-NLS-1$
- public static final String OPT_AUTOGENOPTS = "autogenOpts"; // $NON-NLS-1$
+ public static final String FLAG_CFLAGS_FLAGS = "CFLAGS|CXXFLAGS"; //$NON-NLS-1$
+ public static final String OPT_CFLAGS_DEBUG = "cflags-debug"; //$NON-NLS-1$
+ public static final String OPT_CFLAGS_GPROF = "cflags-gprof"; //$NON-NLS-1$
+ public static final String OPT_CFLAGS_GCOV = "cflags-gcov"; //$NON-NLS-1$
+ public static final String OPT_USER = "user"; //$NON-NLS-1$
+ public static final String TOOL_AUTOGEN = "autogen"; //$NON-NLS-1$
+ public static final String CATEGORY_OPTIONS = "options"; //$NON-NLS-1$
+ public static final String OPT_AUTOGENOPTS = "autogenOpts"; //$NON-NLS-1$
/**
* @since 2.0
*/
- public static final String CATEGORY_ENVVAR = "cat_envvar"; // $NON-NLS-1$
+ public static final String CATEGORY_ENVVAR = "cat_envvar"; //$NON-NLS-1$
/**
* @since 2.0
*/
- public final static String OPT_ENVVAR = "env_vars"; // $NON-NLS-1$
+ public final static String OPT_ENVVAR = "env_vars"; //$NON-NLS-1$
}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
index 2076cfd12d..813fd3b4b5 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 Red Hat Inc.and others.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -777,7 +777,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
protected IPath getConfigurePath(List<String> envVars, List<String> cmdParms) {
IPath configPath;
IConfigureOption configOption = toolsCfg.getOption(CONFIGURE_TOOL_ID);
- String command = "configure"; // $NON-NLS-1$
+ String command = "configure"; //$NON-NLS-1$
if (configOption != null)
command = stripEnvVars(configOption.getValue().trim(), envVars);
@@ -809,7 +809,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
protected IPath getAutogenPath(List<String> envVars, List<String> cmdParms) {
IPath autogenPath;
IConfigureOption autogenOption = toolsCfg.getOption(AUTOGEN_TOOL_ID);
- String command = "autogen.sh"; // $NON-NLS-1$
+ String command = "autogen.sh"; //$NON-NLS-1$
if (autogenOption != null)
command = stripEnvVars(autogenOption.getValue().trim(), envVars);
@@ -1219,14 +1219,14 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
// For Windows/Mac, check for PWD environment variable being passed.
// Remove it for now as it is causing errors in configuration.
// Fix for bug #343879
- if (!removePWD || !variables[i].getName().equals("PWD")) { // $NON-NLS-1$
+ if (!removePWD || !variables[i].getName().equals("PWD")) { //$NON-NLS-1$
String value = variables[i].getValue();
// The following is a work-around for bug #407580. Configure doesn't recognize
// a directory with a trailing separator at the end is equivalent to the same
// directory without that trailing separator. This problem can cause
// configure to try and link a file to itself (e.g. projects with a GnuMakefile) and
// obliterate the contents. Thus, we remove the trailing separator to be safe.
- if (variables[i].getName().equals("PWD")) { // $NON-NLS-1$
+ if (variables[i].getName().equals("PWD")) { //$NON-NLS-1$
if (value.charAt(value.length()-1) == IPath.SEPARATOR)
value = value.substring(0, value.length() - 1);
}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
index f66c2c3ab1..2d78a7e4a0 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsPropertyConstants.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Red Hat Inc.
+ * Copyright (c) 2007, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,41 +16,41 @@ import org.eclipse.core.runtime.QualifiedName;
public class AutotoolsPropertyConstants {
- static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; // $NON-NLS-1$
- static final String PREFIX_COMPAT = "org.eclipse.linuxtools.cdt.autotools."; // $NON-NLS-1$
- public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; // $NON-NLS-1$
+ static final String PREFIX = AutotoolsPlugin.getUniqueIdentifier() + "."; //$NON-NLS-1$
+ static final String PREFIX_COMPAT = "org.eclipse.linuxtools.cdt.autotools."; //$NON-NLS-1$
+ public static final String AUTOMAKE_VERSION_STRING = "AutoconfEditorAutomakeVersion"; //$NON-NLS-1$
public static final QualifiedName AUTOMAKE_VERSION = new QualifiedName(PREFIX, AUTOMAKE_VERSION_STRING);
public static final QualifiedName AUTOMAKE_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOMAKE_VERSION_STRING);
- public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; // $NON-NLS-1$
+ public static final String AUTOCONF_VERSION_STRING = "AutoconfEditorAutoconfVersion"; //$NON-NLS-1$
public static final QualifiedName AUTOCONF_VERSION = new QualifiedName(PREFIX, AUTOCONF_VERSION_STRING);
public static final QualifiedName AUTOCONF_VERSION_COMPAT = new QualifiedName(PREFIX_COMPAT, AUTOCONF_VERSION_STRING);
- public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; // $NON-NLS-1$
- public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); // $NON-NLS-1$
- public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); // $NON-NLS-1$
- public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath"); // $NON-NLS-1$
- public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath"); // $NON-NLS-1$
- public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath"); // $NON-NLS-1$
- public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath"); // $NON-NLS-1$
- public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); // $NON-NLS-1$
- public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); // $NON-NLS-1$
+ public static final String AUTOCONF_MACRO_VERSIONING = "AutoconfEditorMacroVersioning"; //$NON-NLS-1$
+ public static final QualifiedName AUTOCONF_TOOL = new QualifiedName(PREFIX, "AutoconfToolPath"); //$NON-NLS-1$
+ public static final QualifiedName AUTOMAKE_TOOL = new QualifiedName(PREFIX, "AutomakeToolPath"); //$NON-NLS-1$
+ public static final QualifiedName ACLOCAL_TOOL = new QualifiedName(PREFIX, "AclocalToolPath"); //$NON-NLS-1$
+ public static final QualifiedName AUTOHEADER_TOOL = new QualifiedName(PREFIX, "AutoheaderToolPath"); //$NON-NLS-1$
+ public static final QualifiedName AUTORECONF_TOOL = new QualifiedName(PREFIX, "AutoreconfToolPath"); //$NON-NLS-1$
+ public static final QualifiedName LIBTOOLIZE_TOOL = new QualifiedName(PREFIX, "LibtoolizePath"); //$NON-NLS-1$
+ public static final QualifiedName CLEAN_DELETE = new QualifiedName(PREFIX, "CleanDelete"); //$NON-NLS-1$
+ public static final QualifiedName CLEAN_MAKE_TARGET = new QualifiedName(PREFIX, "CleanMakeTarget"); //$NON-NLS-1$
public static final QualifiedName SCANNER_USE_MAKE_W = new QualifiedName(PREFIX, "ScannerUseMakeW");
- public static final QualifiedName AUTO_BUILD_NAME = new QualifiedName(PREFIX, "AutoBuildName"); // $NON-NLS-1$
- public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); // $NON-NLS-1$
+ public static final QualifiedName AUTO_BUILD_NAME = new QualifiedName(PREFIX, "AutoBuildName"); //$NON-NLS-1$
+ public static final QualifiedName OPEN_INCLUDE = new QualifiedName(PREFIX, "IncludeResourceMapping"); //$NON-NLS-1$
public static final QualifiedName OPEN_INCLUDE_P = new QualifiedName(PREFIX, "PersistentIncludeResourceMapping"); //$NON-NLS-1$
public static final QualifiedName SCANNER_INFO_DIRTY = new QualifiedName(PREFIX, "ScannerInfoDirty"); // $NON-NLSp-1$
- public static final String[] fACVersions = {"2.13", "2.59", "2.61", "2.68"}; // $NON-NLS-1$
+ public static final String[] fACVersions = {"2.13", "2.59", "2.61", "2.68"}; //$NON-NLS-1$
public static final String AC_VERSION_2_13 = fACVersions[0];
public static final String AC_VERSION_2_59 = fACVersions[1];
public static final String AC_VERSION_2_61 = fACVersions[2];
public static final String AC_VERSION_2_68 = fACVersions[3];
public static final String LATEST_AC_VERSION = fACVersions[fACVersions.length - 1];
- public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; // $NON-NLS-1$
+ public static final String[] fAMVersions = {"1.4-p6", "1.9.5", "1.9.6", "1.11.1"}; //$NON-NLS-1$
public static final String LATEST_AM_VERSION = fAMVersions[fAMVersions.length - 1];
- public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; // $NON-NLS-1$
+ public static final String CLEAN_MAKE_TARGET_DEFAULT = "distclean"; //$NON-NLS-1$
- public static final String TRUE = "true"; // $NON-NLS-1$
- public static final String FALSE = "false"; // $NON-NLS-1$
+ public static final String TRUE = "true"; //$NON-NLS-1$
+ public static final String FALSE = "false"; //$NON-NLS-1$
}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
index 065bd712b1..9e26fb89a8 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfiguration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2016 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -73,9 +73,9 @@ public class AutotoolsConfiguration implements IAConfiguration {
new Option(AutotoolsOptionConstants.TOOL_CONFIGURE, IConfigureOption.TOOL),
new Option(AutotoolsOptionConstants.CATEGORY_GENERAL, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_CONFIGDIR, IConfigureOption.INTERNAL),
- new Option(AutotoolsOptionConstants.OPT_CACHE_FILE, "cache_file", IConfigureOption.STRING), // $NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_CACHE_FILE, "cache_file", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_HELP, IConfigureOption.BIN),
- new Option(AutotoolsOptionConstants.OPT_NO_CREATE, "no_create", IConfigureOption.BIN), // $NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_NO_CREATE, "no_create", IConfigureOption.BIN), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_QUIET, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.OPT_VERSION, IConfigureOption.BIN),
new Option(AutotoolsOptionConstants.CATEGORY_PLATFORM, IConfigureOption.CATEGORY),
@@ -84,7 +84,7 @@ public class AutotoolsConfiguration implements IAConfiguration {
new Option(AutotoolsOptionConstants.OPT_TARGET, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_DIRECTORIES, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_PREFIX, IConfigureOption.STRING),
- new Option(AutotoolsOptionConstants.OPT_EXEC_PREFIX, "exec_prefix", IConfigureOption.STRING), // $NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_EXEC_PREFIX, "exec_prefix", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.OPT_LIBDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_BINDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_SBINDIR, IConfigureOption.STRING),
@@ -99,19 +99,19 @@ public class AutotoolsConfiguration implements IAConfiguration {
new Option(AutotoolsOptionConstants.OPT_LIBEXECDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.OPT_OLDINCLUDEDIR, IConfigureOption.STRING),
new Option(AutotoolsOptionConstants.CATEGORY_FILENAMES, IConfigureOption.CATEGORY),
- new Option(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX, "program_prefix", IConfigureOption.STRING), // $NON-NLS-1$
- new Option(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX, "program_suffix", IConfigureOption.STRING), // $NON-NLS-1$
- new Option(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME, "program_transform_name", IConfigureOption.STRING), // $NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_PROGRAM_PREFIX, "program_prefix", IConfigureOption.STRING), //$NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_PROGRAM_SUFFIX, "program_suffix", IConfigureOption.STRING), //$NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_PROGRAM_TRANSFORM_NAME, "program_transform_name", IConfigureOption.STRING), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.CATEGORY_ENVVAR, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_ENVVAR, IConfigureOption.ENVVAR),
new Option(AutotoolsOptionConstants.CATEGORY_FEATURES, IConfigureOption.CATEGORY),
- new Option(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", IConfigureOption.BIN), // $NON-NLS-1$
- new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, IConfigureOption.FLAG), // $NON-NLS-1$
- new Option(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG, "cflags_debug", IConfigureOption.FLAGVALUE), // $NON-NLS-1$ // $NON-NLS-2$
- new Option(AutotoolsOptionConstants.OPT_CFLAGS_GPROF, "cflags_gprof", IConfigureOption.FLAGVALUE), // $NON-NLS-1$ // $NON-NLS-2$
- new Option(AutotoolsOptionConstants.OPT_CFLAGS_GCOV, "cflags_gcov", IConfigureOption.FLAGVALUE), // $NON-NLS-1$ // $NON-NLS-2$
+ new Option(AutotoolsOptionConstants.OPT_ENABLE_MAINTAINER_MODE, "enable_maintainer_mode", IConfigureOption.BIN), //$NON-NLS-1$
+ new Option(AutotoolsOptionConstants.FLAG_CFLAGS, "cflags", AutotoolsOptionConstants.FLAG_CFLAGS_FLAGS, IConfigureOption.FLAG), //$NON-NLS-1$
+ new Option(AutotoolsOptionConstants.OPT_CFLAGS_DEBUG, "cflags_debug", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
+ new Option(AutotoolsOptionConstants.OPT_CFLAGS_GPROF, "cflags_gprof", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
+ new Option(AutotoolsOptionConstants.OPT_CFLAGS_GCOV, "cflags_gcov", IConfigureOption.FLAGVALUE), //$NON-NLS-1$ //$NON-NLS-2$
new Option(AutotoolsOptionConstants.OPT_USER, IConfigureOption.MULTIARG),
- new Option(AutotoolsOptionConstants.TOOL_AUTOGEN, "autogen", "autogen.sh", IConfigureOption.TOOL), // $NON-NLS-1$
+ new Option(AutotoolsOptionConstants.TOOL_AUTOGEN, "autogen", "autogen.sh", IConfigureOption.TOOL), //$NON-NLS-1$
new Option(AutotoolsOptionConstants.CATEGORY_OPTIONS, IConfigureOption.CATEGORY),
new Option(AutotoolsOptionConstants.OPT_AUTOGENOPTS, IConfigureOption.MULTIARG),
};
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
index b8e0e3a4f2..fc1428746b 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsConfigurationManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -202,15 +202,15 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
Document d = db.parse(dirFile);
Element e = d.getDocumentElement();
// Get the stored configuration data
- NodeList cfgs = e.getElementsByTagName("configuration"); // $NON-NLS-1$
+ NodeList cfgs = e.getElementsByTagName("configuration"); //$NON-NLS-1$
for (int x = 0; x < cfgs.getLength(); ++x) {
Node n = cfgs.item(x);
NamedNodeMap attrs = n.getAttributes();
// Originally we used the configuration name, but now we use
// the ConfigurationDescription id which is unique. Check for
// id first, but fall back to name for older .autotools files.
- Node nameNode = attrs.getNamedItem("name"); // $NON-NLS-1$
- Node cfgIdNode = attrs.getNamedItem("id"); // $NON-NLS-1$
+ Node nameNode = attrs.getNamedItem("name"); //$NON-NLS-1$
+ Node cfgIdNode = attrs.getNamedItem("id"); //$NON-NLS-1$
String cfgId = null;
if (cfgIdNode != null)
cfgId = cfgIdNode.getNodeValue();
@@ -227,16 +227,16 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
NodeList l = n.getChildNodes();
for (int y = 0; y < l.getLength(); ++y) {
Node child = l.item(y);
- if (child.getNodeName().equals("option")) { // $NON-NLS-1$
+ if (child.getNodeName().equals("option")) { //$NON-NLS-1$
NamedNodeMap optionAttrs = child.getAttributes();
- Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
- Node value = optionAttrs.getNamedItem("value"); // $NON-NLS-1$
+ Node id = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
+ Node value = optionAttrs.getNamedItem("value"); //$NON-NLS-1$
if (id != null && value != null)
cfg.setOption(id.getNodeValue(), value.getNodeValue());
} else if (child.getNodeName().equals("flag")) { //$NON-NLS-1$
// read in flag values
NamedNodeMap optionAttrs = child.getAttributes();
- Node id = optionAttrs.getNamedItem("id"); // $NON-NLS-1$
+ Node id = optionAttrs.getNamedItem("id"); //$NON-NLS-1$
String idValue = id.getNodeValue();
IConfigureOption opt = cfg.getOption(idValue);
if (opt instanceof FlagConfigureOption) {
@@ -245,8 +245,8 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
Node flagChild = l2.item(z);
if (flagChild.getNodeName().equals("flagvalue")) { //$NON-NLS-1$
NamedNodeMap optionAttrs2 = flagChild.getAttributes();
- Node id2 = optionAttrs2.getNamedItem("id"); // $NON-NLS-1$
- Node value = optionAttrs2.getNamedItem("value"); // $NON-NLS-1$
+ Node id2 = optionAttrs2.getNamedItem("id"); //$NON-NLS-1$
+ Node value = optionAttrs2.getNamedItem("value"); //$NON-NLS-1$
cfg.setOption(id2.getNodeValue(), value.getNodeValue());
}
}
@@ -347,7 +347,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
ITool tool = tools[j];
if (tool.getName().equals("configure")) { //$NON-NLS-1$
IOption option =
- tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); // $NON-NLS-1$
+ tool.getOptionBySuperClassId("org.eclipse.linuxtools.cdt.autotools.core.option.configure.name"); //$NON-NLS-1$
IHoldsOptions h = tool;
try {
IOption optionToSet = h.getOptionToSet(option, false);
@@ -379,7 +379,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
try (PrintWriter p = new PrintWriter(new BufferedWriter(new FileWriter(f)))) {
Map<String, IAConfiguration> cfgs = configs.get(projectName);
p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
- p.println("<configurations>"); // $NON-NLS-1$
+ p.println("<configurations>"); //$NON-NLS-1$
Option[] optionList = AutotoolsConfiguration.getOptionList();
// Before saving, force any cloning to occur via the option
// value handler.
@@ -409,12 +409,12 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
String childName = children.get(k);
IConfigureOption childopt = cfg.getOption(childName);
p.println("<flagvalue id=\"" + childopt.getName() + "\" value=\"" //$NON-NLS-1$ //$NON-NLS-2$
- + xmlEscape(childopt.getValue()) + "\"/>"); // $NON-NLS-3$
+ + xmlEscape(childopt.getValue()) + "\"/>"); //$NON-NLS-3$
}
p.println("</flag>"); //$NON-NLS-1$
} else if (!opt.isCategory() && !opt.isFlagValue())
p.println("<option id=\"" + option.getName() + "\" value=\"" + xmlEscape(opt.getValue()) //$NON-NLS-1$ //$NON-NLS-2$
- + "\"/>"); // $NON-NLS-3$
+ + "\"/>"); //$NON-NLS-3$
}
p.println("</configuration>"); //$NON-NLS-1$
// Sync name field as this configuration is now
@@ -453,7 +453,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
if (cfgs == null)
return;
p.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
- p.println("<configurations>"); // $NON-NLS-1$
+ p.println("<configurations>"); //$NON-NLS-1$
Option[] optionList = AutotoolsConfiguration.getOptionList();
HashSet<String> savedIds = new HashSet<>();
setSyncing(true);
@@ -470,7 +470,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
Option option = optionList[j];
IConfigureOption opt = cfg.getOption(option.getName());
if (!opt.isCategory())
- p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+ p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
p.println("</configuration>"); //$NON-NLS-1$
syncNameField(cfgd);
@@ -489,7 +489,7 @@ public class AutotoolsConfigurationManager implements IResourceChangeListener {
Option option = optionList[j];
IConfigureOption opt = cfg.getOption(option.getName());
if (!opt.isCategory())
- p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ // $NON-NLS-3$
+ p.println("<option id=\"" + option.getName() + "\" value=\"" + opt.getValue() + "\"/>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
p.println("</configuration>"); //$NON-NLS-1$
}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
index 84bc34bd41..5da67fd4e6 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/AutotoolsOptionValueHandler.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2016 Red Hat Inc..
+ * Copyright (c) 2007, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,8 +68,8 @@ public class AutotoolsOptionValueHandler extends ManagedOptionValueHandler
// ignore
}
if (autoName == null || autoName.equals(AutotoolsPropertyConstants.TRUE)) {
- autoNameTemplate = "${workspace_loc:/" + project.getName() + // $NON-NLS-1$
- "}/build-" + fixName(configuration.getName()); // $NON-NLS-1$
+ autoNameTemplate = "${workspace_loc:/" + project.getName() + //$NON-NLS-1$
+ "}/build-" + fixName(configuration.getName()); //$NON-NLS-1$
IBuilder cfgBuilder = configuration.getEditableBuilder();
cfgBuilder.setBuildPath(autoNameTemplate);
}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
index 4d38fb243f..0b7ee2a4b8 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/BinConfigureOption.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -37,7 +37,7 @@ public class BinConfigureOption extends AbstractConfigurationOption {
if (isParmSet())
return getParameterName();
else
- return ""; // $NON-NLS-1$
+ return ""; //$NON-NLS-1$
}
@Override
@@ -48,7 +48,7 @@ public class BinConfigureOption extends AbstractConfigurationOption {
@Override
public void setValue(String value) {
boolean oldValue = this.value;
- if (value.equals("true")) // $NON-NLS-1$
+ if (value.equals("true")) //$NON-NLS-1$
this.value = true;
else
this.value = false;
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
index b74e39de36..d40ba07454 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/ConfigureTool.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -51,7 +51,7 @@ public class ConfigureTool extends AbstractConfigurationOption {
@Override
public String getParameter() {
- return ""; // $NON-NLS-1$
+ return ""; //$NON-NLS-1$
}
@Override
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
index d445373bc9..ae95529315 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/InternalConfigureOption.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,12 +16,12 @@ public class InternalConfigureOption extends AbstractConfigurationOption {
public InternalConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
public InternalConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
private InternalConfigureOption(String name, AutotoolsConfiguration cfg,
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
index 7af4af0bee..ea18498444 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/MultiArgConfigureOption.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,12 +22,12 @@ public class MultiArgConfigureOption extends AbstractConfigurationOption {
public MultiArgConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
public MultiArgConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
private MultiArgConfigureOption(String name, AutotoolsConfiguration cfg,
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
index 64fa78bce0..ad6fa15700 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/StringConfigureOption.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2015 Red Hat Inc.
+ * Copyright (c) 2009, 2016 Red Hat Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,12 +17,12 @@ public class StringConfigureOption extends AbstractConfigurationOption {
public StringConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
public StringConfigureOption(String name, String msgName, AutotoolsConfiguration cfg) {
super(name, msgName, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
private StringConfigureOption(String name, AutotoolsConfiguration cfg,
@@ -52,7 +52,7 @@ public class StringConfigureOption extends AbstractConfigurationOption {
@Override
public String getParameter() {
if (isParmSet())
- return getParameterName() + "=" + getValue(); // $NON-NLS-1$
+ return getParameterName() + "=" + getValue(); //$NON-NLS-1$
return "";
}
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java
index 036e3b4f96..add532a4db 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/configure/VariableConfigureOption.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2016 IBM Corporation.
+ * Copyright (c) 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,12 +22,12 @@ public class VariableConfigureOption extends AbstractConfigurationOption {
public VariableConfigureOption(String name, AutotoolsConfiguration cfg) {
super(name, cfg);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
public VariableConfigureOption(String name, String transformedName, AutotoolsConfiguration autotoolsConfiguration) {
super(name, transformedName, autotoolsConfiguration);
- this.value = ""; // $NON-NLS-1$
+ this.value = ""; //$NON-NLS-1$
}
public VariableConfigureOption(String name, AutotoolsConfiguration cfg, String value) {

Back to the top