Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ferrazzutti2013-11-29 12:23:56 -0500
committerAndrew Ferrazzutti2013-12-02 15:29:46 -0500
commitfb6e8ebf97723eaaad2fba255febcbe33c9f5fab (patch)
treef4eed30b8982e390c0bae2a3f48aebb0f93143f8
parentebb6be3fc9768515ae614aef17612e032dd1f2ac (diff)
downloadorg.eclipse.linuxtools-fb6e8ebf97723eaaad2fba255febcbe33c9f5fab.tar.gz
org.eclipse.linuxtools-fb6e8ebf97723eaaad2fba255febcbe33c9f5fab.tar.xz
org.eclipse.linuxtools-fb6e8ebf97723eaaad2fba255febcbe33c9f5fab.zip
Systemtap: Make some tweaks to UI.
Change-Id: I0b31fbb0544361a2da7ea6a9d4a47ed38d730ddf Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com> Reviewed-on: https://git.eclipse.org/r/19140 Tested-by: Hudson CI Reviewed-by: Roland Grunberg <rgrunber@redhat.com> IP-Clean: Roland Grunberg <rgrunber@redhat.com> Tested-by: Roland Grunberg <rgrunber@redhat.com> Reviewed-on: https://git.eclipse.org/r/19158
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties2
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java3
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java10
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java2
4 files changed, 10 insertions, 7 deletions
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties
index 9a7c2c05f3..01b0dc6be4 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/internal/systemtap/graphingapi/ui/localization.properties
@@ -139,7 +139,7 @@ SelectGraphAndSeriesWizardPage.SelectGraphAndSeries=Select Graph and Series
SelectGraphAndSeriesWizardPage.Graph=Graph Type:
SelectGraphAndSeriesWizardPage.Title=Title:
SelectGraphAndSeriesWizardPage.XSeries=X Series:
-SelectGraphAndSeriesWizardPage.RowID=Row ID
+SelectGraphAndSeriesWizardPage.RowID=Row Num
SelectGraphAndSeriesWizardPage.YSeries=Y Series {0}:
SelectGraphAndSeriesWizardPage.TitleNotSet=Title not set
SelectGraphAndSeriesWizardPage.KeyFilter=Key filter:
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java
index 4aef7194d1..f8c15293a7 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/datadisplay/DataGrid.java
@@ -290,7 +290,8 @@ public class DataGrid implements IUpdateListener {
item = new TableItem(table, SWT.NONE);
os = filteredDataSet.getRow(i);
- item.setText(0, "" + i); //$NON-NLS-1$
+ //Add 1 to the index/row num since graphs start counting rows at 1, not 0.
+ item.setText(0, Integer.toString(i + 1));
for(j=0; j<os.length; j++) {
//Ignore null items
if (os[j] != null) {
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java
index da330f5975..227488af25 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.graphingapi.ui/src/org/eclipse/linuxtools/systemtap/graphingapi/ui/wizards/graph/SelectGraphAndSeriesWizardPage.java
@@ -391,14 +391,16 @@ public class SelectGraphAndSeriesWizardPage extends WizardPage implements Listen
}
private void checkErrors(){
- if(txtTitle.getText().length() == 0) {
- setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.TitleNotSet")); //$NON-NLS-1$
- } else if(!isSeriesUnique()) {
+ if(!isSeriesUnique()) {
setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.SeriesNotUnique")); //$NON-NLS-1$
}
else if(isSeriesDeleted()) {
setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.SeriesDeleted")); //$NON-NLS-1$
- } else {
+ }
+ else if(txtTitle.getText().length() == 0) {
+ setErrorMessage(Localization.getString("SelectGraphAndSeriesWizardPage.TitleNotSet")); //$NON-NLS-1$
+ }
+ else {
setErrorMessage(null);
}
getWizard().getContainer().updateButtons();
diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
index 0561f09daf..58e70188bc 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
@@ -523,7 +523,7 @@ public class TestCreateSystemtapScript {
assertEquals(title, text.getText());
SWTBotCombo combo_x = bot.comboBoxWithLabel("X Series:");
- assertEquals(3, combo_x.itemCount()); // X Series includes "Row ID" as a selection
+ assertEquals(3, combo_x.itemCount()); // X Series includes "Row Num" as a selection
SWTBotCombo combo_y0 = bot.comboBoxWithLabel("Y Series 0:");
assertEquals(2, combo_y0.itemCount()); // Y Series 0 only includes series entries
combo_y0.setSelection(0);

Back to the top