Skip to content

Commit de360e7

Browse files
akurtakovakurtakov
committed
Move to SWTChart 1.0
Fix some generification warnings while at it.
1 parent 0f40e0b commit de360e7

File tree

20 files changed

+43
-42
lines changed

20 files changed

+43
-42
lines changed

‎profiling/org.eclipse.linuxtools.dataviewers.charts/src/org/eclipse/linuxtools/internal/dataviewers/charts/view/ChartFactory.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* Copyright (c) 2009, 2018 STMicroelectronics and others.
3-
*
3+
*
44
* This program and the accompanying materials are made
55
* available under the terms of the Eclipse Public License 2.0
66
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -33,7 +33,7 @@
3333

3434
/**
3535
* A utility class that handles the charts creation (pie chart and bar chart)
36-
*
36+
*
3737
*/
3838
public final class ChartFactory {
3939

@@ -118,13 +118,12 @@ public static InteractiveChart producePieChart(Object[] objects, ISTDataViewersF
118118

119119
public static InteractiveChart produceBarChart(Object[] objects, final ISTDataViewersField nameField,
120120
List<IChartField> valFields, String title, boolean horizontal) {
121-
ChartView view;
122121
try {
123122
final Color WHITE = PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_WHITE);
124123
final Color BLACK = PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_BLACK);
125124
final Color GRAD = PlatformUI.getWorkbench().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
126125

127-
view = (ChartView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
126+
ChartView view = (ChartView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
128127
.showView(ChartView.VIEW_ID, String.valueOf(ChartView.getSecId()), IWorkbenchPage.VIEW_ACTIVATE);
129128
InteractiveChart chart = new InteractiveChart(view.getParent(), SWT.NONE);
130129

@@ -167,7 +166,7 @@ public static InteractiveChart produceBarChart(Object[] objects, final ISTDataVi
167166

168167
// data
169168
for (IChartField field : valFields) {
170-
final IBarSeries bs = (IBarSeries) chart.getSeriesSet().createSeries(SeriesType.BAR,
169+
final IBarSeries<?> bs = (IBarSeries<?>) chart.getSeriesSet().createSeries(SeriesType.BAR,
171170
field.getColumnHeaderText());
172171
bs.setBarColor(new Color(Display.getDefault(), getRC(), getRC(), getRC()));
173172
double[] doubleValues = new double[objects.length];

‎profiling/org.eclipse.linuxtools.dataviewers.piechart/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Bundle-Version: 3.0.0.qualifier
66
Bundle-Vendor: %bundleProvider
77
Bundle-Localization: plugin
88
Require-Bundle: org.eclipse.ui,
9-
org.eclipse.swtchart
9+
org.eclipse.swtchart;bundle-version="1.0.0"
1010
Bundle-RequiredExecutionEnvironment: JavaSE-21
1111
Bundle-ActivationPolicy: lazy
1212
Export-Package: org.eclipse.linuxtools.dataviewers.piechart, org.eclipse.linuxtools.internal.dataviewers.piechart;x-internal:=true

‎profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChart.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ public void setCustomColors(Color[] customColors) {
8686
*/
8787
public void addPieChartSeries(String[] labels, double[][] val) {
8888
setSeriesNames(val[0].length);
89-
for (ISeries s : this.getSeriesSet().getSeries()) {
89+
for (ISeries<?> s : this.getSeriesSet().getSeries()) {
9090
this.getSeriesSet().deleteSeries(s.getId());
9191
}
9292

9393
int size = Math.min(labels.length, val.length);
9494
for (int i = 0; i < size; i++) {
95-
IBarSeries s = (IBarSeries) this.getSeriesSet().createSeries(ISeries.SeriesType.BAR, labels[i]);
95+
IBarSeries<?> s = (IBarSeries<?>) this.getSeriesSet().createSeries(ISeries.SeriesType.BAR, labels[i]);
9696
double[] d = new double[val[i].length];
9797
for (int j = 0; j < val[i].length; j++) {
9898
d[j] = val[i][j];
@@ -158,7 +158,7 @@ public int getSliceIndexFromPosition(int pieIndex, int x, int y) {
158158
*/
159159
public double getSlicePercent(int pieIndex, int sliceIndex) {
160160
double max = 0;
161-
ISeries[] series = getSeriesSet().getSeries();
161+
ISeries<?>[] series = getSeriesSet().getSeries();
162162
for (int i = 0; i < series.length; i++) {
163163
max += series[i].getXSeries()[pieIndex];
164164
}

‎profiling/org.eclipse.linuxtools.dataviewers.piechart/src/org/eclipse/linuxtools/internal/dataviewers/piechart/PieChartPaintListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private void drawPieChart(PaintEvent e, int chartnum, Rectangle bounds) {
172172
pieSliceAngles[chartnum][i - 1] = 90 - initialAngle;
173173
}
174174

175-
gc.setBackground(((IBarSeries) chart.getSeriesSet().getSeries()[i]).getBarColor());
175+
gc.setBackground(((IBarSeries<?>) chart.getSeriesSet().getSeries()[i]).getBarColor());
176176

177177
if (i == (nelemSeries - 1)) {
178178
sweepAngle = 360 - incrementAngle;
@@ -200,7 +200,7 @@ private void drawPieChart(PaintEvent e, int chartnum, Rectangle bounds) {
200200
}
201201

202202
private void getPieSeriesArray() {
203-
ISeries series[] = this.chart.getSeriesSet().getSeries();
203+
ISeries<?> series[] = this.chart.getSeriesSet().getSeries();
204204
if (series == null || series.length == 0) {
205205
seriesValues = new double[0][0];
206206
seriesNames = new String[0];

‎releng/org.eclipse.linuxtools.target/linuxtools-latest.target

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
7878
<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
7979
<unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.0.0"/>
80-
<repository location="https://download.eclipse.org/swtchart/releases/0.14.0/repository"/>
80+
<repository location="https://download.eclipse.org/swtchart/releases/1.0.0/repository"/>
8181
</location>
8282
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
8383
<dependencies>

‎systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.linuxtools.systemtap.graphing.core,
1818
org.eclipse.ui,
1919
org.eclipse.core.runtime,
2020
org.eclipse.ui.forms,
21-
org.eclipse.swtchart,
21+
org.eclipse.swtchart;bundle-version="1.0.0",
2222
org.eclipse.linuxtools.dataviewers.piechart,
2323
org.eclipse.linuxtools.dataviewers.charts
2424
Bundle-ActivationPolicy: lazy

‎systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AbstractChartWithAxisBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected double getChartMarginYU() {
7979
* @param i The index of the series to create.
8080
* @return The newly created series.
8181
*/
82-
protected abstract ISeries createChartISeries(int i);
82+
protected abstract ISeries<?> createChartISeries(int i);
8383

8484
@Override
8585
protected void updateProperties(PropertyChangeEvent event) {
@@ -265,8 +265,8 @@ protected void buildXSeries() {
265265
// Now create dense arrays of x/y values that exclude null values,
266266
// and plot those values to the chart.
267267

268-
ISeries allSeries[] = chart.getSeriesSet().getSeries();
269-
ISeries series = null;
268+
ISeries<?> allSeries[] = chart.getSeriesSet().getSeries();
269+
ISeries<?> series = null;
270270
for (int i = 0; i < leny; i++) {
271271
if (i >= allSeries.length) {
272272
series = createChartISeries(i);

‎systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/AreaChartBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public AreaChartBuilder(Composite parent, int style, String title,IAdapter adapt
3434
}
3535

3636
@Override
37-
protected ISeries createChartISeries(int i) {
38-
ILineSeries series = (ILineSeries) super.createChartISeries(i);
37+
protected ISeries<?> createChartISeries(int i) {
38+
ILineSeries<?> series = (ILineSeries<?>) super.createChartISeries(i);
3939
series.enableArea(true);
4040
return series;
4141
}

‎systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChart.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private void hideBars() {
155155
Range rangeX = xAxis.getRange();
156156
double bottomY = getAxisSet().getYAxis(0).getRange().lower;
157157
double nonNegBottomY = Math.max(0, bottomY);
158-
ISeries[] allSeries = getSeriesSet().getSeries();
158+
ISeries<?>[] allSeries = getSeriesSet().getSeries();
159159
actualYSeries = new double[allSeries.length][];
160160

161161
for (int i = 0, n = allSeries.length; i < n; i++) {

‎systemtap/org.eclipse.linuxtools.systemtap.graphing.ui/src/org/eclipse/linuxtools/internal/systemtap/graphing/ui/charts/BarChartBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ protected void createChart() {
4646
}
4747

4848
@Override
49-
protected ISeries createChartISeries(int i) {
50-
IBarSeries series = (IBarSeries)chart.getSeriesSet().
51-
createSeries(SeriesType.BAR, adapter.getLabels()[i+1]);
49+
protected ISeries<?> createChartISeries(int i) {
50+
IBarSeries<?> series = (IBarSeries<?>) chart.getSeriesSet()
51+
.createSeries(SeriesType.BAR, adapter.getLabels()[i + 1]);
5252
series.setBarColor(COLORS[i % COLORS.length]);
5353
return series;
5454
}
@@ -104,9 +104,9 @@ protected void buildXSeries() {
104104
String[] valxTrim = new String[lenTrim];
105105
System.arraycopy(valx, 0, valxTrim, 0, lenTrim);
106106

107-
ISeries allSeries[] = chart.getSeriesSet().getSeries();
107+
ISeries<?> allSeries[] = chart.getSeriesSet().getSeries();
108108
for (int i = 0; i < leny; i++) {
109-
ISeries series;
109+
ISeries<?> series;
110110
if (i >= allSeries.length) {
111111
series = createChartISeries(i);
112112
} else {

0 commit comments

Comments
 (0)