Change Project selector button to be a Combobox instead

This changeset changes the widget used for project selection from a
button to a combobox.

It also fixes a couple of bugs in the New XML File Wizard:
- First, changing a project would clear out the root types table
- Second, the copy to clipboard button didn't work; the event handler
  was missing.
- Third, validate fields in visual order

Change-Id: Ibf4899fc3f9c9ec343d97532870df8e32a49bee0

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ChooseAssetTypePage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ChooseAssetTypePage.java
index 7b406eb..65940bd 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ChooseAssetTypePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/assetstudio/ChooseAssetTypePage.java
@@ -16,7 +16,8 @@
 
 package com.android.ide.eclipse.adt.internal.assetstudio;
 
-import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper.ProjectButton;
+import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper;
+import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper.ProjectCombo;
 import com.android.ide.eclipse.adt.internal.resources.ResourceNameValidator;
 import com.android.resources.ResourceFolderType;
 
@@ -24,6 +25,9 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionEvent;
@@ -37,7 +41,7 @@ import org.eclipse.swt.widgets.Text;
 
 /** Page for choosing the type of asset to create, as well as the target project */
 public class ChooseAssetTypePage extends WizardPage implements SelectionListener, ModifyListener {
-    private ProjectButton mProjectButton;
+    private ProjectCombo mProjectButton;
     private Button mClipboardButton;
     private IProject mProject;
     private Text mNameText;
@@ -83,8 +87,9 @@ public class ChooseAssetTypePage extends WizardPage implements SelectionListener
         projectLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
         projectLabel.setText("Project:");
 
-        mProjectButton = new ProjectButton(container, mProject);
-        mProjectButton.setAlignment(SWT.LEFT);
+        ProjectChooserHelper helper =
+                new ProjectChooserHelper(getShell(), null /* filter */);
+        mProjectButton = new ProjectCombo(helper, container, mProject);
         mProjectButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
         mProjectButton.addSelectionListener(this);
 
@@ -101,7 +106,7 @@ public class ChooseAssetTypePage extends WizardPage implements SelectionListener
         resourceLabel.setText("Resource:");
 
         mResourceName = new Label(container, SWT.NONE);
-        mResourceName.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
+        mResourceName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
 
         mClipboardButton = new Button(container, SWT.FLAT);
         mClipboardButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
@@ -159,6 +164,13 @@ public class ChooseAssetTypePage extends WizardPage implements SelectionListener
         if (source == mProjectButton) {
             mProject = mProjectButton.getSelectedProject();
             validatePage();
+        } else if (source == mClipboardButton) {
+            Clipboard clipboard = new Clipboard(getShell().getDisplay());
+            TextTransfer textTransfer = TextTransfer.getInstance();
+            clipboard.setContents(
+                    new Object[] { mResourceName.getText() },
+                    new Transfer[] { textTransfer });
+            clipboard.dispose();
         } else if (source instanceof Button) {
             // User selected a different asset type to be created
             Object data = ((Button) source).getData();

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 aff0534..b609153 100644 (file)
--- 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
@@ -32,12 +32,9 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.ElementListSelectionDialog;
 
 /**
@@ -204,24 +201,45 @@ public class ProjectChooserHelper {
     }
 
     /**
-     * A selector button for showing the currently selected project and for
+     * A selector combo for showing the currently selected project and for
      * changing the selection
      */
-    public static class ProjectButton extends Button implements SelectionListener {
+    public static class ProjectCombo extends Combo implements SelectionListener {
         /** Currently chosen project, or null when no project has been initialized or selected */
         private IProject mProject;
+        private IJavaProject[] mAvailableProjects;
 
         /**
-         * Creates a new project selector button
+         * Creates a new project selector combo
          *
-         * @param parent parent composite to add the button to
+         * @param helper associated {@link ProjectChooserHelper} for looking up
+         *            projects
+         * @param parent parent composite to add the combo to
          * @param initialProject the initial project to select, or null (which
          *            will show a "Please Choose Project..." label instead.)
          */
-        public ProjectButton(Composite parent, IProject initialProject) {
-            super(parent, SWT.BORDER | SWT.FLAT);
+        public ProjectCombo(ProjectChooserHelper helper, Composite parent,
+                IProject initialProject) {
+            super(parent, SWT.BORDER | SWT.FLAT | SWT.READ_ONLY);
             mProject = initialProject;
-            setProjectLabel(initialProject);
+
+            mAvailableProjects = helper.getAndroidProjects(null);
+            String[] items = new String[mAvailableProjects.length + 1];
+            items[0] = "--- Choose Project ---";
+
+            ILabelProvider labelProvider = new JavaElementLabelProvider(
+                    JavaElementLabelProvider.SHOW_DEFAULT);
+            int selectionIndex = 0;
+            for (int i = 0, n = mAvailableProjects.length; i < n; i++) {
+                IProject project = mAvailableProjects[i].getProject();
+                items[i + 1] = labelProvider.getText(project);
+                if (project == initialProject) {
+                    selectionIndex = i + 1;
+                }
+            }
+            setItems(items);
+            select(selectionIndex);
+
             addSelectionListener(this);
         }
 
@@ -242,25 +260,6 @@ public class ProjectChooserHelper {
          */
         public void setSelectedProject(IProject project) {
             mProject = project;
-            setProjectLabel(project);
-        }
-
-        /** Updates the selection with the given project */
-        private void setProjectLabel(IProject project) {
-            ILabelProvider labelProvider = new JavaElementLabelProvider(
-                    JavaElementLabelProvider.SHOW_DEFAULT);
-            if (project == null) {
-                setText("Choose Project...");
-                ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
-                Image errorImage = sharedImages.getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-                setImage(errorImage);
-            } else {
-                setText(labelProvider.getText(project));
-                Image projectImage = labelProvider.getImage(project);
-                if (projectImage != null) {
-                    setImage(projectImage);
-                }
-            }
         }
 
         /**
@@ -268,13 +267,14 @@ public class ProjectChooserHelper {
          * dialog for selecting a new project.
          */
         public void widgetSelected(SelectionEvent e) {
-            ProjectChooserHelper helper =
-                    new ProjectChooserHelper(getShell(), null /* filter */);
-            IJavaProject p = helper.chooseJavaProject(getText(),
-                    "Please select the target project");
-            if (p != null) {
-                mProject = p.getProject();
-                setProjectLabel(mProject);
+            int selectionIndex = getSelectionIndex();
+            if (selectionIndex > 0 && mAvailableProjects != null
+                    && selectionIndex <= mAvailableProjects.length) {
+                // selection index 0 is "Choose Project", all other projects are offset
+                // by 1 from the selection index
+                mProject = mAvailableProjects[selectionIndex - 1].getProject();
+            } else {
+                mProject = null;
             }
         }
 

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 46533da..e6fbbc5 100644 (file)
--- 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
@@ -41,7 +41,8 @@ import com.android.ide.eclipse.adt.internal.editors.menu.descriptors.MenuDescrip
 import com.android.ide.eclipse.adt.internal.editors.resources.descriptors.ResourcesDescriptors;
 import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper;
 import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper.IProjectFilter;
-import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper.ProjectButton;
+import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper;
+import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper.ProjectCombo;
 import com.android.ide.eclipse.adt.internal.resources.ResourceNameValidator;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
@@ -398,7 +399,7 @@ class NewXmlFileCreationPage extends WizardPage {
     };
 
     private NewXmlFileWizard.Values mValues;
-    private ProjectButton mProjectButton;
+    private ProjectCombo mProjectButton;
     private Text mFileNameTextField;
     private Combo mTypeCombo;
     private IStructuredSelection mInitialSelection;
@@ -477,9 +478,11 @@ class NewXmlFileCreationPage extends WizardPage {
         projectLabel.setText("Project:");
         projectLabel.setToolTipText(tooltip);
 
-        mProjectButton = new ProjectButton(composite, mValues.project);
+        ProjectChooserHelper helper =
+                new ProjectChooserHelper(getShell(), null /* filter */);
+
+        mProjectButton = new ProjectCombo(helper, composite, mValues.project);
         mProjectButton.setToolTipText(tooltip);
-        mProjectButton.setAlignment(SWT.LEFT);
         mProjectButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         mProjectButton.addSelectionListener(new SelectionAdapter() {
             @Override
@@ -904,6 +907,7 @@ class NewXmlFileCreationPage extends WizardPage {
 
         // enable types based on new API level
         updateAvailableTypes();
+        initialSelectType();
 
         // update the folder name based on API level
         updateFolderPath(mValues.type);
@@ -1090,11 +1094,6 @@ class NewXmlFileCreationPage extends WizardPage {
         String error = null;
         String warning = null;
 
-        // -- validate project
-        if (mValues.project == null) {
-            error = "Please select an Android project.";
-        }
-
         // -- validate type
         TypeInfo type = mValues.type;
         if (error == null) {
@@ -1103,12 +1102,9 @@ class NewXmlFileCreationPage extends WizardPage {
             }
         }
 
-        // -- validate filename
-        if (error == null) {
-            String fileName = mValues.getFileName();
-            assert type != null;
-            ResourceFolderType folderType = type.getResFolderType();
-            error = ResourceNameValidator.create(true, folderType).isValid(fileName);
+        // -- validate project
+        if (mValues.project == null) {
+            error = "Please select an Android project.";
         }
 
         // -- validate type API level
@@ -1126,6 +1122,14 @@ class NewXmlFileCreationPage extends WizardPage {
             }
         }
 
+        // -- validate filename
+        if (error == null) {
+            String fileName = mValues.getFileName();
+            assert type != null;
+            ResourceFolderType folderType = type.getResFolderType();
+            error = ResourceNameValidator.create(true, folderType).isValid(fileName);
+        }
+
         // -- validate destination file doesn't exist
         if (error == null) {
             IFile file = mValues.getDestinationFile();