ADT: Customize project selection message.

Bug: 2565629
Change-Id: I10a1aceaa5f0d0e157a9eccf7bffb312c7fc3bcc

7 files changed, 19 insertions, 8 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/MainLaunchConfigTab.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/MainLaunchConfigTab.java
index 2c96c98..1374dc7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/MainLaunchConfigTab.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/MainLaunchConfigTab.java
@@ -289,7 +289,8 @@ public class MainLaunchConfigTab extends AbstractLaunchConfigurationTab {
      */
     protected void handleProjectButtonSelected() {
         IJavaProject javaProject = mProjectChooserHelper.chooseJavaProject(
-                mProjText.getText().trim());
+                mProjText.getText().trim(),
+                "Please select a project to launch");
         if (javaProject == null) {
             return;
         }// end if
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/AndroidJUnitLaunchConfigurationTab.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/AndroidJUnitLaunchConfigurationTab.java
index 0850e14..305e703 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/AndroidJUnitLaunchConfigurationTab.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/junit/AndroidJUnitLaunchConfigurationTab.java
@@ -556,7 +556,8 @@ public class AndroidJUnitLaunchConfigurationTab extends AbstractLaunchConfigurat
      * constraining the search for main types to the specified project.
      */
     private void handleProjectButtonSelected() {
-        IJavaProject project = mProjectChooserHelper.chooseJavaProject(getProjectName());
+        IJavaProject project = mProjectChooserHelper.chooseJavaProject(getProjectName(),
+                "Please select a project to launch");
         if (project == null) {
             return;
         }
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectChooserHelper.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectChooserHelper.java
index e549d58..a7a6e72 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectChooserHelper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectChooserHelper.java
@@ -104,15 +104,20 @@ public class ProjectChooserHelper {
      *
      * @param projectName If non null and not empty, represents the name of an Android project
      *                    that will be selected by default.
+     * @param message Message for the dialog box. Can be null in which case a default message
+     *                is displayed.
      * @return the project chosen by the user in the dialog, or null if the dialog was canceled.
      */
-    public IJavaProject chooseJavaProject(String projectName) {
+    public IJavaProject chooseJavaProject(String projectName, String message) {
         ILabelProvider labelProvider = new JavaElementLabelProvider(
                 JavaElementLabelProvider.SHOW_DEFAULT);
         ElementListSelectionDialog dialog = new ElementListSelectionDialog(
                 mParentShell, labelProvider);
         dialog.setTitle("Project Selection");
-        dialog.setMessage("Select a project to constrain your search.");
+        if (message == null) {
+            message = "Please select a project";
+        }
+        dialog.setMessage(message);
 
         IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
         IJavaModel javaModel = JavaCore.create(workspaceRoot);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java
index 988dc3e..1675f7f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/properties/LibraryProperties.java
@@ -154,7 +154,8 @@ final class LibraryProperties {
         mAddButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                IJavaProject javaProject = mProjectChooser.chooseJavaProject(null);
+                IJavaProject javaProject = mProjectChooser.chooseJavaProject(null /*projectName*/,
+                        "Please select a library project");
                 if (javaProject != null) {
                     IProject iProject = javaProject.getProject();
                     IPath relativePath = Sdk.makeRelativeTo(
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/export/ProjectCheckPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/export/ProjectCheckPage.java
index 11a40e5..aa65e6e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/export/ProjectCheckPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/export/ProjectCheckPage.java
@@ -109,7 +109,8 @@ final class ProjectCheckPage extends ExportWizardPage {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 IJavaProject javaProject = mProjectChooserHelper.chooseJavaProject(
-                        mProjectText.getText().trim());
+                        mProjectText.getText().trim(),
+                        "Please select a project to export");
 
                 if (javaProject != null) {
                     IProject project = javaProject.getProject();
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java
index d43831e..df5a39b 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewTestProjectCreationPage.java
@@ -812,7 +812,8 @@ public class NewTestProjectCreationPage extends WizardPage {
      * Callback called when the user uses the "Browse Projects" button.
      */
     private void onProjectBrowse() {
-        IJavaProject p = mProjectChooserHelper.chooseJavaProject(mTestedProjectNameField.getText());
+        IJavaProject p = mProjectChooserHelper.chooseJavaProject(mTestedProjectNameField.getText(),
+                null /*message*/);
         if (p != null) {
             setExistingProject(p.getProject());
             mTestedProjectNameField.setText(mExistingTestedProject.getName());
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
index dc4d852..81a9952 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
@@ -875,7 +875,8 @@ class NewXmlFileCreationPage extends WizardPage {
      * Callback called when the user uses the "Browse Projects" button.
      */
     private void onProjectBrowse() {
-        IJavaProject p = mProjectChooserHelper.chooseJavaProject(mProjectTextField.getText());
+        IJavaProject p = mProjectChooserHelper.chooseJavaProject(mProjectTextField.getText(),
+                "Please select the target project");
         if (p != null) {
             changeProject(p.getProject());
             mProjectTextField.setText(mProject.getName());