Merge branch 'gwt' into mak-raceboard

This commit is contained in:
Marcus Kammer committed 2012-01-23 13:53:05 +01:00
commit d01e714de8
1 file changed
+10 -5
@@ -20,6 +20,7 @@ import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.safehtml.client.SafeHtmlTemplates;
import com.google.gwt.safehtml.shared.SafeHtml;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
import com.google.gwt.user.cellview.client.CellTable;
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.cellview.client.ColumnSortEvent;
@@ -290,11 +291,15 @@ public class LeaderboardConfigPanel extends FormPanel implements EventDisplayer,
Column<RaceInLeaderboardDTO, SafeHtml> raceLinkColumn = new Column<RaceInLeaderboardDTO, SafeHtml>(raceAnchorCell) {
@Override
public SafeHtml getValue(RaceInLeaderboardDTO raceInLeaderboardDTO) {
EventNameAndRaceName raceIdentifier = (EventNameAndRaceName) raceInLeaderboardDTO.getRaceIdentifier();
String link = "/gwt/RaceBoard.html?leaderboardName="+ selectedLeaderboard.name +
"&raceName=" + raceIdentifier.getRaceName() +
"&eventName=" + raceIdentifier.getEventName();
return ANCHORTEMPLATE.cell(link, raceInLeaderboardDTO.getRaceColumnName());
if(raceInLeaderboardDTO.getRaceIdentifier() != null) {
EventNameAndRaceName raceIdentifier = (EventNameAndRaceName) raceInLeaderboardDTO.getRaceIdentifier();
String link = "/gwt/RaceBoard.html?leaderboardName="+ selectedLeaderboard.name +
"&raceName=" + raceIdentifier.getRaceName() +
"&eventName=" + raceIdentifier.getEventName();
return ANCHORTEMPLATE.cell(link, raceInLeaderboardDTO.getRaceColumnName());
} else {
return SafeHtmlUtils.fromString(raceInLeaderboardDTO.getRaceColumnName());
}
}
};