color fix and raw types fix

This commit is contained in:
Greg DiCristofaro 2020-11-10 15:31:50 -05:00
parent 6cbeb2a2c6
commit a92a37e259
2 changed files with 8 additions and 9 deletions

View File

@ -58,7 +58,6 @@ public class TimelinePanel extends BaseDataSourceSummaryPanel {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final DateFormat EARLIEST_LATEST_FORMAT = getUtcFormat("MMM d, yyyy"); private static final DateFormat EARLIEST_LATEST_FORMAT = getUtcFormat("MMM d, yyyy");
private static final DateFormat CHART_FORMAT = getUtcFormat("MMM d"); private static final DateFormat CHART_FORMAT = getUtcFormat("MMM d");
private static final Color CHART_COLOR = Color.BLUE;
private static final int MOST_RECENT_DAYS_COUNT = 30; private static final int MOST_RECENT_DAYS_COUNT = 30;
/** /**
@ -114,8 +113,8 @@ public class TimelinePanel extends BaseDataSourceSummaryPanel {
return date == null ? null : formatter.format(date); return date == null ? null : formatter.format(date);
} }
private static final Color FILE_EVT_COLOR = new Color(1, 87, 155); private static final Color FILE_EVT_COLOR = new Color(228, 22, 28);
private static final Color ARTIFACT_EVT_COLOR = new Color(76, 175, 80); private static final Color ARTIFACT_EVT_COLOR = new Color(21, 227, 100);
/** /**
* Converts DailyActivityAmount data retrieved from TimelineSummary into * Converts DailyActivityAmount data retrieved from TimelineSummary into

View File

@ -46,7 +46,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
*/ */
public static class BarChartSeries { public static class BarChartSeries {
private final Comparable key; private final Comparable<?> key;
private final Color color; private final Color color;
private final List<BarChartItem> items; private final List<BarChartItem> items;
@ -56,7 +56,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
* @param color The color for this series. * @param color The color for this series.
* @param items The bars to be displayed for this series. * @param items The bars to be displayed for this series.
*/ */
public BarChartSeries(Comparable key, Color color, List<BarChartItem> items) { public BarChartSeries(Comparable<?> key, Color color, List<BarChartItem> items) {
this.key = key; this.key = key;
this.color = color; this.color = color;
this.items = (items == null) ? Collections.emptyList() : Collections.unmodifiableList(items); this.items = (items == null) ? Collections.emptyList() : Collections.unmodifiableList(items);
@ -79,7 +79,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
/** /**
* @return The key for this item. * @return The key for this item.
*/ */
public Comparable getKey() { public Comparable<?> getKey() {
return key; return key;
} }
} }
@ -89,7 +89,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
*/ */
public static class BarChartItem { public static class BarChartItem {
private final Comparable key; private final Comparable<?> key;
private final double value; private final double value;
/** /**
@ -99,7 +99,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
* toString(). * toString().
* @param value The value for this item. * @param value The value for this item.
*/ */
public BarChartItem(Comparable key, double value) { public BarChartItem(Comparable<?> key, double value) {
this.key = key; this.key = key;
this.value = value; this.value = value;
} }
@ -107,7 +107,7 @@ public class BarChartPanel extends AbstractLoadableComponent<List<BarChartPanel.
/** /**
* @return The key for this item. * @return The key for this item.
*/ */
public Comparable getKey() { public Comparable<?> getKey() {
return key; return key;
} }