[Yocto #4243]
Signed-off-by: Ioana Grigoropol <ioanax.grigoro...@intel.com>
---
.../actions/SystemtapSettingDialog.java | 21 +++++++++++++-------
1 file changed, 14 insertions(+), 7 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..fc9d547 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/actions/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;
@@ -34,6 +35,9 @@ import org.yocto.sdk.remotetools.SWTFactory;
public class SystemtapSettingDialog extends Dialog {
static protected String TITLE="Systemtap Crosstap";
+ private final static int FILE_DIALOG = 1;
+ private final static int DIRECTORY_DIALOG = 2;
+
protected String title;
protected String metadata_location;
protected String systemtap_script;
@@ -115,7 +119,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 = addFileSelectButton(textContainer,
metadataLocationText, DIRECTORY_DIALOG);
label = new Label(projComp, SWT.NONE);
label.setText(Messages.User_ID);
@@ -143,7 +147,7 @@ public class SystemtapSettingDialog extends Dialog {
textContainer.setLayout(new GridLayout(2, false));
textContainer.setLayoutData(new GridData(SWT.FILL, SWT.CENTER,
true, false));
systemtapScriptText = (Text)addTextControl(textContainer,
systemtap_script);
- systemtapScriptBtn = addFileSelectButton(textContainer,
systemtapScriptText);
+ systemtapScriptBtn = addFileSelectButton(textContainer,
systemtapScriptText, FILE_DIALOG);
label = new Label(projComp, SWT.NONE);
label.setText(Messages.Systemtap_Args);
@@ -167,17 +171,20 @@ public class SystemtapSettingDialog extends Dialog {
return (Control)text;
}
- private Button addFileSelectButton(final Composite parent, final Text
text) {
+ private Button addFileSelectButton(final Composite parent, final Text
text, final int dialogType) {
Button button = new Button(parent, SWT.PUSH | SWT.LEAD);
button.setText("Browse");
button.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
- String dirName;
+ String name = null;
- dirName = new
DirectoryDialog(parent.getShell()).open();
- if (dirName != null) {
- text.setText(dirName);
+ if (dialogType == DIRECTORY_DIALOG)
+ name = new
DirectoryDialog(parent.getShell()).open();
+ else if(dialogType == FILE_DIALOG)
+ name = new
FileDialog(parent.getShell()).open();
+ if (name != null) {
+ text.setText(name);
}
}
});
--
1.7.9.5
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
