Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAnton Leherbauer2008-11-25 11:01:58 +0000
committerAnton Leherbauer2008-11-25 11:01:58 +0000
commit941076063dc2319603d97119eb6ab0ba1939fcbc (patch)
treee2ca135364f4da315f5824eef3b0c10fd5b01dc9 /build
parent2d49c506fa3cb013c43526a3d8e25b480a77ccd3 (diff)
downloadorg.eclipse.cdt-941076063dc2319603d97119eb6ab0ba1939fcbc.tar.gz
org.eclipse.cdt-941076063dc2319603d97119eb6ab0ba1939fcbc.tar.xz
org.eclipse.cdt-941076063dc2319603d97119eb6ab0ba1939fcbc.zip
Bug 253522 - Convert to new message bundle format
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java10
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java5
2 files changed, 7 insertions, 8 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
index 5f60ef4017c..acaad96748c 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
+ * Copyright (c) 2004, 2008 IBM 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
@@ -111,13 +111,13 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
DiscoveredElement elem = (DiscoveredElement) element;
switch (elem.getEntryKind()) {
case DiscoveredElement.PATHS_GROUP:
- return CPathEntryMessages.getString("CPElementLabelProvider.Includes"); //$NON-NLS-1$
+ return CPathEntryMessages.CPElementLabelProvider_Includes;
case DiscoveredElement.SYMBOLS_GROUP:
- return CPathEntryMessages.getString("CPElementLabelProvider.PreprocessorSymbols"); //$NON-NLS-1$
+ return CPathEntryMessages.CPElementLabelProvider_PreprocessorSymbols;
case DiscoveredElement.INCLUDE_FILE_GROUP:
- return CPathEntryMessages.getString("CPElementLabelProvider.IncludeFiles"); //$NON-NLS-1$
+ return CPathEntryMessages.CPElementLabelProvider_IncludeFiles;
case DiscoveredElement.MACROS_FILE_GROUP:
- return CPathEntryMessages.getString("CPElementLabelProvider.MacrosFiles"); //$NON-NLS-1$
+ return CPathEntryMessages.CPElementLabelProvider_MacrosFiles;
case DiscoveredElement.CONTAINER:
case DiscoveredElement.INCLUDE_PATH:
case DiscoveredElement.SYMBOL_DEFINITION:
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java
index 7c15808525c..436e983f4d4 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/dialogs/AbstractDiscoveryOptionsBlock.java
@@ -17,7 +17,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.eclipse.cdt.internal.ui.dialogs.cpaths.CPathEntryMessages;
import org.eclipse.cdt.internal.ui.util.ExceptionHandler;
import org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2;
import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager;
@@ -372,8 +371,8 @@ public abstract class AbstractDiscoveryOptionsBlock extends AbstractCOptionPage
});
} catch (InvocationTargetException e) {
- String title = CPathEntryMessages.getString(ERROR_TITLE);
- String message = CPathEntryMessages.getString(ERROR_MESSAGE);
+ String title = MakeUIPlugin.getResourceString(ERROR_TITLE);
+ String message = MakeUIPlugin.getResourceString(ERROR_MESSAGE);
ExceptionHandler.handle(e, getShell(), title, message);
} catch (InterruptedException e) {
// cancelled

Back to the top