diff options
| author | Torbjörn Svensson | 2020-06-29 16:55:38 +0000 |
|---|---|---|
| committer | Alexander Fedorov | 2020-07-04 08:20:49 +0000 |
| commit | 0391d6ccf15f892232f42ea760a52c84db67b01a (patch) | |
| tree | d4218f1c25d7f43129cd359a0c6d03baf46af1ce /build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse | |
| parent | 718156aa6b12958b206942e0e99074b448562854 (diff) | |
| download | org.eclipse.cdt-0391d6ccf15f892232f42ea760a52c84db67b01a.tar.gz org.eclipse.cdt-0391d6ccf15f892232f42ea760a52c84db67b01a.tar.xz org.eclipse.cdt-0391d6ccf15f892232f42ea760a52c84db67b01a.zip | |
Fixed NLS and null warnings
Signed-off-by: Torbjörn Svensson <azoff@svenskalinuxforeningen.se>
Change-Id: I6e40038e99c37a4efc25f64d8d186b00c6f55f8c
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse')
3 files changed, 4 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java index 6f4d9b20023..74a02ce33ff 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Option.java @@ -54,10 +54,10 @@ import org.eclipse.core.runtime.Status; import org.osgi.framework.Version; public class Option extends BuildObject implements IOption, IBuildPropertiesRestriction { - private static final String IS_BUILTIN_EMPTY = "IS_BUILTIN_EMPTY"; - private static final String IS_VALUE_EMPTY = "IS_VALUE_EMPTY"; + private static final String IS_BUILTIN_EMPTY = "IS_BUILTIN_EMPTY"; //$NON-NLS-1$ + private static final String IS_VALUE_EMPTY = "IS_VALUE_EMPTY"; //$NON-NLS-1$ // Static default return values - public static final String EMPTY_STRING = ""; + public static final String EMPTY_STRING = ""; //$NON-NLS-1$ public static final String[] EMPTY_STRING_ARRAY = new String[0]; public static final OptionStringValue[] EMPTY_LV_ARRAY = new OptionStringValue[0]; diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java index 33203750cc5..37b4064c516 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ConfigurationDataProvider.java @@ -355,7 +355,6 @@ public class ConfigurationDataProvider extends CConfigurationDataProvider implem } } } catch (CoreException e) { - mProj = null; } if (mProj == null) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java index 0ce05fd7bb0..dd090453622 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculator.java @@ -103,7 +103,7 @@ public class DefaultGCCDependencyCalculator implements IManagedDependencyGenerat + IManagedBuilderMakefileGenerator.WHITESPACE + "-n" //$NON-NLS-1$ + IManagedBuilderMakefileGenerator.WHITESPACE).append(depRule) .append(IManagedBuilderMakefileGenerator.WHITESPACE + "$(dir $@)" //$NON-NLS-1$ - + IManagedBuilderMakefileGenerator.WHITESPACE + ">" + + IManagedBuilderMakefileGenerator.WHITESPACE + ">" //$NON-NLS-1$ + IManagedBuilderMakefileGenerator.WHITESPACE) .append(depRule) .append(IManagedBuilderMakefileGenerator.WHITESPACE + IManagedBuilderMakefileGenerator.LOGICAL_AND |