eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 03:13:49 +00:00
Code Activity

removed the use of the ess40... rendering method, causing an "unused" warning; preparing for a cleaner solution; see bug 1089

Browse Source
This commit is contained in:
Axel Uhl committed 2012-12-04 21:01:14 +01:00
1 parent b5bd75fd75
commit a245cec5bb
2 files changed
+9 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/Spectator.css
+4 -4
View File
@@ -221,7 +221,7 @@ input.magnifier {
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background: url("images/btn-cta-orangeleft.png") repeat-x -10px 0 #e7e7e7;
background: url("images/btn-cta-blueleft.png") repeat-x -10px 0 #e7e7e7;
text-decoration: none;
color: #fff;
/*border: 1px solid #a6a6a6;*/
@@ -236,7 +236,7 @@ input.magnifier {
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background: url("images/btn-cta-blue.png") repeat-x -10px 0 #e7e7e7;
background: url("images/btn-cta-greenleft.png") repeat-x -10px 0 #e7e7e7;
text-decoration: none;
color: #fff;
/*border: 1px solid #a6a6a6;*/
@@ -263,7 +263,7 @@ input.magnifier {
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
background: url("images/btn-cta-orangeleft.png") repeat-x 0px 0 #e7e7e7;
background: url("images/btn-cta-blueleft.png") repeat-x 0px 0 #e7e7e7;
text-decoration: none;
color: #fff;
font-family: 'UbuntuBold', Arial, Verdana, sans-serif;
@@ -284,7 +284,7 @@ input.magnifier {
.leaderboardGroupPanel-LiveRace:hover {
text-decoration: none;
color: #fff;
background: url("images/btn-cta-blue.png") repeat-x -10px -30px #e7e7e7;
background: url("images/btn-cta-greenleft.png") repeat-x -10px -30px #e7e7e7;
/*border: 1px solid #f1af10;*/
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java
+5 -17
View File
@@ -87,8 +87,6 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
private static final String STYLE_COLORBOX = STYLE_NAME_PREFIX + "ColorBox";
private static final String STYLE_BOATCLASS = STYLE_NAME_PREFIX + "BoatClass";
private enum RaceRenderingStrategy { DEFAULT, ESS40 };
private final SailingServiceAsync sailingService;
private final StringMessages stringMessages;
private final ErrorReporter errorReporter;
@@ -103,8 +101,6 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
private final boolean isEmbedded;
private final boolean showRaceDetails;
private RaceRenderingStrategy raceRenderingStrategy = RaceRenderingStrategy.DEFAULT;
public LeaderboardGroupPanel(SailingServiceAsync sailingService, StringMessages stringConstants,
ErrorReporter errorReporter, final String groupName, String root, String viewMode, boolean embedded, boolean showRaceDetails) {
super();
@@ -170,10 +166,6 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
}
private void createdPageContent() {
if(leaderboardGroup.name.equals("Extreme Sailing Series")) {
raceRenderingStrategy = RaceRenderingStrategy.ESS40;
}
if (!isEmbedded) {
Label groupNameLabel = new Label(leaderboardGroup.name + ":");
groupNameLabel.setStyleName(STYLE_NAME_PREFIX + "GroupName");
@@ -245,12 +237,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
racesCell) {
@Override
public SafeHtml getValue(StrippedLeaderboardDTO leaderboard) {
switch(raceRenderingStrategy) {
case DEFAULT: return leaderboardRacesToHtml(leaderboard);
case ESS40: return ess40LeaderboardRacesToHtml(leaderboard);
}
return null;
return leaderboardRacesToHtml(leaderboard);
}
};
leaderboardsTable.addColumn(racesColumn, stringMessages.races());
@@ -263,7 +250,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
mainPanel.add(leaderboardsTable);
// legend
if(!isEmbedded) {
if (!isEmbedded) {
HorizontalPanel legendPanel = new HorizontalPanel();
legendPanel.setStyleName(STYLE_LEGEND);
legendPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE);
@@ -315,6 +302,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
return b.toSafeHtml();
}
// TODO Bug 1089: this method is in preparation of a solution to bug 1089
private SafeHtml ess40LeaderboardRacesToHtml(StrippedLeaderboardDTO leaderboard) {
SafeHtmlBuilder b = new SafeHtmlBuilder();
if (!leaderboard.isRegattaLeaderboard) {
@@ -346,7 +334,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
}
}
if(!racesWithUnknownDate.isEmpty()) {
if (!racesWithUnknownDate.isEmpty()) {
if(lastRacesPerDayList == null) {
// all races have an unknown date
orderedRacesByDay.put("unknown", racesWithUnknownDate);
@@ -441,7 +429,7 @@ public class LeaderboardGroupPanel extends FormPanel implements HasWelcomeWidget
if (viewMode != null && !viewMode.isEmpty()) {
link += "&viewMode=" + viewMode;
}
if(isLive) {
if (isLive) {
b.append(getAnchor(link, raceColumnName, STYLE_LIVE_RACE));
} else if (race.trackedRace.hasGPSData && race.trackedRace.hasWindData) {
b.append(getAnchor(link, raceColumnName, STYLE_ACTIVE_RACE));