diff --git a/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF index d3ec5ef6809..ac795d96e20 100755 --- a/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.kiworesultimport.test/META-INF/MANIFEST.MF @@ -7,4 +7,5 @@ Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit4;bundle-version="4.8.2", com.sap.sailing.kiworesultimport, - com.sap.sailing.domain.common + com.sap.sailing.domain.common, + com.sap.sailing.domain 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 index dd5c31385c3..ed2fd3cc502 100755 --- 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 @@ -10,6 +10,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.GregorianCalendar; import java.util.Iterator; import javax.xml.parsers.DocumentBuilderFactory; @@ -20,6 +21,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXException; +import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.impl.Util; import com.sap.sailing.kiworesultimport.Boat; import com.sap.sailing.kiworesultimport.Crewmember; @@ -87,5 +89,6 @@ public class ParserTest { Race r2 = i.next(); assertEquals(1.00, r2.getPoints(), 0.0000000001); assertEquals(2, (int) r2.getNumber()); + assertEquals(new MillisecondsTimePoint(new GregorianCalendar(2011, 05, 18, 16, 26).getTime()), resultList.getTimePoint()); } } diff --git a/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF b/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF index 897112d18d7..7a188858306 100755 --- a/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.kiworesultimport/META-INF/MANIFEST.MF @@ -5,5 +5,7 @@ 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 +Require-Bundle: com.sap.sailing.server, + com.sap.sailing.domain.common, + com.sap.sailing.domain Export-Package: com.sap.sailing.kiworesultimport 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 index 110fbe6094e..956bc1ea8e5 100755 --- 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 @@ -1,5 +1,7 @@ package com.sap.sailing.kiworesultimport; +import com.sap.sailing.domain.common.TimePoint; + public interface ResultList { String getLegende(); @@ -15,5 +17,7 @@ public interface ResultList { String getDate(); + TimePoint getTimePoint(); + Verteilung getVerteilung(); } 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 index ab168d3342c..8fa37682eea 100755 --- 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 @@ -1,12 +1,24 @@ package com.sap.sailing.kiworesultimport.impl; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; +import java.util.logging.Logger; + import org.w3c.dom.Element; import org.w3c.dom.Node; +import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.kiworesultimport.ResultList; import com.sap.sailing.kiworesultimport.Verteilung; public class ResultListImpl extends AbstractNodeWrapper implements ResultList { + private static final Logger logger = Logger.getLogger(ResultListImpl.class.getName()); + + private static final SimpleDateFormat df = new SimpleDateFormat("dd. MMM yyyy hh:mm", Locale.GERMAN); + public ResultListImpl(Node node) { super(node); } @@ -50,4 +62,17 @@ public class ResultListImpl extends AbstractNodeWrapper implements ResultList { public Verteilung getVerteilung() { return new VerteilungImpl(((Element) getNode()).getElementsByTagName("Verteilung").item(0)); } + + @Override + public TimePoint getTimePoint() { + TimePoint result = null; + String dateTime = getDate()+" "+getTime(); + try { + Date d = df.parse(dateTime); + result = new MillisecondsTimePoint(d); + } catch (ParseException e) { + logger.info("Failed to parse result list date/time "+dateTime); + } + return result; + } }