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 40dfb2f30f7..2d628ebaa4f 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, 2011 Red Hat Inc. + * Copyright (c) 2009, 2012 Red Hat Inc. * 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 @@ -7,6 +7,7 @@ * * Contributors: * Red Hat Inc. - initial API and implementation + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.autotools.core.configure; @@ -16,8 +17,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.eclipse.cdt.autotools.core.AutotoolsOptionConstants; +import org.eclipse.osgi.util.TextProcessor; +import org.eclipse.cdt.autotools.core.AutotoolsOptionConstants; public class AutotoolsConfiguration implements IAConfiguration { @@ -57,11 +59,11 @@ public class AutotoolsConfiguration implements IAConfiguration { } public String getDescription() { - return ConfigureMessages.getConfigureDescription(transformedName); + return TextProcessor.process(ConfigureMessages.getConfigureDescription(transformedName)); } public String getToolTip() { - return ConfigureMessages.getConfigureTip(transformedName); + return TextProcessor.process(ConfigureMessages.getConfigureTip(transformedName)); } } diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java index f75d1b51066..57823b5ddc0 100644 --- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java +++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java @@ -16,6 +16,7 @@ import org.eclipse.cdt.autotools.tests.editors.EditorTests; import junit.framework.Test; import junit.framework.TestSuite; +/** On Windows requires either Cygwin or MinGW to be in PATH */ public class AllAutotoolsTests { public static Test suite() { diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/InvokeMessages.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/InvokeMessages.java index dae5f1d055b..5e73d199652 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/InvokeMessages.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/actions/InvokeMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2007, 2009 Red Hat Inc.. + * Copyright (c) 2006, 2012 Red Hat Inc.. * 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 @@ -7,6 +7,7 @@ * * Contributors: * Red Hat Incorporated - initial API and implementation + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.autotools.ui.actions; @@ -14,6 +15,8 @@ import java.text.MessageFormat; import java.util.MissingResourceException; import java.util.ResourceBundle; +import org.eclipse.osgi.util.TextProcessor; + public class InvokeMessages { private static final String BUNDLE_NAME = InvokeMessages.class.getName(); @@ -32,7 +35,7 @@ public class InvokeMessages { */ public static String getString(String key) { try { - return RESOURCE_BUNDLE.getString(key); + return TextProcessor.process(RESOURCE_BUNDLE.getString(key)); } catch (MissingResourceException e) { return '!' + key + '!'; } @@ -47,7 +50,7 @@ public class InvokeMessages { * @return the resource bundle message */ public static String getFormattedString(String key, String[] args) { - return MessageFormat.format(getString(key), (Object[])args); + return TextProcessor.process(MessageFormat.format(getString(key), (Object[])args)); } } diff --git a/build/org.eclipse.cdt.make.core.tests/pom.xml b/build/org.eclipse.cdt.make.core.tests/pom.xml new file mode 100644 index 00000000000..d87ccccb97d --- /dev/null +++ b/build/org.eclipse.cdt.make.core.tests/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + + org.eclipse.cdt + cdt-parent + 8.2.0-SNAPSHOT + ../../pom.xml + + + 7.0.0-SNAPSHOT + org.eclipse.cdt.make.core.tests + eclipse-test-plugin + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho-version} + + false + -Xms256m -Xmx512m -XX:MaxPermSize=256M + + **/AutomatedIntegrationSuite.* + + true + + + + + diff --git a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java index 8db35da4fa5..2697061d7f0 100644 --- a/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java +++ b/build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCScannerInfoConsoleParserTests.java @@ -21,11 +21,11 @@ import org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCScannerInfoConsol /** * Scanner configuration console parser tests - * + * * @author vhirsl */ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests { - + public static TestSuite suite() { return suite(GCCScannerInfoConsoleParserTests.class); } @@ -46,10 +46,10 @@ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests super.tearDown(); fOutputParser.shutdown(); } - + /* * Tests GCCScannerInfoConsoleParser. Utility object not provided. - * Only tests parsing of the input (make build output) + * Only tests parsing of the input (make build output) */ public void testParsingIncludePaths() { fOutputParser.processLine("gcc -I /dir/include -I c:\\dir\\include -ID:/dir/include -c test.c"); // absolute paths //$NON-NLS-1$ @@ -68,7 +68,7 @@ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests fOutputParser.processLine("gcc -Imultiline2 \\"); //$NON-NLS-1$ fOutputParser.processLine("-Imultiline3\\"); //$NON-NLS-1$ fOutputParser.processLine(" -DAA=\"BB\" test.c"); //$NON-NLS-1$ - + @SuppressWarnings("unchecked") List sumIncludes = fCollector.getCollectedScannerInfo(null, ScannerInfoTypes.INCLUDE_PATHS); assertTrue(sumIncludes.contains("/dir/include")); //$NON-NLS-1$ @@ -96,10 +96,7 @@ public class GCCScannerInfoConsoleParserTests extends BaseBOPConsoleParserTests assertTrue(sumIncludes.contains("//server6/include")); //$NON-NLS-1$ assertTrue(sumIncludes.contains("/multiline/dir")); //$NON-NLS-1$ assertTrue(sumIncludes.contains("multiline2")); //$NON-NLS-1$ - // Fails consistently - if (System.getProperty("cdt.skip.known.test.failures") == null) { assertTrue(sumIncludes.contains("multiline3")); //$NON-NLS-1$ - } assertTrue(sumIncludes.size() == 26); } } diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java index 32b9a9edc81..0d6a5067c8e 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java @@ -94,8 +94,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole */ @Override public boolean processLine(String line) { - line= line.trim(); - if (line.length() == 0) { + if (line.trim().length() == 0) { return false; } boolean rc = false; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java index a0568bd7a85..e6e7c8e7064 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CDTConfigWizardPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Intel Corporation and others. + * Copyright (c) 2007, 2012 Intel 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 @@ -8,6 +8,7 @@ * Contributors: * Intel Corporation - initial API and implementation * James Blackbrun (Broadcom Corp.) + * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.managedbuilder.ui.wizards; @@ -31,6 +32,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.TextProcessor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -140,7 +142,7 @@ public class CDTConfigWizardPage extends WizardPage { tv.setLabelProvider(new LabelProvider() { @Override public String getText(Object element) { - return element == null ? EMPTY_STR : ((CfgHolder)element).getName(); + return element == null ? EMPTY_STR : TextProcessor.process(((CfgHolder)element).getName()); } @Override public Image getImage(Object element) { return IMG_CONFIG; } diff --git a/codan/org.eclipse.cdt.codan.core/OSGI-INF/l10n/bundle.properties b/codan/org.eclipse.cdt.codan.core/OSGI-INF/l10n/bundle.properties index ad252dc6852..6a6c77d109b 100644 --- a/codan/org.eclipse.cdt.codan.core/OSGI-INF/l10n/bundle.properties +++ b/codan/org.eclipse.cdt.codan.core/OSGI-INF/l10n/bundle.properties @@ -17,7 +17,8 @@ extension.name.Marker = Code Analysis Problem category.name.ProgrammingErrors = Potential Programming Problems category.name.CodeStyle = Coding Style category.name.CompilerErrors = Syntax and Semantic Errors -extension-point.name.CodeAnalysis = Code Analysis Checkers +codeAnalysisCheckersExtensionPoint = Code Analysis Checkers +checkerEnablementExtensionPoint = Verification of Checker Enablement marker.semanticError = Semantic Error category.name.Security = Security Vulnerabilities \ No newline at end of file diff --git a/codan/org.eclipse.cdt.codan.core/plugin.xml b/codan/org.eclipse.cdt.codan.core/plugin.xml index 11d7fa82852..4d43413061d 100644 --- a/codan/org.eclipse.cdt.codan.core/plugin.xml +++ b/codan/org.eclipse.cdt.codan.core/plugin.xml @@ -1,8 +1,8 @@ - - + + - - + +