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.meson.ui | |
| 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.meson.ui')
4 files changed, 8 insertions, 8 deletions
diff --git a/build/org.eclipse.cdt.meson.ui/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.meson.ui/META-INF/MANIFEST.MF index a87ef80bac4..18378369351 100644 --- a/build/org.eclipse.cdt.meson.ui/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.meson.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.cdt.meson.ui;singleton:=true -Bundle-Version: 1.0.400.qualifier +Bundle-Version: 1.0.500.qualifier Bundle-Vendor: %vendorName Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Activator: org.eclipse.cdt.meson.ui.Activator diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/MesonBuildTab.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/MesonBuildTab.java index 0e2359d1ed3..8840b3dfc1e 100644 --- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/MesonBuildTab.java +++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/MesonBuildTab.java @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Text; public class MesonBuildTab extends CommonBuildTab { - private static final String NINJA = "Ninja"; + private static final String NINJA = "Ninja"; //$NON-NLS-1$ private Button unixGenButton; private Button ninjaGenButton; private Text mesonArgsText; @@ -135,7 +135,7 @@ public class MesonBuildTab extends CommonBuildTab { } private void updateGeneratorButtons(String generator) { - if (generator == null || generator.equals(NINJA)) { //$NON-NLS-1$ + if (generator == null || generator.equals(NINJA)) { ninjaGenButton.setSelection(true); } else { unixGenButton.setSelection(true); @@ -149,7 +149,7 @@ public class MesonBuildTab extends CommonBuildTab { ICBuildConfiguration buildConfig = getBuildConfiguration(); buildConfig.setProperty(IMesonConstants.MESON_GENERATOR, - ninjaGenButton.getSelection() ? NINJA : "Unix Makefiles"); //$NON-NLS-1$ //$NON-NLS-2$ + ninjaGenButton.getSelection() ? NINJA : "Unix Makefiles"); //$NON-NLS-1$ String mesonArgs = mesonArgsText.getText().trim(); if (!mesonArgs.isEmpty()) { @@ -176,7 +176,7 @@ public class MesonBuildTab extends CommonBuildTab { @Override protected void saveProperties(Map<String, String> properties) { super.saveProperties(properties); - properties.put(IMesonConstants.MESON_GENERATOR, ninjaGenButton.getSelection() ? NINJA : "Unix Makefiles"); //$NON-NLS-1$ //$NON-NLS-2$ + properties.put(IMesonConstants.MESON_GENERATOR, ninjaGenButton.getSelection() ? NINJA : "Unix Makefiles"); //$NON-NLS-1$ properties.put(IMesonConstants.MESON_ARGUMENTS, mesonArgsText.getText().trim()); properties.put(IMesonConstants.BUILD_COMMAND, buildCommandText.getText().trim()); @@ -190,7 +190,7 @@ public class MesonBuildTab extends CommonBuildTab { String gen = properties.get(IMesonConstants.MESON_GENERATOR); if (gen != null) { switch (gen) { - case NINJA: //$NON-NLS-1$ + case NINJA: ninjaGenButton.setSelection(true); unixGenButton.setSelection(false); break; diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/SWTImagesFactory.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/SWTImagesFactory.java index 5c56c670950..0995fed8283 100644 --- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/SWTImagesFactory.java +++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/SWTImagesFactory.java @@ -40,7 +40,7 @@ public class SWTImagesFactory { private static final String NAME_PREFIX = Activator.PLUGIN_ID + '.'; private static final int NAME_PREFIX_LENGTH = NAME_PREFIX.length(); public static final String IMG_MESON = NAME_PREFIX + "meson-logo.png"; //$NON-NLS-1$ - public static final ImageDescriptor DESC_MESON = createManaged("", IMG_MESON); + public static final ImageDescriptor DESC_MESON = createManaged("", IMG_MESON); //$NON-NLS-1$ private static ImageDescriptor createManaged(String prefix, String name) { return createManaged(imageRegistry, prefix, name); diff --git a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/commands/RunNinjaCommandHandler.java b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/commands/RunNinjaCommandHandler.java index 8e79f194cba..22a4f477056 100644 --- a/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/commands/RunNinjaCommandHandler.java +++ b/build/org.eclipse.cdt.meson.ui/src/org/eclipse/cdt/internal/meson/ui/commands/RunNinjaCommandHandler.java @@ -79,7 +79,7 @@ public class RunNinjaCommandHandler extends AbstractMesonCommandHandler { String[] ninjaArgs = null; if (argString != null) { List<String> ninjaArgList = new ArrayList<>(); - Matcher m = Pattern.compile("([^\"]\\S*|\".+?\")\\s*").matcher(argString); + Matcher m = Pattern.compile("([^\"]\\S*|\".+?\")\\s*").matcher(argString); //$NON-NLS-1$ while (m.find()) { ninjaArgList.add(m.group(1)); } |