mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-17 11:19:15 +00:00
changed RegattaStructureDTO class
This commit is contained in:
Axel Müller
@@ -39,7 +39,6 @@ bin.includes = META-INF/,\
|
||||
com.sap.sailing.gwt.ui.VideoPopup/,\
|
||||
VideoPopup.html,\
|
||||
VideoPopup.css,\
|
||||
com.sap.sailing.gwt.ui.YoutubePopup/,\
|
||||
YoutubePopup.html,\
|
||||
TvView.html,\
|
||||
com.sap.sailing.gwt.ui.TvView/,\
|
||||
|
||||
-1
@@ -9,7 +9,6 @@ import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
|
||||
import com.google.gwt.user.cellview.client.TextColumn;
|
||||
import com.google.gwt.view.client.ListDataProvider;
|
||||
import com.google.gwt.view.client.SelectionChangeEvent;
|
||||
import com.google.gwt.view.client.SelectionModel;
|
||||
import com.sap.sailing.domain.common.RegattaIdentifier;
|
||||
import com.sap.sailing.domain.common.impl.NaturalComparator;
|
||||
import com.sap.sailing.gwt.ui.client.ErrorReporter;
|
||||
|
||||
+2
-5
@@ -4,11 +4,8 @@ import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import buildstructure.BuildStructure;
|
||||
|
||||
import com.github.gwtbootstrap.client.ui.base.ProgressBarBase.Style;
|
||||
import com.google.gwt.dom.client.Style.Unit;
|
||||
import com.google.gwt.event.dom.client.ClickEvent;
|
||||
@@ -33,7 +30,6 @@ import com.sap.sailing.gwt.ui.client.StringMessages;
|
||||
import com.sap.sailing.gwt.ui.shared.EventDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RegattaDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RegattaStructureDTO;
|
||||
import com.sap.sailing.xrr.structureimport.RegattaStructureKey;
|
||||
import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback;
|
||||
|
||||
public class StructureImportManagementPanel extends FlowPanel {
|
||||
@@ -241,7 +237,8 @@ public class StructureImportManagementPanel extends FlowPanel {
|
||||
@Override
|
||||
public void onSuccess(Set<RegattaStructureDTO> result) {
|
||||
// TODO UI aufbauen
|
||||
createRegattas(regattaNames, new EventDTO("MyEvent"), newRegatta); //EventDTO??
|
||||
EventDTO eventDTO = new EventDTO("Test");
|
||||
createRegattas(regattaNames, eventDTO, newRegatta); //EventDTO??
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
+7
-7
@@ -3771,14 +3771,14 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
|
||||
@Override
|
||||
public Set<RegattaStructureDTO> getRegattaStructure(final List<String> regattaNames) {
|
||||
structureImporter.updateRegattasToSelected(regattaNames);
|
||||
Map<RegattaStructureKey, Set<BuildStructure>> regattaStructures = structureImporter.getRegattaStructures(regattaNames);
|
||||
Set<RegattaStructureKey> regattaStructureKeys = regattaStructures.keySet();
|
||||
// structureImporter.updateRegattasToSelected(regattaNames);
|
||||
// Map<RegattaStructureKey, Set<BuildStructure>> regattaStructures = structureImporter.getRegattaStructures(regattaNames);
|
||||
// Set<RegattaStructureKey> regattaStructureKeys = regattaStructures.keySet();
|
||||
Set<RegattaStructureDTO> regattaStructureDTOs = new HashSet<RegattaStructureDTO>();
|
||||
for(RegattaStructureKey regattaStructureKey: regattaStructureKeys){
|
||||
RegattaStructureDTO regattaStructureDTO = new RegattaStructureDTO(regattaStructureKey, regattaStructures.get(regattaStructureKey));
|
||||
regattaStructureDTOs.add(regattaStructureDTO);
|
||||
}
|
||||
// for(RegattaStructureKey regattaStructureKey: regattaStructureKeys){
|
||||
// RegattaStructureDTO regattaStructureDTO = new RegattaStructureDTO(regattaStructureKey, regattaStructures.get(regattaStructureKey));
|
||||
// regattaStructureDTOs.add(regattaStructureDTO);
|
||||
// }
|
||||
return regattaStructureDTOs;
|
||||
}
|
||||
|
||||
|
||||
+31
-31
@@ -8,44 +8,44 @@ import com.sap.sailing.xrr.structureimport.RegattaStructureKey;
|
||||
import com.sap.sailing.xrr.structureimport.SeriesParameters;
|
||||
|
||||
public class RegattaStructureDTO {
|
||||
private final RegattaStructureKey regattaStructure;
|
||||
// private final RegattaStructureKey regattaStructure;
|
||||
private SeriesDTO defaultSeries;
|
||||
private final Set<BuildStructure> linkedBuildStructures;
|
||||
// private final Set<BuildStructure> linkedBuildStructures;
|
||||
|
||||
public RegattaStructureDTO(RegattaStructureKey regattaStructure, Set<BuildStructure> linkedBuildStructures) {
|
||||
this.regattaStructure = regattaStructure;
|
||||
this.linkedBuildStructures = linkedBuildStructures;
|
||||
public RegattaStructureDTO(/*RegattaStructureKey regattaStructure, Set<BuildStructure> linkedBuildStructures*/) {
|
||||
// this.regattaStructure = regattaStructure;
|
||||
// this.linkedBuildStructures = linkedBuildStructures;
|
||||
defaultSeries = new SeriesDTO("Default", null, null, false, null, false, false, false);
|
||||
}
|
||||
|
||||
public String getRegattaStructureAsString() {
|
||||
String regattaStructureString = "";
|
||||
// public String getRegattaStructureAsString() {
|
||||
// String regattaStructureString = "";
|
||||
//
|
||||
// for (String s : regattaStructure.getRegattaStructureKey()) {
|
||||
// regattaStructureString = regattaStructureString.concat("," + s);
|
||||
// }
|
||||
// return regattaStructureString.substring(1);
|
||||
// }
|
||||
|
||||
for (String s : regattaStructure.getRegattaStructureKey()) {
|
||||
regattaStructureString = regattaStructureString.concat("," + s);
|
||||
}
|
||||
return regattaStructureString.substring(1);
|
||||
}
|
||||
// public void setDefaultSeries(RegattaDTO defaultRegatta) {
|
||||
// SeriesParameters defaultSeries = new SeriesParameters(false, false, false, null);
|
||||
// if (defaultRegatta.series.size() > 0) { // null abfangen
|
||||
// SeriesDTO series = defaultRegatta.series.get(0);
|
||||
// defaultSeries
|
||||
// .setFirstColumnIsNonDiscardableCarryForward(series.isFirstColumnIsNonDiscardableCarryForward());
|
||||
// defaultSeries.setHasSplitFleetContiguousScoring(series.hasSplitFleetContiguousScoring());
|
||||
// defaultSeries.setStartswithZeroScore(series.isStartsWithZeroScore());
|
||||
// defaultSeries.setDiscardingThresholds(series.getDiscardThresholds());
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public SeriesDTO getDefaultSeries() {
|
||||
// return defaultSeries;
|
||||
// }
|
||||
|
||||
public void setDefaultSeries(RegattaDTO defaultRegatta) {
|
||||
SeriesParameters defaultSeries = new SeriesParameters(false, false, false, null);
|
||||
if (defaultRegatta.series.size() > 0) { // null abfangen
|
||||
SeriesDTO series = defaultRegatta.series.get(0);
|
||||
defaultSeries
|
||||
.setFirstColumnIsNonDiscardableCarryForward(series.isFirstColumnIsNonDiscardableCarryForward());
|
||||
defaultSeries.setHasSplitFleetContiguousScoring(series.hasSplitFleetContiguousScoring());
|
||||
defaultSeries.setStartswithZeroScore(series.isStartsWithZeroScore());
|
||||
defaultSeries.setDiscardingThresholds(series.getDiscardThresholds());
|
||||
}
|
||||
}
|
||||
|
||||
public SeriesDTO getDefaultSeries() {
|
||||
return defaultSeries;
|
||||
}
|
||||
|
||||
public Set<BuildStructure> getLinkedBuildStructures() {
|
||||
return linkedBuildStructures;
|
||||
}
|
||||
// public Set<BuildStructure> getLinkedBuildStructures() {
|
||||
// return linkedBuildStructures;
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
source.. = src/
|
||||
source.. = src/,\
|
||||
Resources/
|
||||
output.. = bin/
|
||||
bin.includes = META-INF/,\
|
||||
.
|
||||
|
||||
+5
-3
@@ -1,15 +1,17 @@
|
||||
package com.sap.sailing.xrr.structureimport;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class RegattaStructureKey {
|
||||
|
||||
/*RegattaStructureKey which consists of series and fleet names*/
|
||||
private final Iterable<String> regattaStructureKey;
|
||||
private final Map<String, String> regattaStructureKey;
|
||||
|
||||
public RegattaStructureKey(Iterable<String> regattaStructureKey) {
|
||||
public RegattaStructureKey(Map<String, String> regattaStructureKey) {
|
||||
this.regattaStructureKey = regattaStructureKey;
|
||||
}
|
||||
|
||||
public Iterable<String> getRegattaStructureKey() {
|
||||
public Map<String, String> getRegattaStructureKey() {
|
||||
return regattaStructureKey;
|
||||
}
|
||||
|
||||
|
||||
+41
-36
@@ -1,43 +1,48 @@
|
||||
package com.sap.sailing.xrr.structureimport;
|
||||
|
||||
public class SeriesParameters {
|
||||
private boolean firstColumnIsNonDiscardableCarryForward = false;
|
||||
private boolean firstColumnIsNonDiscardableCarryForward = false;
|
||||
private boolean hasSplitFleetContiguousScoring = false;
|
||||
private boolean startswithZeroScore = false;
|
||||
private int[] discardingThresholds = null;
|
||||
|
||||
public SeriesParameters(boolean firstColumnIsNonDiscardableCarryForward,
|
||||
boolean hasSplitFleetContiguousScoring,
|
||||
boolean startswithZeroScore, int[] discardingThresholds) {
|
||||
this.firstColumnIsNonDiscardableCarryForward = firstColumnIsNonDiscardableCarryForward;
|
||||
this.hasSplitFleetContiguousScoring = hasSplitFleetContiguousScoring;
|
||||
this.startswithZeroScore = startswithZeroScore;
|
||||
this.discardingThresholds = discardingThresholds;
|
||||
}
|
||||
public boolean isFirstColumnIsNonDiscardableCarryForward() {
|
||||
return firstColumnIsNonDiscardableCarryForward;
|
||||
}
|
||||
public void setFirstColumnIsNonDiscardableCarryForward(
|
||||
boolean firstColumnIsNonDiscardableCarryForward) {
|
||||
this.firstColumnIsNonDiscardableCarryForward = firstColumnIsNonDiscardableCarryForward;
|
||||
}
|
||||
public boolean isHasSplitFleetContiguousScoring() {
|
||||
return hasSplitFleetContiguousScoring;
|
||||
}
|
||||
public void setHasSplitFleetContiguousScoring(
|
||||
boolean hasSplitFleetContiguousScoring) {
|
||||
this.hasSplitFleetContiguousScoring = hasSplitFleetContiguousScoring;
|
||||
}
|
||||
public boolean isStartswithZeroScore() {
|
||||
return startswithZeroScore;
|
||||
}
|
||||
public void setStartswithZeroScore(boolean startswithZeroScore) {
|
||||
this.startswithZeroScore = startswithZeroScore;
|
||||
}
|
||||
public int[] getDiscardingThresholds() {
|
||||
return discardingThresholds;
|
||||
}
|
||||
public void setDiscardingThresholds(int[] discardingThresholds) {
|
||||
this.discardingThresholds = discardingThresholds;
|
||||
}
|
||||
|
||||
public SeriesParameters(boolean firstColumnIsNonDiscardableCarryForward, boolean hasSplitFleetContiguousScoring,
|
||||
boolean startswithZeroScore, int[] discardingThresholds) {
|
||||
this.firstColumnIsNonDiscardableCarryForward = firstColumnIsNonDiscardableCarryForward;
|
||||
this.hasSplitFleetContiguousScoring = hasSplitFleetContiguousScoring;
|
||||
this.startswithZeroScore = startswithZeroScore;
|
||||
this.discardingThresholds = discardingThresholds;
|
||||
}
|
||||
|
||||
public boolean isFirstColumnIsNonDiscardableCarryForward() {
|
||||
return firstColumnIsNonDiscardableCarryForward;
|
||||
}
|
||||
|
||||
public void setFirstColumnIsNonDiscardableCarryForward(boolean firstColumnIsNonDiscardableCarryForward) {
|
||||
this.firstColumnIsNonDiscardableCarryForward = firstColumnIsNonDiscardableCarryForward;
|
||||
}
|
||||
|
||||
public boolean isHasSplitFleetContiguousScoring() {
|
||||
return hasSplitFleetContiguousScoring;
|
||||
}
|
||||
|
||||
public void setHasSplitFleetContiguousScoring(boolean hasSplitFleetContiguousScoring) {
|
||||
this.hasSplitFleetContiguousScoring = hasSplitFleetContiguousScoring;
|
||||
}
|
||||
|
||||
public boolean isStartswithZeroScore() {
|
||||
return startswithZeroScore;
|
||||
}
|
||||
|
||||
public void setStartswithZeroScore(boolean startswithZeroScore) {
|
||||
this.startswithZeroScore = startswithZeroScore;
|
||||
}
|
||||
|
||||
public int[] getDiscardingThresholds() {
|
||||
return discardingThresholds;
|
||||
}
|
||||
|
||||
public void setDiscardingThresholds(int[] discardingThresholds) {
|
||||
this.discardingThresholds = discardingThresholds;
|
||||
}
|
||||
}
|
||||
|
||||
+24
-23
@@ -7,6 +7,7 @@ import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
@@ -56,7 +57,7 @@ public class StructureImporter {
|
||||
private ArrayList<RegattaResults> results = new ArrayList<RegattaResults>();
|
||||
private ArrayList<RegattaJSON> regattas;
|
||||
private ArrayList<RegattaJSON> selectedRegattas = new ArrayList<RegattaJSON>();;
|
||||
private Map<RegattaStructureKey, Set<BuildStructure>> seriesStructuresWithFrequency = new LinkedHashMap<RegattaStructureKey, Set<BuildStructure>>(); // TODO
|
||||
private Map<RegattaStructureKey, Set<BuildStructure>> seriesStructuresWithFrequency = new HashMap<RegattaStructureKey, Set<BuildStructure>>(); // TODO
|
||||
// rename
|
||||
private List<BuildStructure> buildStructures = new ArrayList<BuildStructure>();
|
||||
private LinkedHashMap<String, Boat> boatForPerson;
|
||||
@@ -128,7 +129,7 @@ public class StructureImporter {
|
||||
}
|
||||
|
||||
BuildStructure structure = new BuildStructure(races, selectedRegattas.get(zaehler).getName());
|
||||
analyseStructure(structure);
|
||||
// analyseStructure(structure);
|
||||
buildStructures.add(structure);
|
||||
zaehler++;
|
||||
}
|
||||
@@ -136,27 +137,27 @@ public class StructureImporter {
|
||||
return seriesStructuresWithFrequency;
|
||||
}
|
||||
|
||||
public void analyseStructure(BuildStructure structure) {
|
||||
Set<String> seriesAndFleets = new HashSet<String>();
|
||||
for (Series series : structure.getRegattaStructure().getSeries()) {
|
||||
seriesAndFleets.add(series.getSeries());
|
||||
for (Fleet fleet : series.getFleets()) {
|
||||
seriesAndFleets.add(fleet.getColor());
|
||||
}
|
||||
}
|
||||
RegattaStructureKey regattaStructureKey = new RegattaStructureKey(seriesAndFleets);
|
||||
|
||||
if (!seriesAndFleets.isEmpty()) {
|
||||
if (seriesStructuresWithFrequency.containsKey(regattaStructureKey)) {
|
||||
seriesStructuresWithFrequency.get(regattaStructureKey).add(structure);
|
||||
} else {
|
||||
Set<BuildStructure> buildStructures = new HashSet<BuildStructure>();
|
||||
buildStructures.add(structure);
|
||||
seriesStructuresWithFrequency.put(regattaStructureKey, buildStructures);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
// public void analyseStructure(BuildStructure structure) {
|
||||
// Map<String,String> seriesAndFleets = new HashMap<String,String>();
|
||||
// for (Series series : structure.getRegattaStructure().getSeries()) {
|
||||
// seriesAndFleets.add(series.getSeries());
|
||||
// for (Fleet fleet : series.getFleets()) {
|
||||
// seriesAndFleets.add(fleet.getColor());
|
||||
// }
|
||||
// }
|
||||
// RegattaStructureKey regattaStructureKey = new RegattaStructureKey(seriesAndFleets);
|
||||
//
|
||||
// if (!seriesAndFleets.isEmpty()) {
|
||||
// if (seriesStructuresWithFrequency.containsKey(regattaStructureKey)) {
|
||||
// seriesStructuresWithFrequency.get(regattaStructureKey).add(structure);
|
||||
// } else {
|
||||
// Set<BuildStructure> buildStructures = new HashSet<BuildStructure>();
|
||||
// buildStructures.add(structure);
|
||||
// seriesStructuresWithFrequency.put(regattaStructureKey, buildStructures);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// }
|
||||
|
||||
public Iterable<AddSpecificRegatta> getRegattas(ScoringSchemeType scoringScheme, boolean isPersistent,
|
||||
UUID courseArea, boolean useStartTimeInference, DomainFactory baseDomainFactory,
|
||||
|
||||
Reference in New Issue
Block a user