From b270bcf744d062a87f1d97efa647a4f533021b9a Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 5 Apr 2005 14:54:03 +0000
Subject: [PATCH] 2005-04-05 Alain Magloire 	Build for Eclipse-31M6 	*
 src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java 
 * src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties

---
 build/org.eclipse.cdt.managedbuilder.ui/ChangeLog     |  5 +++++
 .../internal/ui/PluginResources.properties            |  5 +++++
 .../ui/properties/BrowseEntryDialog.java              | 11 +++++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog b/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog
index fbf3e6c97b7..a1d427afaeb 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog
+++ b/build/org.eclipse.cdt.managedbuilder.ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-05 Alain Magloire
+	Build for Eclipse-31M6
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+
 2005-03-16 Alain Magloire
 	Patch from Tracy Miranda to fix PR 88160
 	* src/org/eclipse/cdt/managedbuilder/ui/properties/NewConfigurationDialog.java
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
index d5c2d5b5f22..a651eff885a 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
@@ -150,3 +150,8 @@ FileListControl.newdialog.title=New Dialog
 # ----------- Property Page ----------
 MngMakeProjectPropertyPage.closedproject=Project Closed
 MngMakeProjectPropertyPage.internalError=An Internal error has occur please check error log.
+
+# Copies from org.eclipse.ui.workbench
+showAdvanced = &Advanced >>
+hideAdvanced = << &Advanced
+NewFolderDialog.folderNameEmpty = Folder name must be specified
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
index 1645d26a495..3747afd7a9d 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
@@ -34,7 +34,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
 
 /**
  * The BrowseEntryDialog allows clients to prompt the user for a path location.
@@ -152,7 +151,7 @@ public class BrowseEntryDialog extends SelectionStatusDialog {
 		// Instantiate the macros button
 		advancedButton = new Button(parent, SWT.PUSH);
 		applyDialogFont(advancedButton);
-		advancedButton.setText(IDEWorkbenchMessages.getString(SHOW));
+		advancedButton.setText(ManagedBuilderUIMessages.getResourceString(SHOW));
 		setButtonLayoutData(advancedButton);
 		GridData data = (GridData) advancedButton.getLayoutData();
 		data.horizontalAlignment = GridData.BEGINNING;
@@ -275,16 +274,16 @@ public class BrowseEntryDialog extends SelectionStatusDialog {
 			macroComposite = ControlFactory.createComposite(composite, 1);
 			shellSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
 			shell.setSize(shellSize);
-			advancedButton.setText(IDEWorkbenchMessages.getString(HIDE)); 
+			advancedButton.setText(ManagedBuilderUIMessages.getResourceString(HIDE)); 
 		} else if (macroComposite.getVisible()) {
 			macroComposite.setVisible(false);
 			shell.setSize(shellSize.x, basicShellHeight);
-			advancedButton.setText(IDEWorkbenchMessages.getString(SHOW));
+			advancedButton.setText(ManagedBuilderUIMessages.getResourceString(SHOW));
 		} else {
 			macroComposite.setVisible(true);
 			shellSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
 			shell.setSize(shellSize);
-			advancedButton.setText(IDEWorkbenchMessages.getString(HIDE));
+			advancedButton.setText(ManagedBuilderUIMessages.getResourceString(HIDE));
 		}
 		
 	}
@@ -322,7 +321,7 @@ public class BrowseEntryDialog extends SelectionStatusDialog {
 		folderName = text.getText();
 		// Empty or null string is invalid
 		if (folderName == null || folderName.equals("")) { //$NON-NLS-1$
-			updateStatus(IStatus.ERROR, IDEWorkbenchMessages.getString(EMPTY));
+			updateStatus(IStatus.ERROR, ManagedBuilderUIMessages.getResourceString(EMPTY));
 			return;
 		} else {
 			// Make sure that the specified location exists