From 8db43c05c94a8fd058eeabd916b4a3ae19d5a2e1 Mon Sep 17 00:00:00 2001 From: Alena Laskavaia Date: Tue, 2 May 2017 11:44:59 -0400 Subject: Fixed copyright Change-Id: I801f28d73afeba8432283eb9b5e8de3fa9b47a32 Signed-off-by: Alena Laskavaia (cherry picked from commit 32c2e14b80ec5c2c732c53b757fa629c906650f1) --- .../cdt/codan/examples/checkers/CToolChecker.java | 29 +++++++++++----------- .../breakpointactions/ICLIDebugActionEnabler.java | 18 ++++++-------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/CToolChecker.java b/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/CToolChecker.java index 60541c7a85b..0df34b3a5ab 100644 --- a/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/CToolChecker.java +++ b/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/CToolChecker.java @@ -1,17 +1,14 @@ /******************************************************************************* - * Copyright (c) Mar 4, 2015 QNX Software Systems. All Rights Reserved. + * Copyright (c) 2009,2015 QNX Software Systems + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * You must obtain a written license from and pay applicable license fees to QNX - * Software Systems before you may reproduce, modify or distribute this software, - * or any work that includes all or part of this software. Free development - * licenses are available for evaluation and non-commercial purposes. For more - * information visit [http://licensing.qnx.com] or email licensing@qnx.com. - * - * This file may contain contributions from others. Please review this entire - * file for other proprietary rights or license notices, as well as the QNX - * Development Suite License Guide at [http://licensing.qnx.com/license-guide/] - * for other information. + * Contributors: + * QNX Software Systems (Alena Laskavaia) - initial API and implementation *******************************************************************************/ + package org.eclipse.cdt.codan.examples.checkers; import java.util.ArrayList; @@ -49,7 +46,7 @@ public class CToolChecker extends AbstractCElementChecker { public void initPreferences(IProblemWorkingCopy problem) { getTopLevelPreference(problem); // initialize getLaunchModePreference(problem).enableInLaunchModes( - CheckerLaunchMode.RUN_ON_FILE_SAVE, + CheckerLaunchMode.RUN_ON_FILE_SAVE, CheckerLaunchMode.RUN_ON_DEMAND); } @@ -76,13 +73,15 @@ public class CToolChecker extends AbstractCElementChecker { final Map symbols = scannerInfo.getDefinedSymbols(); List res = new ArrayList<>(); for (String macro : symbols.keySet()) { - if (macro.startsWith("_")) + if (macro.startsWith("_")) { continue; // likely embedded macro + } String value = symbols.get(macro); - if (value.isEmpty()) + if (value.isEmpty()) { res.add("-D" + macro); - else + } else { res.add("-D" + macro + "=" + value); + } } for (String inc : scannerInfo.getIncludePaths()) { res.add("-I" + inc); diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ICLIDebugActionEnabler.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ICLIDebugActionEnabler.java index ed6970fbd02..baa41b1c8b5 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ICLIDebugActionEnabler.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/breakpointactions/ICLIDebugActionEnabler.java @@ -1,16 +1,12 @@ /******************************************************************************* - * Copyright (c) Mar 11, 2016 QNX Software Systems. All Rights Reserved. + * Copyright (c) 2016 QNX Software Systems + * 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 + * http://www.eclipse.org/legal/epl-v10.html * - * You must obtain a written license from and pay applicable license fees to QNX - * Software Systems before you may reproduce, modify or distribute this software, - * or any work that includes all or part of this software. Free development - * licenses are available for evaluation and non-commercial purposes. For more - * information visit [http://licensing.qnx.com] or email licensing@qnx.com. - * - * This file may contain contributions from others. Please review this entire - * file for other proprietary rights or license notices, as well as the QNX - * Development Suite License Guide at [http://licensing.qnx.com/license-guide/] - * for other information. + * Contributors: + * QNX Software Systems (Alena Laskavaia) - initial API and implementation *******************************************************************************/ package org.eclipse.cdt.debug.core.breakpointactions; -- cgit v1.2.3