From 3bad5334d08707440f8ed1b16a26e1a114935fb1 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 8 Apr 2011 17:35:05 +0000 Subject: [PATCH] unified names of local variables (ExternalBuildRunner and CommandBuilder) --- .../cdt/managedbuilder/core/ExternalBuildRunner.java | 8 ++++---- .../internal/buildmodel/CommandBuilder.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ExternalBuildRunner.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ExternalBuildRunner.java index 30d076a5d15..011d2c5dfab 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ExternalBuildRunner.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ExternalBuildRunner.java @@ -73,7 +73,7 @@ public class ExternalBuildRunner extends AbstractBuildRunner { private static final String CONSOLE_HEADER = "ManagedMakeBuilder.message.console.header"; //$NON-NLS-1$ private static final String WARNING_UNSUPPORTED_CONFIGURATION = "ManagedMakeBuilder.warning.unsupported.configuration"; //$NON-NLS-1$ private static final String NEWLINE = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ - private static final String PATH = "PATH"; //$NON-NLS-1$ + private static final String PATH_ENV = "PATH"; //$NON-NLS-1$ @Override public boolean invokeBuild(int kind, IProject project, IConfiguration configuration, @@ -209,16 +209,16 @@ public class ExternalBuildRunner extends AbstractBuildRunner { // Launching failed, trying to figure out possible cause String errorPrefix = ManagedMakeMessages.getResourceString("ManagedMakeBuilder.error.prefix"); //$NON-NLS-1$ String buildCommandStr = buildCommand.toString(); - String envPath = envMap.get(PATH); + String envPath = envMap.get(PATH_ENV); if (envPath==null) { - envPath = System.getenv(PATH); + envPath = System.getenv(PATH_ENV); } if (PathUtil.findProgramLocation(buildCommandStr, envPath)==null) { buf.append(errMsg).append(NEWLINE); errMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.program.not.in.path", buildCommandStr); //$NON-NLS-1$ buf.append(errorPrefix).append(errMsg).append(NEWLINE); buf.append(NEWLINE); - buf.append(PATH+"=["+envPath+"]").append(NEWLINE); //$NON-NLS-1$//$NON-NLS-2$ + buf.append(PATH_ENV+"=["+envPath+"]").append(NEWLINE); //$NON-NLS-1$//$NON-NLS-2$ } else { buf.append(errorPrefix).append(errMsg).append(NEWLINE); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java index 179fda31624..f82d99f0b9d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java @@ -52,7 +52,7 @@ public class CommandBuilder implements IBuildModelBuilder { private String fErrMsg; private static final String BUILDER_MSG_HEADER = "InternalBuilder.msg.header"; //$NON-NLS-1$ - private static final String LINE_SEPARATOR = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ + private static final String NEWLINE = System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ /* * no need in this for now, Spawner is always used @@ -219,7 +219,7 @@ public class CommandBuilder implements IBuildModelBuilder { if (PathUtil.findProgramLocation(program, envPath)==null) { printMessage(fErrMsg, out); String errMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.program.not.in.path", program); //$NON-NLS-1$ - printErrorMessage(errMsg + LINE_SEPARATOR, out); + printErrorMessage(errMsg + NEWLINE, out); printMessage(null, PATH_ENV+"=["+envPath+"]", out); //$NON-NLS-1$//$NON-NLS-2$ } else { printErrorMessage(fErrMsg, out); @@ -260,7 +260,7 @@ public class CommandBuilder implements IBuildModelBuilder { if (prefix==null) { prefix=""; //$NON-NLS-1$ } - msg = prefix + msg + LINE_SEPARATOR; + msg = prefix + msg + NEWLINE; try { os.write(msg.getBytes()); os.flush(); @@ -300,7 +300,7 @@ public class CommandBuilder implements IBuildModelBuilder { buf.append(' '); buf.append(args[i]); } - buf.append(LINE_SEPARATOR); + buf.append(NEWLINE); } return buf.toString(); }