Fixes broken build and bug 2684

This commit is contained in:
Jan Broß committed 2015-05-16 17:06:18 +02:00
1 parent 5c052fb7a7
commit f9009fc0b3
4 files changed
+24 -15

No files matched your search

@@ -22,8 +22,6 @@ import com.google.gwt.user.client.ui.Panel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.view.client.SelectionChangeEvent;
import com.google.gwt.view.client.SelectionChangeEvent.Handler;
import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogRegisterCompetitorEvent;
import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogRegisterCompetitorEventImpl;
import com.sap.sailing.domain.common.dto.CompetitorDTO;
import com.sap.sailing.domain.common.dto.FleetDTO;
import com.sap.sailing.domain.common.dto.RaceColumnDTO;
@@ -37,8 +35,6 @@ import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.controls.SelectionCheckboxColumn;
import com.sap.sailing.gwt.ui.shared.EventDTO;
import com.sap.sailing.gwt.ui.shared.RaceLogSetStartTimeAndProcedureDTO;
import com.sap.sailing.gwt.ui.shared.RegattaLogDTO;
import com.sap.sailing.gwt.ui.shared.RegattaLogEventDTO;
import com.sap.sailing.gwt.ui.shared.StrippedLeaderboardDTO;
import com.sap.sse.common.Util;
import com.sap.sse.common.Util.Triple;
@@ -370,7 +366,7 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf
trackedRacesCaptionPanel.setVisible(true);
}
sailingService.getRegattaLog(((StrippedLeaderboardDTO) leaderboardSelectionModel.getSelectedSet().toArray()[0]).name, new RegattaLogCallBack());
sailingService.doesRegattaLogContainCompetitors(((StrippedLeaderboardDTO) leaderboardSelectionModel.getSelectedSet().toArray()[0]).name, new RegattaLogCallBack());
} else {
selectedLeaderBoardPanel.setVisible(false);
trackedRacesCaptionPanel.setVisible(false);
@@ -379,22 +375,15 @@ public class RaceLogTrackingEventManagementPanel extends AbstractLeaderboardConf
}
private class RegattaLogCallBack implements AsyncCallback<RegattaLogDTO>{
private class RegattaLogCallBack implements AsyncCallback<Boolean>{
@Override
public void onFailure(Throwable caught) {
regattaHasCompetitors = false;
}
@Override
public void onSuccess(RegattaLogDTO result) {
for (RegattaLogEventDTO event : result.getEntries()) {
if (event.getType().equals(RegattaLogRegisterCompetitorEvent.class.getSimpleName())
|| event.getType().equals(RegattaLogRegisterCompetitorEventImpl.class.getSimpleName())){
regattaHasCompetitors = true;
return;
}
}
regattaHasCompetitors = false;
public void onSuccess(Boolean result) {
regattaHasCompetitors = true;
}
}
@@ -610,4 +610,6 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
String emails, String localeInfoName) throws MailException;
ArrayList<LeaderboardGroupDTO> getLeaderboardGroupsByEventId(UUID id);
boolean doesRegattaLogContainCompetitors(String name) throws DoesNotHaveRegattaLogException;
}
@@ -714,4 +714,6 @@ public interface SailingServiceAsync extends BuildVersionRetriever, FileStorageM
String emails, String localeInfoName, AsyncCallback<Void> callback);
void getLeaderboardGroupsByEventId(UUID id, AsyncCallback<ArrayList<LeaderboardGroupDTO>> callback);
void doesRegattaLogContainCompetitors(String name, AsyncCallback<Boolean> regattaLogCallBack);
}
@@ -60,6 +60,7 @@ import org.osgi.util.tracker.ServiceTracker;
import com.sap.sailing.domain.abstractlog.AbstractLog;
import com.sap.sailing.domain.abstractlog.AbstractLogEvent;
import com.sap.sailing.domain.abstractlog.MultiLogAnalyzer;
import com.sap.sailing.domain.abstractlog.impl.AllEventsOfTypeFinder;
import com.sap.sailing.domain.abstractlog.race.FixedMarkPassingEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
@@ -82,6 +83,7 @@ import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogTr
import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;
import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent;
import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogCloseOpenEndedDeviceMappingEvent;
import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogRegisterCompetitorEvent;
import com.sap.sailing.domain.abstractlog.regatta.tracking.analyzing.impl.RegattaLogOpenEndedDeviceMappingCloser;
import com.sap.sailing.domain.abstractlog.shared.analyzing.DeviceCompetitorMappingFinder;
import com.sap.sailing.domain.abstractlog.shared.analyzing.DeviceMarkMappingFinder;
@@ -5631,4 +5633,18 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
}
return result;
}
@Override
public boolean doesRegattaLogContainCompetitors(String leaderboardName) throws DoesNotHaveRegattaLogException {
RegattaLog regattaLog = getRegattaLogInternal(leaderboardName);
List<RegattaLogEvent> markEvents = new AllEventsOfTypeFinder<>(regattaLog, /* only unrevoked */ true, RegattaLogRegisterCompetitorEvent.class)
.analyze();
if (markEvents.isEmpty()){
return false;
} else {
return true;
}
}
}