eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-16 17:21:00 +00:00
Code Activity

Revert "Show message when selection of a trackedrace is changed that is already linked to a leaderboard."

Browse Source 
This reverts commit 126b53235f.
This commit is contained in:
Leon Radeck committed 2017-06-01 14:15:17 +02:00
1 parent 126b53235f
commit 1b35da5caa
3 files changed
+5 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardConfigPanel.java
+5 -34
View File
@@ -33,7 +33,6 @@ import com.sap.sailing.domain.common.dto.FleetDTO;
import com.sap.sailing.domain.common.dto.NamedDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
import com.sap.sailing.domain.common.dto.RaceDTO;
import com.sap.sailing.gwt.ui.adminconsole.AbstractLeaderboardConfigPanel.RaceColumnDTOAndFleetDTOWithNameBasedEquality;
import com.sap.sailing.gwt.ui.adminconsole.RaceColumnInLeaderboardDialog.RaceColumnDescriptor;
import com.sap.sailing.gwt.ui.client.LeaderboardsDisplayer;
import com.sap.sailing.gwt.ui.client.LeaderboardsRefresher;
@@ -236,48 +235,20 @@ public abstract class AbstractLeaderboardConfigPanel extends FormPanel implement
// if no leaderboard column is selected, ignore the race selection change
RaceColumnDTOAndFleetDTOWithNameBasedEquality selectedRaceColumnAndFleetName = getSelectedRaceColumnWithFleet();
if (selectedRaceColumnAndFleetName != null) {
RaceDTO oldRace = selectedRaceColumnAndFleetName.getA().getRace(selectedRaceColumnAndFleetName.getB());
if (selectedRaces.isEmpty()) {
if (isRaceColumnAlreadyLinkedToAnotherTrackedRace(selectedRaceColumnAndFleetName)) {
if (selectedRaceColumnAndFleetName.getA()
.getRaceIdentifier(selectedRaceColumnAndFleetName.getB()) != null) {
unlinkRaceColumnFromTrackedRace(selectedRaceColumnAndFleetName.getA().getRaceColumnName(),
selectedRaceColumnAndFleetName.getB());
}
} else {
if(isRaceColumnAlreadyLinkedToAnotherTrackedRace(selectedRaceColumnAndFleetName)){
if(Window.confirm("Do you really want to change the link?")){
linkTrackedRaceToSelectedRaceColumn(selectedRaceColumnAndFleetName.getA(),
selectedRaceColumnAndFleetName.getB(),
selectedRaces.iterator().next().getRaceIdentifier());
}
else{
trackedRacesListComposite.removeTrackedRaceChangeListener(AbstractLeaderboardConfigPanel.this);
refreshableTrackedRaceSelectionModel.setSelected(selectedRaceColumnAndFleetName.getA().getRace(selectedRaceColumnAndFleetName.getB()),true);
trackedRacesListComposite.addTrackedRaceChangeListener(AbstractLeaderboardConfigPanel.this);
}
}
else{
linkTrackedRaceToSelectedRaceColumn(selectedRaceColumnAndFleetName.getA(),
selectedRaceColumnAndFleetName.getB(),
selectedRaces.iterator().next().getRaceIdentifier());
}
linkTrackedRaceToSelectedRaceColumn(selectedRaceColumnAndFleetName.getA(),
selectedRaceColumnAndFleetName.getB(),
selectedRaces.iterator().next().getRaceIdentifier());
}
}
}
private boolean isRaceColumnAlreadyLinkedToAnotherTrackedRace(
RaceColumnDTOAndFleetDTOWithNameBasedEquality selectedRaceColumnAndFleetName) {
if(selectedRaceColumnAndFleetName.getA()
.getRaceIdentifier(selectedRaceColumnAndFleetName.getB()) != null)
{
return true;
}
return false;
}
};
trackedRaceListHandlerRegistration = refreshableTrackedRaceSelectionModel.addSelectionChangeHandler(trackedRaceListHandler);
Button reloadAllRaceLogs = new Button(stringMessages.reloadAllRaceLogs());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
-29
View File
@@ -29,7 +29,6 @@ import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.CellPreviewEvent;
import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.view.client.SelectionChangeEvent;
import com.google.gwt.view.client.SelectionChangeEvent.Handler;
@@ -59,10 +58,6 @@ import com.sap.sse.gwt.client.shared.components.Component;
import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent;
import com.sap.sse.gwt.client.shared.perspective.ComponentContext;
/**
* @author D069485
*
*/
public abstract class AbstractTrackedRacesListComposite extends AbstractCompositeComponent<TrackedRacesSettings> implements
RegattasDisplayer {
@@ -81,8 +76,6 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit
private Iterable<RaceDTO> allRaces;
private Label noTrackedRacesLabel;
private RaceDTO oldSelectedRace;
protected final SailingServiceAsync sailingService;
protected final ErrorReporter errorReporter;
@@ -134,7 +127,6 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit
}
protected void createUI() {
AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class);
raceList = new ListDataProvider<>();
settings = new TrackedRacesSettings();
@@ -249,16 +241,6 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit
}
});
trackedRacesButtonPanel.add(btnRefresh);
raceTable.addCellPreviewHandler(new CellPreviewEvent.Handler<RaceDTO>(){
@Override
public void onCellPreview(CellPreviewEvent<RaceDTO> event){
if ("click".equals(event.getNativeEvent().getType())) {
oldSelectedRace = getSelectionModel().getSelectedSet().iterator().next();
}
}
});
addControlButtons(trackedRacesButtonPanel);
}
@@ -500,7 +482,6 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit
public void addRaceSelectionChangeHandler(Handler handler) {
refreshableSelectionModel.addSelectionChangeHandler(handler);
}
public RaceDTO getRaceByIdentifier(RaceIdentifier raceIdentifier) {
RaceDTO result = null;
@@ -607,14 +588,4 @@ public abstract class AbstractTrackedRacesListComposite extends AbstractComposit
return refreshableSelectionModel;
}
public RaceDTO getOldSelectedRace() {
return oldSelectedRace;
}
public void setOldSelectedRace(RaceDTO oldSelectedRace) {
this.oldSelectedRace = oldSelectedRace;
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
-8
View File
@@ -31,7 +31,6 @@ import com.sap.sse.gwt.client.shared.perspective.ComponentContext;
*/
public class TrackedRacesListComposite extends AbstractTrackedRacesListComposite {
final Set<TrackedRaceChangedListener> raceIsTrackedRaceChangeListener;
private Button btnUntrack;
private Button btnRemoveRace;
private Button btnSetDelayToLive;
@@ -46,7 +45,6 @@ public class TrackedRacesListComposite extends AbstractTrackedRacesListComposite
super(parent, context, sailingService, errorReporter, regattaRefresher, stringMessages, hasMultiSelection);
this.raceIsTrackedRaceChangeListener = new HashSet<TrackedRaceChangedListener>();
this.actionButtonsEnabled = actionButtonsEnabled;
createUI();
}
@@ -61,12 +59,6 @@ public class TrackedRacesListComposite extends AbstractTrackedRacesListComposite
public void addTrackedRaceChangeListener(TrackedRaceChangedListener listener) {
this.raceIsTrackedRaceChangeListener.add(listener);
}
public void removeTrackedRaceChangeListener(TrackedRaceChangedListener listener){
this.raceIsTrackedRaceChangeListener.remove(listener);
}
void stopTrackingRaces(final Iterable<RaceDTO> races) {
final List<RegattaAndRaceIdentifier> racesToStopTracking = new ArrayList<RegattaAndRaceIdentifier>();