Get rid of code for N-builds
Not produced for quite some time now.
Change-Id: I098a06c3b142847285ea5ac807ce38377659265f
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.test.performance.ui/html/builds.html b/bundles/org.eclipse.test.performance.ui/html/builds.html
index d9dc071..509c2b5 100644
--- a/bundles/org.eclipse.test.performance.ui/html/builds.html
+++ b/bundles/org.eclipse.test.performance.ui/html/builds.html
@@ -89,7 +89,6 @@
<h3>Builds filters</h3>
<ul>
<li>Baseline: hide the baselines (starting with R-3.x)</li>
-<li>Nightly: hide the nightly builds (starting with 'N')</li>
<li>Old: hide all builds before last milestone except earlier milestones</li>
</ul>
<p>
diff --git a/bundles/org.eclipse.test.performance.ui/html/components.html b/bundles/org.eclipse.test.performance.ui/html/components.html
index d33ce78..356bbc7 100644
--- a/bundles/org.eclipse.test.performance.ui/html/components.html
+++ b/bundles/org.eclipse.test.performance.ui/html/components.html
@@ -76,7 +76,6 @@
<h3>Builds filters</h3>
<ul>
<li>Baseline: hide the baselines (starting with R-3.x)</li>
-<li>Nightly: hide the nightly builds (starting with 'N')</li>
<li>Old: hide all builds before last milestone except earlier milestones</li>
</ul>
diff --git a/bundles/org.eclipse.test.performance.ui/html/results.html b/bundles/org.eclipse.test.performance.ui/html/results.html
index 1b5ff50..253d93b 100644
--- a/bundles/org.eclipse.test.performance.ui/html/results.html
+++ b/bundles/org.eclipse.test.performance.ui/html/results.html
@@ -42,7 +42,6 @@
</p>
<h3>Builds filters</h3>
<ul>
-<li>Nightly: hide the nightly builds (starting with 'N')</li>
<li>Old: hide all builds before last milestone except earlier milestones</li>
</ul>
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ConfigResults.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ConfigResults.java
index 6759ec4..ec0ffe4 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ConfigResults.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/ConfigResults.java
@@ -313,8 +313,7 @@
/**
* Returns the current build results.
* <p>
- * This build is currently the last integration or nightly
- * build which has performance results in the database.
+ * This build is currently the last integration build which has performance results in the database.
* It may differ from the {@link PerformanceResults#getName()}.
*
* @return The current build results.
@@ -575,29 +574,6 @@
return this.valid;
}
-/**
- * Returns the 'n' last nightly build names.
- *
- * @param n Number of last nightly builds to return
- * @return Last n nightly build names preceding current.
- */
-public List<String> lastNightlyBuildNames(int n) {
- List<String> labels = new ArrayList<>();
- for (int i=size()-2; i>=0; i--) {
- BuildResults buildResults = (BuildResults) this.children.get(i);
- if (isBuildConcerned(buildResults)) {
- String buildName = buildResults.getName();
- if (buildName.startsWith("N")) { //$NON-NLS-1$
- labels.add(buildName);
- if (labels.size() >= n) {
- break;
- }
- }
- }
- }
- return labels;
-}
-
/*
* Read all configuration builds results data from the given stream.
*/
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/PerformanceResults.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/PerformanceResults.java
index e4fe7b0..282f029 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/PerformanceResults.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/db/PerformanceResults.java
@@ -270,7 +270,7 @@
* @param kind Decide what kind of build is taken into account
* 0: all kind of build
* 1: all except baseline builds
- * 2: all except baseline and nightly builds
+ * 2: all except baseline builds
* 3: only integration builds
* @return the name of the last build of the selected kind
*/
@@ -282,9 +282,6 @@
if (kind > 0) {
loop: while (idx-- >= 0) {
switch (this.name.charAt(0)) {
- case 'N':
- if (kind < 2) break loop;
- break;
case 'M':
if (kind < 3) break loop;
break;
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsComparisonView.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsComparisonView.java
index 5c8c3af..ed54f0f 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsComparisonView.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsComparisonView.java
@@ -169,7 +169,6 @@
/*
* Fill the filters drop-down menu with:
- * - filter nightly builds
* - filter non-milestone builds
* - filter non-fingerprint scenarios
*/
@@ -223,7 +222,6 @@
/*
* Make the actions of the view:
* - change table line selection display
- * - filter nightly builds
* - filter non-milestone builds
* - filter non-fingerprint scenarios
*/
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsView.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsView.java
index 71a64e3..19fdc8c 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsView.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/BuildsView.java
@@ -547,7 +547,6 @@
// Set filters default
this.filterBaselineBuilds.setChecked(false);
- this.filterNightlyBuilds.setChecked(false);
}
/**
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentResultsView.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentResultsView.java
index 412c9f2..bccfd90 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentResultsView.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentResultsView.java
@@ -60,7 +60,6 @@
* </p><ul>
* <li>Filter for builds:
* <ul>
- * <li>Filter nightly: hide the nightly builds (starting with 'N')</li>
* <li>Filter non-important builds: hide all non-important builds, which means non-milestone builds and those after the last milestone</li>
* </ul>
* </li>
@@ -90,7 +89,6 @@
Action fullLineSelection;
Action filterAdvancedScenarios;
Action filterOldBuilds;
- Action filterNightlyBuilds;
ImageDescriptor fullSelectionImageDescriptor;
// Views
@@ -184,12 +182,10 @@
/*
* Fill the filters drop-down menu with:
- * - filter nightly builds
* - filter non-milestone builds
* - filter non-fingerprint scenarios
*/
void fillFiltersDropDown(IMenuManager manager) {
- manager.add(this.filterNightlyBuilds);
manager.add(this.filterOldBuilds);
manager.add(new Separator());
manager.add(this.filterAdvancedScenarios);
@@ -221,7 +217,6 @@
/*
* Make the actions of the view:
* - change table line selection display
- * - filter nightly builds
* - filter non-milestone builds
* - filter non-fingerprint scenarios
*/
@@ -260,15 +255,6 @@
this.filterOldBuilds.setChecked(false);
this.filterOldBuilds.setToolTipText("Filter old builds (i.e. before last milestone) but keep all previous milestones)");
- // Filter nightly action
- this.filterNightlyBuilds = new Action("&Nightly", IAction.AS_CHECK_BOX) {
- @Override
- public void run() {
- ComponentResultsView.this.preferences.putBoolean(IPerformancesConstants.PRE_FILTER_NIGHTLY_BUILDS, isChecked());
- resetTabFolders(false/*refresh*/);
- }
- };
- this.filterNightlyBuilds.setToolTipText("Filter nightly builds");
}
@Override
@@ -290,12 +276,6 @@
resetTabFolders(false/*refresh*/);
}
- // Filter nightly builds change
- if (propertyName.equals(IPerformancesConstants.PRE_FILTER_NIGHTLY_BUILDS)) {
- boolean checked = newValue == null ? IPerformancesConstants.DEFAULT_FILTER_NIGHTLY_BUILDS : "true".equals(newValue);
- this.filterNightlyBuilds.setChecked(checked);
- resetTabFolders(false/*refresh*/);
- }
}
/*
@@ -373,10 +353,6 @@
boolean checked = this.preferences.getBoolean(IPerformancesConstants.PRE_FILTER_ADVANCED_SCENARIOS, IPerformancesConstants.DEFAULT_FILTER_ADVANCED_SCENARIOS);
this.filterAdvancedScenarios.setChecked(checked);
- // Filter nightly builds action
- checked = this.preferences.getBoolean(IPerformancesConstants.PRE_FILTER_NIGHTLY_BUILDS, IPerformancesConstants.DEFAULT_FILTER_NIGHTLY_BUILDS);
- this.filterNightlyBuilds.setChecked(checked);
-
// Filter non important builds action state
checked = this.preferences.getBoolean(IPerformancesConstants.PRE_FILTER_OLD_BUILDS, IPerformancesConstants.DEFAULT_FILTER_OLD_BUILDS);
this.filterOldBuilds.setChecked(checked);
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java
index 8b1042f..dfe24bd 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/ComponentsView.java
@@ -61,7 +61,6 @@
* <li>Filter for builds:
* <ul>
* <li>Filter baselines: hide the baselines (starting with R-4.x)</li>
- * <li>Filter nightly: hide the nightly builds (starting with 'N')</li>
* <li>Filter non-important builds: hide all non-important builds, which means non-milestone builds and those after the last milestone</li>
* </ul>
* </li>
@@ -277,7 +276,6 @@
// Set filters default
this.filterBaselineBuilds.setChecked(true);
- this.filterNightlyBuilds.setChecked(false);
}
@Override
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformanceResultsPreferenceInitializer.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformanceResultsPreferenceInitializer.java
index 0755e5f..ed3c4b3 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformanceResultsPreferenceInitializer.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformanceResultsPreferenceInitializer.java
@@ -66,7 +66,6 @@
// Filters
defaultPreferences.putBoolean(PRE_FILTER_ADVANCED_SCENARIOS, IPerformancesConstants.DEFAULT_FILTER_ADVANCED_SCENARIOS);
defaultPreferences.putBoolean(PRE_FILTER_OLD_BUILDS, IPerformancesConstants.DEFAULT_FILTER_OLD_BUILDS);
- defaultPreferences.putBoolean(PRE_FILTER_NIGHTLY_BUILDS, IPerformancesConstants.DEFAULT_FILTER_NIGHTLY_BUILDS);
}
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformancesView.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformancesView.java
index 45ffaf8..74783b2 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformancesView.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/ui/PerformancesView.java
@@ -95,16 +95,6 @@
return true;
}
};
- public final static ViewerFilter FILTER_NIGHTLY_BUILDS = new ViewerFilter() {
- @Override
- public boolean select(Viewer v, Object parentElement, Object element) {
- if (element instanceof BuildResultsElement) {
- BuildResultsElement buildElement = (BuildResultsElement) element;
- return buildElement.getName().charAt(0) != 'N';
- }
- return true;
- }
- };
final static ViewerFilter FILTER_OLD_BUILDS = new ViewerFilter() {
@Override
public boolean select(Viewer v, Object parentElement, Object element) {
@@ -136,7 +126,6 @@
// Actions
Action changeDataDir;
Action filterBaselineBuilds;
- Action filterNightlyBuilds;
Action filterOldBuilds;
// Action dbConnection;
@@ -263,7 +252,6 @@
*/
void fillFiltersDropDown(IMenuManager manager) {
manager.add(this.filterBaselineBuilds);
- manager.add(this.filterNightlyBuilds);
}
/*
@@ -299,19 +287,6 @@
/*
* Filter non milestone builds action run.
*/
-void filterNightlyBuilds(boolean filter) {
- if (filter) {
- this.viewFilters.add(FILTER_NIGHTLY_BUILDS);
- } else {
- this.viewFilters.remove(FILTER_NIGHTLY_BUILDS);
- }
- this.preferences.putBoolean(IPerformancesConstants.PRE_FILTER_NIGHTLY_BUILDS, filter);
- updateFilters();
-}
-
-/*
- * Filter non milestone builds action run.
- */
void filterOldBuilds(boolean filter) {
if (filter) {
this.viewFilters.add(FILTER_OLD_BUILDS);
@@ -424,15 +399,6 @@
};
this.filterBaselineBuilds.setToolTipText("Filter baseline builds");
- // Filter baselines action
- this.filterNightlyBuilds = new Action("&Nightly", IAction.AS_CHECK_BOX) {
- @Override
- public void run() {
- filterNightlyBuilds(isChecked());
- }
- };
- this.filterNightlyBuilds.setToolTipText("Filter nightly builds");
-
// Filter non-important builds action
this.filterOldBuilds = new Action("&Old Builds", IAction.AS_CHECK_BOX) {
@Override
@@ -525,15 +491,8 @@
}
}
- // Filter nightly builds action
- boolean checked = this.preferences.getBoolean(IPerformancesConstants.PRE_FILTER_NIGHTLY_BUILDS, IPerformancesConstants.DEFAULT_FILTER_NIGHTLY_BUILDS);
- this.filterNightlyBuilds.setChecked(checked);
- if (checked) {
- this.viewFilters.add(FILTER_NIGHTLY_BUILDS);
- }
-
// Filter non important builds action state
- checked = this.preferences.getBoolean(IPerformancesConstants.PRE_FILTER_OLD_BUILDS, IPerformancesConstants.DEFAULT_FILTER_OLD_BUILDS);
+ boolean checked = this.preferences.getBoolean(IPerformancesConstants.PRE_FILTER_OLD_BUILDS, IPerformancesConstants.DEFAULT_FILTER_OLD_BUILDS);
this.filterOldBuilds.setChecked(checked);
if (checked) {
this.viewFilters.add(FILTER_OLD_BUILDS);
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/utils/IPerformancesConstants.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/utils/IPerformancesConstants.java
index 42a07a9..2033002 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/utils/IPerformancesConstants.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/internal/performance/results/utils/IPerformancesConstants.java
@@ -38,14 +38,12 @@
String PRE_STATUS_COMMENT_PREFIX = PREFIX + "status.comment"; //$NON-NLS-1$
String PRE_FILTER_ADVANCED_SCENARIOS = PREFIX + "filter.non.fingerprints.scenarios"; //$NON-NLS-1$
String PRE_FILTER_OLD_BUILDS = PREFIX + "filter.non.milestones.builds"; //$NON-NLS-1$
- String PRE_FILTER_NIGHTLY_BUILDS = PREFIX + "filter.nightly.builds"; //$NON-NLS-1$
// Default values
String DATABASE_NAME_PREFIX = "perfDb";
String NETWORK_DATABASE_LOCATION = "//shared/eclipse/databases/eclipseDB45/perfDb45:1528";
boolean DEFAULT_FILTER_ADVANCED_SCENARIOS = true;
boolean DEFAULT_FILTER_OLD_BUILDS = false;
- boolean DEFAULT_FILTER_NIGHTLY_BUILDS = false;
boolean DEFAULT_DATABASE_CONNECTION = false;
boolean DEFAULT_DATABASE_LOCAL = false;
diff --git a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ScenarioData.java b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ScenarioData.java
index cfa8b3a..cd83aab 100644
--- a/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ScenarioData.java
+++ b/bundles/org.eclipse.test.performance.ui/src/org/eclipse/test/performance/ui/ScenarioData.java
@@ -92,7 +92,6 @@
Display display = Display.getDefault();
Color black = display.getSystemColor(SWT.COLOR_BLACK);
- Color yellow = display.getSystemColor(SWT.COLOR_DARK_YELLOW);
Color magenta = display.getSystemColor(SWT.COLOR_MAGENTA);
String scenarioName = scenarioResults.getName();
@@ -102,7 +101,6 @@
final String defaultBaselinePrefix = DB_Results.getDbBaselinePrefix();
Iterator<AbstractResults> builds = configResults.getResults();
- List<String> lastSevenNightlyBuilds = configResults.lastNightlyBuildNames(7);
buildLoop: while (builds.hasNext()) {
BuildResults buildResults = (BuildResults) builds.next();
String buildID = buildResults.getName();
@@ -116,9 +114,6 @@
if (buildID.equals(current)) {
Color color = black;
- if (buildID.startsWith("N"))
- color = yellow;
-
graph.addItem("main", label, dim.getDisplayValue(value), value, color, true, Utils.getDateFromBuildID(buildID), true);
continue;
}
@@ -126,14 +121,8 @@
graph.addItem("main", label, dim.getDisplayValue(value), value, black, false, Utils.getDateFromBuildID(buildID, false), true);
continue;
}
- if (buildID.charAt(0) == 'N') {
- if (lastSevenNightlyBuilds.contains(buildID)) {
- graph.addItem("main", buildID, dim.getDisplayValue(value), value, yellow, false, Utils.getDateFromBuildID(buildID), false);
- }
- continue;
- }
- for (int i=0;i<currentBuildIdPrefixes.size();i++){
- if (buildID.startsWith(currentBuildIdPrefixes.get(i).toString())) {
+ for (String element : currentBuildIdPrefixes) {
+ if (buildID.startsWith(element.toString())) {
graph.addItem("main", buildID, dim.getDisplayValue(value), value, black, false, Utils.getDateFromBuildID(buildID), false);
continue buildLoop;
}
@@ -294,7 +283,7 @@
stream.print("<br><hr>\n\n");
// print text legend.
- stream.print("Black and yellow points plot values measured in integration and last seven nightly builds.<br>\n" + "Magenta points plot the repeated baseline measurement over time.<br>\n"
+ stream.print("Black points plot values measured in integration builds.<br>\n" + "Magenta points plot the repeated baseline measurement over time.<br>\n"
+ "Boxed points represent previous releases, milestone builds, current reference and current build.<br><br>\n"
+ "Hover over any point for build id and value.\n");
