[yocto] [PATCH][eclipse-poky][master] Systemtap: use FileDialog instead of DirectoryDialog for script browser

[Zhang, Jessica]

Merged to eclipse-poky master and Dylan

Thanks,
Jessica

-----Original Message-----
From: adrian.dudau at enea.com [mailto:adrian.dudau at enea.com]
Sent: Wednesday, April 10, 2013 9:12 AM
To: Zhang, Jessica
Cc: yocto at yoctoproject.org; Adrian Dudau
Subject: [PATCH][eclipse-poky][master] Systemtap: use FileDialog instead of DirectoryDialog for script browser

From: Adrian Dudau <adrian.dudau at enea.com>

[Yocto #4240]

Signed-off-by: Adrian Dudau <adrian.dudau at enea.com>
---
 .../actions/SystemtapSettingDialog.java            |   23 ++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java
index 133b91c..bb22ba6 100644
--- a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/SystemtapSettingDialog.java
+++ b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/ac
+++ tions/SystemtapSettingDialog.java
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Button;  import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;  import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
@@ -115,7 +116,7 @@ public class SystemtapSettingDialog extends Dialog {
                textContainer.setLayout(new GridLayout(2, false));
                textContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
                metadataLocationText = (Text)addTextControl(textContainer, metadata_location);
-               metadataLocationBtn = addFileSelectButton(textContainer, metadataLocationText);
+               metadataLocationBtn = addDirSelectButton(textContainer,
+metadataLocationText);

                label = new Label(projComp, SWT.NONE);
                label.setText(Messages.User_ID);
@@ -167,7 +168,7 @@ public class SystemtapSettingDialog extends Dialog {
                return (Control)text;
        }

-       private Button addFileSelectButton(final Composite parent, final Text text) {
+       private Button addDirSelectButton(final Composite parent, final Text
+text) {
                Button button = new Button(parent, SWT.PUSH | SWT.LEAD);
                button.setText("Browse");
                button.addSelectionListener(new SelectionAdapter() { @@ -184,6 +185,23 @@ public class SystemtapSettingDialog extends Dialog {
                return button;
        }

+       private Button addFileSelectButton(final Composite parent, final Text text) {
+               Button button = new Button(parent, SWT.PUSH | SWT.LEAD);
+               button.setText("Browse");
+               button.addSelectionListener(new SelectionAdapter() {
+                       @Override
+                       public void widgetSelected(SelectionEvent event) {
+                               String fileName;
+
+                               fileName = new FileDialog(parent.getShell()).open();
+                               if (fileName != null) {
+                                       text.setText(fileName);
+                               }
+                       }
+               });
+               return button;
+       }
+
        @Override
        protected void okPressed() {
                IDialogSettings settings = Activator.getDefault().getDialogSettings();
@@ -195,6 +213,7 @@ public class SystemtapSettingDialog extends Dialog {
                File metadata_dir = new File(metadata_location);
                if (!metadata_dir.exists()) {
                        CommonHelper.showErrorDialog("SystemTap Error", null, "The specified metadata location does not exist!");
+                       return;
                }
                if (!metadata_dir.isDirectory()) {
                        CommonHelper.showErrorDialog("SystemTap Error", null, "The specified metadata location is not a directory!");
--
1.7.10.4