diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetColors.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetColors.java index 8595c9872d3..28d4f6e5154 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetColors.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetColors.java @@ -4,22 +4,29 @@ import com.sap.sailing.domain.common.Color; import com.sap.sailing.domain.common.impl.RGBColor; public enum FleetColors { - GOLD (255, 215, 0), - SILVER (201, 192, 187), - BRONZE (205, 127, 50), - EMERALD (0, 201, 87), - BLUE (0, 0, 255), - YELLOW (255,255,0), - GREEN (0, 255, 0), - RED (255, 0, 0); + GOLD (255, 215, 0, 1), + SILVER (201, 192, 187, 2), + BRONZE (205, 127, 50, 3), + EMERALD (0, 201, 87, 4), + BLUE (0, 0, 255, 0), + YELLOW (255,255,0, 0), + GREEN (0, 255, 0, 0), + RED (255, 0, 0, 0); private Color color; - FleetColors(int red, int green, int blue) { + private int defaultOrderNo; + + FleetColors(int red, int green, int blue, int defaultOrderNo) { color = new RGBColor(red, green, blue); + this.defaultOrderNo = defaultOrderNo; } public Color getColor() { return color; } + + public int getDefaultOrderNo() { + return defaultOrderNo; + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java index f87be44c660..9659b754441 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java @@ -48,7 +48,8 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends DataEntryDialog 0; - boolean boatClassNotEmpty = regattaToValidate.boatClass != null && regattaToValidate.boatClass.name.length() > 0; + boolean boatClassNotEmpty = regattaToValidate.boatClass != null + && regattaToValidate.boatClass.name.length() > 0; boolean unique = true; for (RegattaDTO regatta : existingRegattas) { @@ -66,14 +67,14 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends DataEntryDialog seriesToValidate = regattaToValidate.series; int index = 0; boolean seriesNameNotEmpty = true; for (SeriesDTO series : seriesToValidate) { seriesNameNotEmpty = series.name != null && series.name.length() > 0; - if(!seriesNameNotEmpty) { + if (!seriesNameNotEmpty) { break; } index++; @@ -81,10 +82,10 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends DataEntryDialog setToFindDuplicates = new HashSet(); for (SeriesDTO series : seriesToValidate) { - if(!setToFindDuplicates.add(series.name)) { + if (!setToFindDuplicates.add(series.name)) { seriesUnique = false; break; } @@ -92,21 +93,23 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends DataEntryDialog existingRegattas, StringMessages stringConstants, - AsyncCallback callback) { - super(stringConstants.regatta(), null, stringConstants.ok(), stringConstants.cancel(), + public RegattaWithSeriesAndFleetsCreateDialog(Collection existingRegattas, + StringMessages stringConstants, AsyncCallback callback) { + super(stringConstants.regatta(), null, stringConstants.ok(), stringConstants.cancel(), new RegattaParameterValidator(stringConstants, existingRegattas), callback); this.stringConstants = stringConstants; this.regatta = new RegattaDTO(); @@ -140,67 +143,68 @@ public class RegattaWithSeriesAndFleetsCreateDialog extends DataEntryDialog() { - @Override - public void onFailure(Throwable t) { - } - @Override - public void onSuccess(SeriesDTO newSeries) { - createdSeries.add(newSeries); - updateSeriesGrid(panel); - } - }); + SeriesWithFleetsCreateDialog dialog = new SeriesWithFleetsCreateDialog(Collections + .unmodifiableCollection(result.series), stringConstants, new AsyncCallback() { + @Override + public void onFailure(Throwable t) { + } + + @Override + public void onSuccess(SeriesDTO newSeries) { + createdSeries.add(newSeries); + updateSeriesGrid(panel); + } + }); dialog.show(); } }); panel.add(addSeriesButton); - + return panel; } private void updateSeriesGrid(VerticalPanel parentPanel) { int widgetIndex = parentPanel.getWidgetIndex(seriesGrid); parentPanel.remove(seriesGrid); - + int seriesCount = createdSeries.size(); seriesGrid = new Grid(seriesCount * 2, 3); seriesGrid.setCellSpacing(3); - for(int i = 0; i < seriesCount; i++) { + for (int i = 0; i < seriesCount; i++) { SeriesDTO seriesDTO = createdSeries.get(i); - Label seriesLabel = new Label((i+1) + ". " + stringConstants.series() + ":"); + Label seriesLabel = new Label((i + 1) + ". " + stringConstants.series() + ":"); seriesLabel.setWordWrap(false); seriesLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD); - seriesGrid.setWidget(i*2, 0, seriesLabel); - seriesGrid.setHTML(i*2, 1, seriesDTO.name); - if(seriesDTO.getFleets() != null && seriesDTO.getFleets().size() > 0) { - seriesGrid.setHTML(i*2+1, 1, seriesDTO.getFleets().size() + " fleets: " + seriesDTO.getFleets().toString()); + seriesGrid.setWidget(i * 2, 0, seriesLabel); + seriesGrid.setHTML(i * 2, 1, seriesDTO.name); + if (seriesDTO.getFleets() != null && seriesDTO.getFleets().size() > 0) { + seriesGrid.setHTML(i * 2 + 1, 1, seriesDTO.getFleets().size() + " fleets: " + + seriesDTO.getFleets().toString()); } else { - seriesGrid.setHTML(i*2+1, 1, seriesDTO.getFleets().size() + " No fleets defined."); + seriesGrid.setHTML(i * 2 + 1, 1, seriesDTO.getFleets().size() + " No fleets defined."); } } parentPanel.insert(seriesGrid, widgetIndex); } - + @Override public void show() { super.show(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java index 7893a3f58f2..5947079617a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java @@ -5,6 +5,8 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; +import com.google.gwt.event.dom.client.ChangeEvent; +import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -90,7 +92,7 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { } index2++; } - + if (!fleetNameNotEmpty) { errorMessage = stringConstants.fleet() + " " + (index + 1) + ": " + stringConstants.pleaseEnterNonEmptyName(); } else if (!fleetUnique) { @@ -136,10 +138,38 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { } private Widget createFleetColorWidget(Color defaultColor) { - ListBox listBox = createListBox(false); + final ListBox listBox = createListBox(false); + final int fleetIndex = fleetNameEntryFields.size(); + listBox.addChangeHandler(new ChangeHandler() { + @Override + public void onChange(ChangeEvent event) { + // set default order no of the selected color + int selIndex = listBox.getSelectedIndex(); + IntegerBox orderNoBox = fleetOrderNoEntryFields.get(fleetIndex-1); + if(selIndex == 0) { + orderNoBox.setValue(0); + } else { + String value = listBox.getValue(selIndex); + for(FleetColors color: FleetColors.values()) { + if(color.name().equals(value)) { + orderNoBox.setValue(color.getDefaultOrderNo()); + break; + } + } + } + } + }); + + listBox.addItem(stringConstants.noColor()); for(FleetColors value: FleetColors.values()) listBox.addItem(value.name()); + + if(defaultColor == null) { + listBox.setSelectedIndex(0); + } + fleetColorEntryFields.add(listBox); + return listBox; } @@ -160,7 +190,11 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { FleetDTO fleetDTO = new FleetDTO(); fleetDTO.name = fleetNameEntryFields.get(i).getValue(); fleetDTO.setColor(getSelectedColor(fleetColorEntryFields.get(i))); - fleetDTO.setOrderNo(fleetOrderNoEntryFields.get(i).getValue()); + int orderNo = -1; + if(fleetOrderNoEntryFields.get(i).getValue() != null) { + orderNo = fleetOrderNoEntryFields.get(i).getValue(); + } + fleetDTO.setOrderNo(orderNo); fleets.add(fleetDTO); } @@ -172,7 +206,8 @@ public class SeriesWithFleetsCreateDialog extends DataEntryDialog { private Color getSelectedColor(ListBox colorListBox) { Color result = null; int selIndex = colorListBox.getSelectedIndex(); - if(selIndex >= 0) { + // the zero index represents the 'no color' option + if(selIndex > 0) { String value = colorListBox.getValue(selIndex); for(FleetColors color: FleetColors.values()) { if(color.name().equals(value)) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 216797d0410..616313eb36f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -317,4 +317,5 @@ public interface StringMessages extends Messages { String splitFleet(); String color(); String medalSeries(); + String noColor(); } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 401f40b161d..af83ef6c6fc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -315,3 +315,4 @@ series=Series splitFleet=Split fleet color=Color medalSeries=Medal Series +noColor=No color diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 42867fb0530..b3659f31a9f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -316,3 +316,4 @@ fleets=Flotten splitFleet=Aufteilung in Gruppen color=Farbe medalSeries=Medal Series +noColor=Keine Farbe diff --git a/java/com.sap.sailing.kiworesultimport.test/.classpath b/java/com.sap.sailing.kiworesultimport.test/.classpath new file mode 100755 index 00000000000..1228533181d --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/java/com.sap.sailing.kiworesultimport.test/.project b/java/com.sap.sailing.kiworesultimport.test/.project new file mode 100755 index 00000000000..60a7fada563 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/.project @@ -0,0 +1,28 @@ + + + com.sap.sailing.kiworesultimport.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/java/com.sap.sailing.kiworesultimport.test/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sailing.kiworesultimport.test/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..11f6e462df7 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/java/com.sap.sailing.kiworesultimport.test/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sailing.kiworesultimport.test/.settings/org.eclipse.pde.core.prefs new file mode 100755 index 00000000000..b7e72d019c2 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..9582d515f7d --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF @@ -0,0 +1,9 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Test +Bundle-SymbolicName: com.sap.sailing.kiworesultimport.test +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: org.junit4;bundle-version="4.8.2", + com.sap.sailing.kiworesultimport diff --git a/java/com.sap.sailing.kiworesultimport.test/build.properties b/java/com.sap.sailing.kiworesultimport.test/build.properties new file mode 100755 index 00000000000..a2e16dfebcd --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/build.properties @@ -0,0 +1,5 @@ +source.. = src/,\ + resources/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/java/com.sap.sailing.kiworesultimport.test/pom.xml b/java/com.sap.sailing.kiworesultimport.test/pom.xml new file mode 100644 index 00000000000..4db44bcb63f --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.kiworesultimport.test + eclipse-test-plugin + diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_2 4 mR_Wettfahrt_1.pdf b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_2 4 mR_Wettfahrt_1.pdf new file mode 100755 index 00000000000..33cf3d5b2b2 Binary files /dev/null and b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_2 4 mR_Wettfahrt_1.pdf differ diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_2 4 mR_Wettfahrt_1.xml b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_2 4 mR_Wettfahrt_1.xml new file mode 100755 index 00000000000..0a96db89966 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_2 4 mR_Wettfahrt_1.xml @@ -0,0 +1,10 @@ + + + 2.4 mR + 2011-06-18+02:00 + 14:38:22.547+02:00 + vorlauefig + Kieler Woche 2011 + 1 + 2011-06-18_2 4 mR_Wettfahrt_1.pdf + \ No newline at end of file diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_2_Extra.xml b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_2_Extra.xml new file mode 100755 index 00000000000..374d9ab62f3 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_2_Extra.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3.pdf b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3.pdf new file mode 100755 index 00000000000..918ad292afc Binary files /dev/null and b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3.pdf differ diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3.xml b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3.xml new file mode 100755 index 00000000000..71ffd7bcd8a --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3.xml @@ -0,0 +1,10 @@ + + + 49er + 2011-06-18+02:00 + 17:30:21.390+02:00 + vorlauefig + Kieler Woche 2011 + 3 + 2011-06-18_49er_Wettfahrt_3.pdf + \ No newline at end of file diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3_Extra.xml b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3_Extra.xml new file mode 100755 index 00000000000..d388e02f5c0 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_3_Extra.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4.pdf b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4.pdf new file mode 100755 index 00000000000..c8d7d8c9152 Binary files /dev/null and b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4.pdf differ diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4.xml b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4.xml new file mode 100755 index 00000000000..9bbd4e986d6 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4.xml @@ -0,0 +1,10 @@ + + + 49er + 2011-06-18+02:00 + 21:23:41.577+02:00 + vorlauefig + Kieler Woche 2011 + 4 + 2011-06-18_49er_Wettfahrt_4.pdf + \ No newline at end of file diff --git a/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4_Extra.xml b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4_Extra.xml new file mode 100755 index 00000000000..35ce25c3e8c --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/resources/2011-06-18_49er_Wettfahrt_4_Extra.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java new file mode 100755 index 00000000000..23474a92220 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport.test/src/com/sap/sailing/kiworesultimport/test/ParserTest.java @@ -0,0 +1,38 @@ +package com.sap.sailing.kiworesultimport.test; + +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + +public class ParserTest { + private static final String RESOURCES = "resources/"; + + private InputStream getInputStream(String filename) throws FileNotFoundException, IOException { + return new FileInputStream(getFile(filename)); + } + + private File getFile(String filename) { + return new File(RESOURCES + filename); + } + + @Test + public void testLoadingSampleXML() throws SAXException, IOException, ParserConfigurationException { + Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder() + .parse(getInputStream("2011-06-18_49er_Wettfahrt_2_Extra.xml")); + assertNotNull(doc); + Node resultList = doc.getElementsByTagName("ResultList").item(0); + assertNotNull(resultList); + } +} diff --git a/java/com.sap.sailing.kiworesultimport/.classpath b/java/com.sap.sailing.kiworesultimport/.classpath new file mode 100755 index 00000000000..b1dabee3829 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/java/com.sap.sailing.kiworesultimport/.project b/java/com.sap.sailing.kiworesultimport/.project new file mode 100755 index 00000000000..d2d5b17ed20 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/.project @@ -0,0 +1,28 @@ + + + com.sap.sailing.kiworesultimport + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/java/com.sap.sailing.kiworesultimport/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sailing.kiworesultimport/.settings/org.eclipse.jdt.core.prefs new file mode 100755 index 00000000000..11f6e462df7 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/java/com.sap.sailing.kiworesultimport/.settings/org.eclipse.pde.core.prefs b/java/com.sap.sailing.kiworesultimport/.settings/org.eclipse.pde.core.prefs new file mode 100755 index 00000000000..b7e72d019c2 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/.settings/org.eclipse.pde.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +pluginProject.extensions=false +resolve.requirebundle=false diff --git a/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF new file mode 100755 index 00000000000..897112d18d7 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF @@ -0,0 +1,9 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Kiworesultimport +Bundle-SymbolicName: com.sap.sailing.kiworesultimport +Bundle-Version: 1.0.0.qualifier +Bundle-Vendor: SAP +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Require-Bundle: com.sap.sailing.server +Export-Package: com.sap.sailing.kiworesultimport diff --git a/java/com.sap.sailing.kiworesultimport/build.properties b/java/com.sap.sailing.kiworesultimport/build.properties new file mode 100755 index 00000000000..41eb6ade2b4 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/java/com.sap.sailing.kiworesultimport/pom.xml b/java/com.sap.sailing.kiworesultimport/pom.xml new file mode 100644 index 00000000000..db7ecfbaa9c --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + root + com.sap.sailing + 1.0.0-SNAPSHOT + + com.sap.sailing.kiworesultimport + eclipse-plugin + diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Boat.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Boat.java new file mode 100755 index 00000000000..87f7124a500 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Boat.java @@ -0,0 +1,9 @@ +package com.sap.sailing.kiworesultimport; + +public interface Boat extends Named { + String getSailingNumber(); + + Integer getPosition(); + + String getPreis(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Crewmember.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Crewmember.java new file mode 100755 index 00000000000..9341d6b9c80 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Crewmember.java @@ -0,0 +1,5 @@ +package com.sap.sailing.kiworesultimport; + +public interface Crewmember extends Named { + +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Named.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Named.java new file mode 100755 index 00000000000..263d07a89bc --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Named.java @@ -0,0 +1,5 @@ +package com.sap.sailing.kiworesultimport; + +public interface Named { + String getName(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java new file mode 100755 index 00000000000..7c48813242e --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Race.java @@ -0,0 +1,7 @@ +package com.sap.sailing.kiworesultimport; + +public interface Race { + Double getPoints(); + + Double getNumber(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Races.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Races.java new file mode 100755 index 00000000000..5e5406274b6 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Races.java @@ -0,0 +1,5 @@ +package com.sap.sailing.kiworesultimport; + +public interface Races { + Double getTotalPoints(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultList.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultList.java new file mode 100755 index 00000000000..66c7f848005 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultList.java @@ -0,0 +1,17 @@ +package com.sap.sailing.kiworesultimport; + +public interface ResultList { + String getLegende(); + + String getImagePfad(); + + String getStatus(); + + String getBoatClass(); + + String getEvent(); + + String getTime(); + + String getDate(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultListParser.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultListParser.java new file mode 100755 index 00000000000..bbd5822e59b --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultListParser.java @@ -0,0 +1,12 @@ +package com.sap.sailing.kiworesultimport; + +import java.io.IOException; +import java.io.InputStream; + +import javax.xml.parsers.ParserConfigurationException; + +import org.xml.sax.SAXException; + +public interface ResultListParser { + ResultList parse(InputStream inputStream) throws SAXException, IOException, ParserConfigurationException; +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultListParserFactory.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultListParserFactory.java new file mode 100755 index 00000000000..647929e46ef --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/ResultListParserFactory.java @@ -0,0 +1,9 @@ +package com.sap.sailing.kiworesultimport; + +import com.sap.sailing.kiworesultimport.impl.ResultListParserFactoryImpl; + +public interface ResultListParserFactory { + ResultListParserFactory INSTANCE = new ResultListParserFactoryImpl(); + + ResultListParser createResultListParser(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Skipper.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Skipper.java new file mode 100755 index 00000000000..a29fa9448db --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Skipper.java @@ -0,0 +1,7 @@ +package com.sap.sailing.kiworesultimport; + +import java.net.URL; + +public interface Skipper extends Named { + URL getIsaf(); +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Verteilung.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Verteilung.java new file mode 100755 index 00000000000..110b5e48fc2 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/Verteilung.java @@ -0,0 +1,5 @@ +package com.sap.sailing.kiworesultimport; + +public interface Verteilung { + +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/AbstractNodeWrapper.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/AbstractNodeWrapper.java new file mode 100755 index 00000000000..4e76e4ab2ab --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/AbstractNodeWrapper.java @@ -0,0 +1,16 @@ +package com.sap.sailing.kiworesultimport.impl; + +import org.w3c.dom.Node; + +public class AbstractNodeWrapper { + private final Node node; + + public AbstractNodeWrapper(Node node) { + super(); + this.node = node; + } + + protected Node getNode() { + return node; + } +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListImpl.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListImpl.java new file mode 100755 index 00000000000..785130c7124 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListImpl.java @@ -0,0 +1,53 @@ +package com.sap.sailing.kiworesultimport.impl; + +import org.w3c.dom.Node; + +import com.sap.sailing.kiworesultimport.ResultList; + +public class ResultListImpl extends AbstractNodeWrapper implements ResultList { + public ResultListImpl(Node node) { + super(node); + } + + @Override + public String getLegende() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getImagePfad() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getStatus() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getBoatClass() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getEvent() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getTime() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getDate() { + // TODO Auto-generated method stub + return null; + } +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListParserFactoryImpl.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListParserFactoryImpl.java new file mode 100755 index 00000000000..cc527c4308b --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListParserFactoryImpl.java @@ -0,0 +1,13 @@ +package com.sap.sailing.kiworesultimport.impl; + +import com.sap.sailing.kiworesultimport.ResultListParser; +import com.sap.sailing.kiworesultimport.ResultListParserFactory; + +public class ResultListParserFactoryImpl implements ResultListParserFactory { + + @Override + public ResultListParser createResultListParser() { + return new ResultListParserImpl(); + } + +} diff --git a/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListParserImpl.java b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListParserImpl.java new file mode 100755 index 00000000000..766d46c3648 --- /dev/null +++ b/java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ResultListParserImpl.java @@ -0,0 +1,27 @@ +package com.sap.sailing.kiworesultimport.impl; + +import java.io.IOException; +import java.io.InputStream; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.w3c.dom.Document; +import org.xml.sax.SAXException; + +import com.sap.sailing.kiworesultimport.ResultList; +import com.sap.sailing.kiworesultimport.ResultListParser; + +public class ResultListParserImpl implements ResultListParser { + private Document parseDocument(InputStream inputStream) throws SAXException, IOException, ParserConfigurationException { + return DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream); + } + + @Override + public ResultList parse(InputStream inputStream) throws SAXException, IOException, ParserConfigurationException { + Document doc = parseDocument(inputStream); + ResultList result = new ResultListImpl(doc.getElementsByTagName("ResultList").item(0)); + return result; + } + +} diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java index 84a0923f56e..17e1cca895c 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java @@ -185,7 +185,9 @@ public class TestStoringAndLoadingEventsAndRegattas extends AbstractMongoDBTest rlbrcNames.append("; "); rlbrcNames.append(rlbrc.getName()); } - logger.info("columns in regatta leaderboard: "+rlbrcNames); + logger.info("columns in regatta leaderboard for regatta "+regattaLeaderboard.getRegatta().getName()+" ("+ + regattaLeaderboard.getRegatta().hashCode()+"): "+rlbrcNames); + logColumnsInRegatta(regattaLeaderboard.getRegatta()); } private void logColumnsInRegatta(Regatta regatta) { @@ -196,7 +198,7 @@ public class TestStoringAndLoadingEventsAndRegattas extends AbstractMongoDBTest rrcNames.append(raceColumn.getName()); } } - logger.info("columns in regatta: "+rrcNames); + logger.info("columns in regatta "+regatta.getName()+" ("+regatta.hashCode()+") : "+rrcNames); } private RacingEventServiceImpl createRacingEventServiceWithOneMockedTrackedRace(final TrackedRace q2YellowTrackedRace) { diff --git a/java/pom.xml b/java/pom.xml index fb23b1e387d..7403d7c00b2 100755 --- a/java/pom.xml +++ b/java/pom.xml @@ -53,6 +53,8 @@ com.sap.sailing.feature.runtime com.sap.sailing.feature.p2build org.moxieapps.gwt.highcharts + com.sap.sailing.kiworesultimport + com.sap.sailing.kiworesultimport.test