Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Overholt2011-02-28 14:53:47 -0500
committerAndrew Overholt2011-02-28 14:54:20 -0500
commit455fca2b716d8359889fd2e9df59abf140c9f41f (patch)
tree938b6977ccc6c777cd0f2c53ccb1616002e482a8
parent81ca16b48743aea2d1903491062745f9706cf530 (diff)
parent6b6e6150ef387348861c0c4f5cd01ee693669736 (diff)
downloadorg.eclipse.linuxtools-455fca2b716d8359889fd2e9df59abf140c9f41f.tar.gz
org.eclipse.linuxtools-455fca2b716d8359889fd2e9df59abf140c9f41f.tar.xz
org.eclipse.linuxtools-455fca2b716d8359889fd2e9df59abf140c9f41f.zip
Merge systemtap 0.5.1
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties2
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml10
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java7
3 files changed, 10 insertions, 9 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties
index cd4798f51f..97661f118d 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboard/plugin.properties
@@ -5,6 +5,8 @@ view.graphs.name=Graphs
view.activeModule.name=Active Modules
view.dashboard.name=Dashboard
+command.import.name=Import Data Set
+command.import.desc=Import data set from file
command.stop.name=&Stop Module
command.stop.desc=Stops the currently selected Dashboard Module
command.pause.name=&Pause Module
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml
index b7d8e6739e..200cc71c98 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/plugin.xml
@@ -19,19 +19,19 @@
categoryId="org.eclipse.linuxtools.systemtap.ui.dashboard.category.file"
id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction"/>
</extension>
- <extension
+ <!--<extension
point="org.eclipse.ui.bindings">
<key
commandId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.ExportScript"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+X"/>
+ sequence="M1+1"/>
<key
commandId="org.eclipse.linuxtools.systemtap.ui.dashboardextension.commands.CreateModuleAction"
contextId="org.eclipse.ui.contexts.window"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M1+Y"/>
- </extension>
+ sequence="M1+2"/>
+ </extension>-->
<extension
point="org.eclipse.ui.actionSets">
<actionSet
@@ -93,7 +93,7 @@
menubarPath="file.ext"
style="push">
</action>-->
- ,<!--<action
+ <!--<action
class="org.eclipse.linuxtools.systemtap.ui.dashboardextension.actions.DeleteScriptAction"
icon="icons/actions/file_obj.gif"
id="org.eclipse.linuxtools.systemtap.ui.dashboardextension.DeleteScriptAction"
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
index 0bef3a1855..397f2860ac 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.dashboardextension/src/org/eclipse/linuxtools/systemtap/ui/dashboardextension/dialogs/ScriptDetails.java
@@ -33,7 +33,7 @@ public class ScriptDetails extends Dialog {
private Text scriptText;
private Button OKButton;
private Button cancelButton;
- private boolean canceled = false;
+ private boolean canceled = true;
public ScriptDetails(Shell parent) {
super(parent);
@@ -97,7 +97,6 @@ public class ScriptDetails extends Dialog {
cancelButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
shell.dispose();
- canceled = true;
}
public void widgetDefaultSelected(SelectionEvent e) {}
});
@@ -115,12 +114,12 @@ public class ScriptDetails extends Dialog {
// Set the preferences to this new info.
DashboardPlugin.getDefault().getPreferenceStore().setValue(DashboardPreferenceConstants.P_DASHBOARD_EXAMPLES_DIR, dirText.getText());
DashboardPlugin.getDefault().getPreferenceStore().setValue(DashboardPreferenceConstants.P_DASHBOARD_SCRIPT, scriptText.getText());
-
+ canceled = false;
shell.close();
}
public void widgetDefaultSelected(SelectionEvent e) {}
});
-
+
shell.open();
Display display = parent.getDisplay();
while (!shell.isDisposed()) {

Back to the top