Merge branch 'bug3819'

This commit is contained in:
Benjamin Barth committed 2017-02-08 16:36:10 +01:00
commit ef87c29bdc
5 files changed
+13 -8

No files matched your search

@@ -45,7 +45,7 @@ public class LiveRacesList extends Composite {
private final SortableRaceListColumn<LiveRaceDTO, ?> raceViewStateColumn = RaceListColumnFactory.getRaceViewStateColumn();
public RaceListLiveRaces(EventView.Presenter presenter, boolean showRegattaDetails) {
super(presenter, new RaceListColumnSet(1, 1));
super(presenter, new RaceListColumnSet(1, 1), false);
this.regattaNameColumn.setShowDetails(showRegattaDetails);
}
@@ -45,9 +45,9 @@ public abstract class AbstractRaceList<T extends RaceMetadataDTO<? extends Abstr
private final SortedCellTable<T> cellTable = new SortedCellTable<T>(0, CleanCellTableResources.INSTANCE);
private boolean tableColumnsInitialized = false;
protected AbstractRaceList(EventView.Presenter presenter, RaceListColumnSet columnSet) {
protected AbstractRaceList(EventView.Presenter presenter, RaceListColumnSet columnSet, boolean showNotTracked) {
CSS.ensureInjected();
this.raceViewerButtonColumn = RaceListColumnFactory.getRaceViewerButtonColumn(presenter);
this.raceViewerButtonColumn = RaceListColumnFactory.getRaceViewerButtonColumn(presenter, showNotTracked);
this.columnSet = columnSet;
this.cellTableContainer.setWidget(this.cellTable);
this.initTableStyle();
@@ -488,7 +488,8 @@ public class RaceListColumnFactory {
};
}
public static <T extends RaceMetadataDTO<?>> SortableRaceListColumn<T, T> getRaceViewerButtonColumn(final EventView.Presenter presenter) {
public static <T extends RaceMetadataDTO<?>> SortableRaceListColumn<T, T> getRaceViewerButtonColumn(
final EventView.Presenter presenter, final boolean showNotTracked) {
InvertibleComparator<T> comparator = new InvertibleComparatorAdapter<T>() {
@Override
public int compare(T o1, T o2) {
@@ -503,7 +504,7 @@ public class RaceListColumnFactory {
return -o1.getTrackingState().compareTo(o2.getTrackingState());
}
};
return new SortableRaceListColumn<T, T>("", new RaceviewerLaunchPadCell<T>(presenter), comparator) {
return new SortableRaceListColumn<T, T>("", new RaceviewerLaunchPadCell<T>(presenter, showNotTracked), comparator) {
@Override
public String getHeaderStyle() {
return getStyleNamesString(CSS.raceslist_head_item(), CSS.raceslist_head_itembutton());
@@ -45,9 +45,11 @@ public class RaceviewerLaunchPadCell<T extends RaceMetadataDTO<?>> extends Abstr
private final EventView.Presenter presenter;
private final PopupPanel panel = new PopupPanel(true, false);
private final boolean showNotTracked;
public RaceviewerLaunchPadCell(Presenter presenter) {
public RaceviewerLaunchPadCell(Presenter presenter, boolean showNotTracked) {
super(BrowserEvents.CLICK);
this.showNotTracked = showNotTracked;
local_res.css().ensureInjected();
this.presenter = presenter;
}
@@ -84,8 +86,10 @@ public class RaceviewerLaunchPadCell<T extends RaceMetadataDTO<?>> extends Abstr
String styleNames = data.isFinished() ? analyzeStyleNames : liveStyleNames;
sb.append(TEMPLATE.raceviewerLaunchPad(styleNames, iconStyleNames, I18N.raceDetailsToShow()));
}
} else if (showNotTracked) {
sb.append(TEMPLATE.raceNotTracked(notTrackedStyleNames, I18N.eventRegattaRaceNotTracked()));
} else {
sb.append(TEMPLATE.raceNotTracked(notTrackedStyleNames, I18N.eventRegattaRaceNotTracked()));
sb.append(TEMPLATE.raceNotTracked(notTrackedStyleNames, ""));
}
}
@@ -202,7 +202,7 @@ public class RegattaRacesTabView extends Composite implements RegattaTabView<Reg
public RaceListFinishedRaces(EventView.Presenter presenter) {
super(presenter, new RaceListColumnSet(1, 1));
super(presenter, new RaceListColumnSet(1, 1), true);
}
@Override