diff --git a/java/com.sap.sailing.gwt.ui/build.properties b/java/com.sap.sailing.gwt.ui/build.properties index 6e4fd18d28b..0ce59228a1e 100755 --- a/java/com.sap.sailing.gwt.ui/build.properties +++ b/java/com.sap.sailing.gwt.ui/build.properties @@ -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/,\ diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportListComposite.java index bc75739f3d7..1e901a89e2f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportListComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportListComposite.java @@ -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; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportManagementPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportManagementPanel.java index 3f7cce8aad9..43eb78cbd03 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportManagementPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/StructureImportManagementPanel.java @@ -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 result) { // TODO UI aufbauen - createRegattas(regattaNames, new EventDTO("MyEvent"), newRegatta); //EventDTO?? + EventDTO eventDTO = new EventDTO("Test"); + createRegattas(regattaNames, eventDTO, newRegatta); //EventDTO?? } }); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 14efcdfd957..90ed8ed812d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -3771,14 +3771,14 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S @Override public Set getRegattaStructure(final List regattaNames) { - structureImporter.updateRegattasToSelected(regattaNames); - Map> regattaStructures = structureImporter.getRegattaStructures(regattaNames); - Set regattaStructureKeys = regattaStructures.keySet(); +// structureImporter.updateRegattasToSelected(regattaNames); +// Map> regattaStructures = structureImporter.getRegattaStructures(regattaNames); +// Set regattaStructureKeys = regattaStructures.keySet(); Set regattaStructureDTOs = new HashSet(); - 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; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaStructureDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaStructureDTO.java index 903b76cbc3b..a09d6c53166 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaStructureDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaStructureDTO.java @@ -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 linkedBuildStructures; +// private final Set linkedBuildStructures; - public RegattaStructureDTO(RegattaStructureKey regattaStructure, Set linkedBuildStructures) { - this.regattaStructure = regattaStructure; - this.linkedBuildStructures = linkedBuildStructures; + public RegattaStructureDTO(/*RegattaStructureKey regattaStructure, Set 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 getLinkedBuildStructures() { - return linkedBuildStructures; - } +// public Set getLinkedBuildStructures() { +// return linkedBuildStructures; +// } diff --git a/java/com.sap.sailing.xrr.schema/build.properties b/java/com.sap.sailing.xrr.schema/build.properties index 34d2e4d2dad..3fafbc8eb2b 100755 --- a/java/com.sap.sailing.xrr.schema/build.properties +++ b/java/com.sap.sailing.xrr.schema/build.properties @@ -1,4 +1,5 @@ -source.. = src/ +source.. = src/,\ + Resources/ output.. = bin/ bin.includes = META-INF/,\ . diff --git a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/RegattaStructureKey.java b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/RegattaStructureKey.java index d6e45144f28..0dd86c12265 100644 --- a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/RegattaStructureKey.java +++ b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/RegattaStructureKey.java @@ -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 regattaStructureKey; + private final Map regattaStructureKey; - public RegattaStructureKey(Iterable regattaStructureKey) { + public RegattaStructureKey(Map regattaStructureKey) { this.regattaStructureKey = regattaStructureKey; } - public Iterable getRegattaStructureKey() { + public Map getRegattaStructureKey() { return regattaStructureKey; } diff --git a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/SeriesParameters.java b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/SeriesParameters.java index 3da695234ef..73f595cd388 100755 --- a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/SeriesParameters.java +++ b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/SeriesParameters.java @@ -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; + } } diff --git a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java index 6059dbf72c5..7641cd12f20 100755 --- a/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java +++ b/java/com.sap.sailing.xrr.structureimport/src/com/sap/sailing/xrr/structureimport/StructureImporter.java @@ -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 results = new ArrayList(); private ArrayList regattas; private ArrayList selectedRegattas = new ArrayList();; - private Map> seriesStructuresWithFrequency = new LinkedHashMap>(); // TODO + private Map> seriesStructuresWithFrequency = new HashMap>(); // TODO // rename private List buildStructures = new ArrayList(); private LinkedHashMap 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 seriesAndFleets = new HashSet(); - 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 buildStructures = new HashSet(); - buildStructures.add(structure); - seriesStructuresWithFrequency.put(regattaStructureKey, buildStructures); - } - } - - } +// public void analyseStructure(BuildStructure structure) { +// Map seriesAndFleets = new HashMap(); +// 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 buildStructures = new HashSet(); +// buildStructures.add(structure); +// seriesStructuresWithFrequency.put(regattaStructureKey, buildStructures); +// } +// } +// +// } public Iterable getRegattas(ScoringSchemeType scoringScheme, boolean isPersistent, UUID courseArea, boolean useStartTimeInference, DomainFactory baseDomainFactory,