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 2d628ebaa4f..40dfb2f30f7 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, 2012 Red Hat Inc. + * Copyright (c) 2009, 2011 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,7 +7,6 @@ * * Contributors: * Red Hat Inc. - initial API and implementation - * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.internal.autotools.core.configure; @@ -17,10 +16,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.eclipse.osgi.util.TextProcessor; - import org.eclipse.cdt.autotools.core.AutotoolsOptionConstants; + public class AutotoolsConfiguration implements IAConfiguration { public static class Option { @@ -59,11 +57,11 @@ public class AutotoolsConfiguration implements IAConfiguration { } public String getDescription() { - return TextProcessor.process(ConfigureMessages.getConfigureDescription(transformedName)); + return ConfigureMessages.getConfigureDescription(transformedName); } public String getToolTip() { - return TextProcessor.process(ConfigureMessages.getConfigureTip(transformedName)); + return ConfigureMessages.getConfigureTip(transformedName); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java index 9349f67ce3f..61270ae07d4 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractPage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Intel Corporation, QNX Software Systems, and others. + * Copyright (c) 2007, 2010 Intel Corporation, QNX Software Systems, 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 @@ -11,7 +11,6 @@ * Andrew Gvozdev * QNX Software Systems - [271628] NPE in configs for project that failed to convert * James Blackburn (Broadcom Corp.) - * IBM Corporation *******************************************************************************/ package org.eclipse.cdt.ui.newui; @@ -52,7 +51,6 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.osgi.util.TextProcessor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -776,7 +774,7 @@ implements if (cfgDescs[i].isActive()) { name = name + " " + Messages.AbstractPage_16; //$NON-NLS-1$ } - configSelector.add(TextProcessor.process(name)); + configSelector.add(name); } // Ensure that the last selected config is selected by default