Skip to content

Commit

Permalink
SecuritiesChart: Factor out createPriceLineSeries()
Browse files Browse the repository at this point in the history 
Instead of largely duplicated createFIFOPurchaseLineSeries() and
createMovingAveragePurchaseLineSeries(), factor out reusable
createPriceLineSeries() which accepts additional params to handle both
cases.

As part of the refactor, largely duplicated-content messages like
LabelChartDetailMarkerPurchaseMovingAverage vs
LabelChartDetailMarkerPurchaseMovingAverageHoldingPeriod were simplified:
now there's one main message for series label, and reusable suffix message
for holding period number.
  • Loading branch information
@pfalcon
pfalcon committed Feb 3, 2025
1 parent 2c49423 commit 05bea85
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 33 deletions.
3 changes: 1 addition & 2 deletions name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,9 +585,8 @@ public class Messages extends NLS
public static String LabelChartDetailMarkerInvestments;
public static String LabelChartDetailMarkerLow;
public static String LabelChartDetailMarkerPurchaseFIFO;
public static String LabelChartDetailMarkerPurchaseFIFOHoldingPeriod;
public static String LabelChartDetailMarkerPurchaseMovingAverage;
public static String LabelChartDetailMarkerPurchaseMovingAverageHoldingPeriod;
public static String LabelChartDetailMarkerPurchasePeriodNo;
public static String LabelChartDetailMovingAverage;
public static String LabelChartDetailMovingAverage_100days;
public static String LabelChartDetailMovingAverage_200days;
Expand Down
4 changes: 1 addition & 3 deletions name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1162,11 +1162,9 @@ LabelChartDetailMarkerLow = Low

LabelChartDetailMarkerPurchaseFIFO = Purchase Value (FIFO)

LabelChartDetailMarkerPurchaseFIFOHoldingPeriod = Purchase Value (FIFO) ({0}. holding period)

LabelChartDetailMarkerPurchaseMovingAverage = Purchase Value (moving average)

LabelChartDetailMarkerPurchaseMovingAverageHoldingPeriod = Purchase Value (moving average) ({0}. holding period)
LabelChartDetailMarkerPurchasePeriodNo = ({0}. holding period)

LabelChartDetailMovingAverage = Average

Expand Down
42 changes: 14 additions & 28 deletions name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecuritiesChart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1788,7 +1788,8 @@ private void addFIFOPurchasePrice(ChartInterval chartInterval)
dates.add(eventDate);
values.add(values.get(values.size() - 1));

createFIFOPurchaseLineSeries(values, dates, seriesCounter++);
createPriceLineSeries(values, dates, seriesCounter++, colorFifoPurchasePrice,
Messages.LabelChartDetailMarkerPurchaseFIFO);

values.clear();
dates.clear();
Expand All @@ -1809,26 +1810,8 @@ else if (dates.isEmpty())
});

if (!dates.isEmpty())
createFIFOPurchaseLineSeries(values, dates, seriesCounter);
}

private void createFIFOPurchaseLineSeries(List<Double> values, List<LocalDate> dates, int seriesCounter)
{
String label = seriesCounter == 0 ? Messages.LabelChartDetailMarkerPurchaseFIFO
: MessageFormat.format(Messages.LabelChartDetailMarkerPurchaseFIFOHoldingPeriod,
seriesCounter + 1);

@SuppressWarnings("unchecked")
ILineSeries<Integer> series = (ILineSeries<Integer>) chart.getSeriesSet().createSeries(SeriesType.LINE, label);

series.setSymbolType(PlotSymbolType.NONE);
series.setYAxisId(0);
series.enableStep(true);

configureSeriesPainter(series, dates.toArray(new LocalDate[0]), Doubles.toArray(values), colorFifoPurchasePrice,
2, LineStyle.SOLID, false, seriesCounter == 0);

setupTooltipDisplayCalculatedQuote(label);
createPriceLineSeries(values, dates, seriesCounter, colorFifoPurchasePrice,
Messages.LabelChartDetailMarkerPurchaseFIFO);
}

private void addMovingAveragePurchasePrice(ChartInterval chartInterval)
Expand Down Expand Up @@ -1884,7 +1867,8 @@ private void addMovingAveragePurchasePrice(ChartInterval chartInterval)
dates.add(eventDate);
values.add(values.get(values.size() - 1));

createMovingAveragePurchaseLineSeries(values, dates, seriesCounter++);
createPriceLineSeries(values, dates, seriesCounter++, colorMovingAveragePurchasePrice,
Messages.LabelChartDetailMarkerPurchaseMovingAverage);

values.clear();
dates.clear();
Expand All @@ -1905,14 +1889,16 @@ else if (dates.isEmpty())
});

if (!dates.isEmpty())
createMovingAveragePurchaseLineSeries(values, dates, seriesCounter);
createPriceLineSeries(values, dates, seriesCounter, colorMovingAveragePurchasePrice,
Messages.LabelChartDetailMarkerPurchaseMovingAverage);
}

private void createMovingAveragePurchaseLineSeries(List<Double> values, List<LocalDate> dates, int seriesCounter)
private void createPriceLineSeries(List<Double> values, List<LocalDate> dates, int seriesCounter, Color color,
String label)
{
String label = seriesCounter == 0 ? Messages.LabelChartDetailMarkerPurchaseMovingAverage
: MessageFormat.format(Messages.LabelChartDetailMarkerPurchaseMovingAverageHoldingPeriod,
seriesCounter + 1);
if (seriesCounter != 0)
label += " " + MessageFormat.format(Messages.LabelChartDetailMarkerPurchasePeriodNo,
seriesCounter + 1);

@SuppressWarnings("unchecked")
ILineSeries<Integer> series = (ILineSeries<Integer>) chart.getSeriesSet().createSeries(SeriesType.LINE, label);
Expand All @@ -1922,7 +1908,7 @@ private void createMovingAveragePurchaseLineSeries(List<Double> values, List<Loc
series.enableStep(true);

configureSeriesPainter(series, dates.toArray(new LocalDate[0]), Doubles.toArray(values),
colorMovingAveragePurchasePrice, 2, LineStyle.SOLID, false, seriesCounter == 0);
color, 2, LineStyle.SOLID, false, seriesCounter == 0);

setupTooltipDisplayCalculatedQuote(label);
}
Expand Down

0 comments on commit 05bea85

Please sign in to comment.