diff --git a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
index b0e93eef659..931c405bff9 100644
--- a/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
+++ b/java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
@@ -1,40 +1,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch b/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
index 7c55b6a1b87..ad65be7f6f2 100644
--- a/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
@@ -1,60 +1,60 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
index 81118d7d4af..097522e7994 100755
--- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
@@ -1,75 +1,75 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
index cedd1dcfc01..f47a394bbf0 100755
--- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
@@ -1,73 +1,73 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaActivity.java
index 850f49d680b..0eb19bac8e6 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/regatta/RegattaActivity.java
@@ -144,6 +144,9 @@ public class RegattaActivity extends AbstractActivity {
List maneuverDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_MANEUVER_DETAIL));
List raceDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_RACE_DETAIL));
List overallDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_OVERALL_DETAIL));
+ if (overallDetails.isEmpty()) {
+ overallDetails = Collections.singletonList(DetailType.REGATTA_RANK);
+ }
List legDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_LEG_DETAIL));
List namesOfRacesToShow = getStringListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_RACE_NAME));
boolean showAddedScores = parameterMap.containsKey(LeaderboardUrlSettings.PARAM_SHOW_ADDED_SCORES) ?
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesActivity.java
index d781e2cfa12..eeb3714d515 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesActivity.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/series/SeriesActivity.java
@@ -145,6 +145,9 @@ public class SeriesActivity extends AbstractActivity {
List maneuverDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_MANEUVER_DETAIL));
List raceDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_RACE_DETAIL));
List overallDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_OVERALL_DETAIL));
+ if (overallDetails.isEmpty()) {
+ overallDetails = Collections.singletonList(DetailType.REGATTA_RANK);
+ }
List legDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_LEG_DETAIL));
List namesOfRacesToShow = getStringListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_RACE_NAME));
boolean showAddedScores = parameterMap.containsKey(LeaderboardUrlSettings.PARAM_SHOW_ADDED_SCORES) ?
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
index 710e03455c4..35019d4437b 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
@@ -219,6 +219,9 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
List maneuverDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_MANEUVER_DETAIL));
List raceDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_RACE_DETAIL));
List overallDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_OVERALL_DETAIL));
+ if (overallDetails.isEmpty()) {
+ overallDetails = Collections.singletonList(DetailType.REGATTA_RANK);
+ }
List legDetails = getDetailTypeListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_LEG_DETAIL));
List namesOfRacesToShow = getStringListFromParamValue(parameterMap.get(LeaderboardUrlSettings.PARAM_RACE_NAME));
boolean showAddedScores = parameterMap.containsKey(LeaderboardUrlSettings.PARAM_SHOW_ADDED_SCORES) ?
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
index b2bac47247d..85d9e93c173 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
@@ -227,9 +227,7 @@ public class LeaderboardPanel extends SimplePanel implements TimeListener, PlayS
private boolean showAddedScores;
private boolean showCompetitorSailId;
- private int competitorSailIdColumnIndex = -1;
private boolean showCompetitorFullName;
- private int competitorFullNameColumnIndex = -1;
/**
* When true then an additional column just before the overall points is displayed that sums up
@@ -2498,7 +2496,7 @@ public class LeaderboardPanel extends SimplePanel implements TimeListener, PlayS
int columnIndex = 0;
columnIndex = ensureSelectionCheckboxColumn(columnIndex);
columnIndex = ensureRankColumn(columnIndex);
- columnIndex = ensureSailIDAndCompetitorColumn(columnIndex);
+ columnIndex = ensureSailIDAndCompetitorColumn();
columnIndex = updateCarryColumn(leaderboard, columnIndex);
adjustOverallDetailColumns(leaderboard, columnIndex);
// first remove race columns no longer needed:
@@ -2820,50 +2818,42 @@ public class LeaderboardPanel extends SimplePanel implements TimeListener, PlayS
* method will always make sure that two columns are placed in the layout, one at
* sailIdColumnIndex and one at sailIdColumnIndex+1.
*/
- private int ensureSailIDAndCompetitorColumn(int sailIdColumnIndex) {
- final int nextColumnIndex;
- int columnCounter = 0;
- int leaderboardColumnCount = getLeaderboardTable().getColumnCount();
- if (isShowCompetitorSailId()) {
- if (competitorSailIdColumnIndex == -1) {
- competitorSailIdColumnIndex = sailIdColumnIndex;
- if (leaderboardColumnCount > 1) {
- insertColumn(competitorSailIdColumnIndex, new SailIDColumn(new CompetitorFetcher() {
- @Override
- public CompetitorDTO getCompetitor(LeaderboardRowDTO t) {
- return t.competitor;
- }
- }));
- } else {
- addColumn(new SailIDColumn(new CompetitorFetcher() {
- @Override
- public CompetitorDTO getCompetitor(LeaderboardRowDTO t) {
- return t.competitor;
- }
- }));
+ private int ensureSailIDAndCompetitorColumn() {
+ SailIDColumn sailIdColumn = new SailIDColumn(new CompetitorFetcher() {
+ @Override
+ public CompetitorDTO getCompetitor(LeaderboardRowDTO t) {
+ return t.competitor;
+ }
+ });
+ if (getLeaderboardTable().getColumnCount() >= 3) { // table already filled with columns
+ if (isShowCompetitorSailId()) {
+ if (!(getLeaderboardTable().getColumn(2) instanceof SailIDColumn)) {
+ insertColumn(2, sailIdColumn);
+ }
+ } else {
+ if (getLeaderboardTable().getColumn(2) instanceof SailIDColumn) {
+ removeColumn(2);
}
}
- columnCounter++;
- } else if (!isShowCompetitorSailId() && competitorSailIdColumnIndex != -1) {
- removeColumn(competitorSailIdColumnIndex);
- competitorSailIdColumnIndex = -1;
- }
- if (isShowCompetitorFullName()) {
- if (competitorFullNameColumnIndex == -1) {
- if (leaderboardColumnCount > 1) {
- insertColumn(sailIdColumnIndex+columnCounter, createCompetitorColumn());
- } else {
- addColumn(createCompetitorColumn());
+ final int competitorFullNameColumnIndex = 2 + (isShowCompetitorSailId() ? 1 : 0);
+ if (isShowCompetitorFullName()) {
+ if (!(getLeaderboardTable().getColumn(competitorFullNameColumnIndex) instanceof CompetitorColumn)) {
+ insertColumn(competitorFullNameColumnIndex, createCompetitorColumn());
+ }
+ } else {
+ if (getLeaderboardTable().getColumn(competitorFullNameColumnIndex) instanceof CompetitorColumn) {
+ removeColumn(competitorFullNameColumnIndex);
}
- competitorFullNameColumnIndex = sailIdColumnIndex+columnCounter;
}
- columnCounter++;
- } else if (!isShowCompetitorFullName() && competitorFullNameColumnIndex != -1) {
- removeColumn(competitorFullNameColumnIndex);
- competitorFullNameColumnIndex = -1;
+ } else { // table just being initialized
+ if (isShowCompetitorSailId()) {
+ addColumn(sailIdColumn);
+ }
+ if (isShowCompetitorFullName()) {
+ addColumn(createCompetitorColumn());
+ }
}
- nextColumnIndex = sailIdColumnIndex + columnCounter;
- return nextColumnIndex;
+ return (isShowRegattaRankColumn() ? 1 : 0) + (isShowCompetitorSailId() ? 1 : 0) + (isShowCompetitorFullName() ? 1 : 0);
}
protected CompetitorColumn createCompetitorColumn() {
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
index 4d4cb9afe18..bc1f6674e4a 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/com.sap.sse.security.ui/Security UI sdm.launch b/java/com.sap.sse.security.ui/Security UI sdm.launch
index dede2cd8d60..7fd34ef3dd9 100755
--- a/java/com.sap.sse.security.ui/Security UI sdm.launch
+++ b/java/com.sap.sse.security.ui/Security UI sdm.launch
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+