Using SimpleCompetitorDTO

This commit is contained in:
Steffen Schaefer committed 2015-07-06 10:51:56 +02:00
1 parent 88c9b7d827
commit 3e8a2c551d
2 files changed
+10 -10

No files matched your search

@@ -21,7 +21,7 @@ import com.google.gwt.safehtml.shared.SafeUri;
import com.google.gwt.safehtml.shared.UriUtils; import com.google.gwt.safehtml.shared.UriUtils;
import com.google.gwt.user.cellview.client.SafeHtmlHeader; import com.google.gwt.user.cellview.client.SafeHtmlHeader;
import com.sap.sailing.domain.common.InvertibleComparator; import com.sap.sailing.domain.common.InvertibleComparator;
import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.domain.common.dto.SimpleCompetitorDTO;
import com.sap.sailing.domain.common.impl.NaturalComparator; import com.sap.sailing.domain.common.impl.NaturalComparator;
import com.sap.sailing.gwt.common.client.SharedResources; import com.sap.sailing.gwt.common.client.SharedResources;
import com.sap.sailing.gwt.common.client.SharedResources.MainCss; import com.sap.sailing.gwt.common.client.SharedResources.MainCss;
@@ -421,10 +421,10 @@ public class RaceListColumnFactory {
}; };
} }
public static <T extends RaceListRaceDTO> SortableRaceListColumn<T, CompetitorDTO> getWinnerColumn() { public static <T extends RaceListRaceDTO> SortableRaceListColumn<T, SimpleCompetitorDTO> getWinnerColumn() {
Cell<CompetitorDTO> cell = new AbstractCell<CompetitorDTO>() { Cell<SimpleCompetitorDTO> cell = new AbstractCell<SimpleCompetitorDTO>() {
@Override @Override
public void render(Context context, CompetitorDTO value, SafeHtmlBuilder sb) { public void render(Context context, SimpleCompetitorDTO value, SafeHtmlBuilder sb) {
if (value != null) { if (value != null) {
final SafeUri flagImageUri; final SafeUri flagImageUri;
if (value.getFlagImageURL() == null || value.getFlagImageURL().isEmpty()) { if (value.getFlagImageURL() == null || value.getFlagImageURL().isEmpty()) {
@@ -447,7 +447,7 @@ public class RaceListColumnFactory {
return object.getWinner() != null ? object.getWinner().getName() : null; return object.getWinner() != null ? object.getWinner().getName() : null;
} }
}; };
return new SortableRaceListColumn<T, CompetitorDTO>(I18N.winner(), cell, comparator) { return new SortableRaceListColumn<T, SimpleCompetitorDTO>(I18N.winner(), cell, comparator) {
@Override @Override
public String getHeaderStyle() { public String getHeaderStyle() {
return CSS.raceslist_head_item(); return CSS.raceslist_head_item();
@@ -459,7 +459,7 @@ public class RaceListColumnFactory {
} }
@Override @Override
public CompetitorDTO getValue(T object) { public SimpleCompetitorDTO getValue(T object) {
return object.getWinner(); return object.getWinner();
} }
}; };
@@ -1,13 +1,13 @@
package com.sap.sailing.gwt.ui.shared.dispatch.event; package com.sap.sailing.gwt.ui.shared.dispatch.event;
import com.sap.sailing.domain.common.dto.CompetitorDTO; import com.sap.sailing.domain.common.dto.SimpleCompetitorDTO;
import com.sap.sailing.gwt.ui.shared.race.RaceMetadataDTO; import com.sap.sailing.gwt.ui.shared.race.RaceMetadataDTO;
import com.sap.sse.common.Duration; import com.sap.sse.common.Duration;
public class RaceListRaceDTO extends RaceMetadataDTO { public class RaceListRaceDTO extends RaceMetadataDTO {
private Duration duration; private Duration duration;
private CompetitorDTO winner; private SimpleCompetitorDTO winner;
private int windFixesCount; private int windFixesCount;
private int videoCount; private int videoCount;
private int audioCount; private int audioCount;
@@ -26,10 +26,10 @@ public class RaceListRaceDTO extends RaceMetadataDTO {
public void setDuration(Duration duration) { public void setDuration(Duration duration) {
this.duration = duration; this.duration = duration;
} }
public CompetitorDTO getWinner() { public SimpleCompetitorDTO getWinner() {
return winner; return winner;
} }
public void setWinner(CompetitorDTO winner) { public void setWinner(SimpleCompetitorDTO winner) {
this.winner = winner; this.winner = winner;
} }
public int getWindFixesCount() { public int getWindFixesCount() {