mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 21:30:57 +00:00
Merge branch 'master' into bug3959
This commit is contained in:
commit
f0171e7bbf
134 files changed
+1598
-966
No files matched your search
+6
-3
@@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en">
|
||||
<file datatype="javapropertyresourcebundle" original="/usr/sap/ljs/app/Converter_577915206092257625/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="ce00744579f6c3e0cce2c8a712b97d0e" form="base64">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 truncated
|
||||
<internal-file crc="5dda908f3639fd822b6aa18b6f99c875" form="base64">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 truncated
|
||||
</skl>
|
||||
<phase-group>
|
||||
<phase company-name="SAP AG" date="2016-11-04T21:01:36Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
<phase company-name="SAP AG" date="2016-11-18T09:43:04Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
</phase-group>
|
||||
<tool tool-company="SAP AG" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter" tool-name="TEW: Javascript .properties Flexible File Converter" tool-version="1.1.0"/>
|
||||
</header>
|
||||
@@ -3669,6 +3669,9 @@
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="removeSuppressedPassing" resname="removeSuppressedPassing">
|
||||
<source>Remove suppressed mark passing</source>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="warningSettingFixedPassing" resname="warningSettingFixedPassing">
|
||||
<source>The time passing of <ph id="1">{0}</ph> waypoint can not be before the time of the previous waypoint or after the time of the following one</source>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="errorRemovingFixedPassing" resname="errorRemovingFixedPassing">
|
||||
<source>Error removing fixed mark passing: <ph id="1">{0}</ph></source>
|
||||
</trans-unit>
|
||||
|
||||
+18
-14
@@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:19:40Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:55Z" original="/usr/sap/ljs/app/Converter_577915206092257625/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="ce00744579f6c3e0cce2c8a712b97d0e" form="base64">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 truncated
|
||||
<internal-file crc="5dda908f3639fd822b6aa18b6f99c875" form="base64">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 truncated
|
||||
</skl>
|
||||
<phase-group>
|
||||
<phase company-name="SAP AG" date="2016-11-04T21:01:36Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
<phase company-name="SAP AG" date="2016-11-18T09:43:04Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
</phase-group>
|
||||
<tool tool-company="SAP AG" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter" tool-name="TEW: Javascript .properties Flexible File Converter" tool-version="1.1.0"/>
|
||||
</header>
|
||||
@@ -845,15 +845,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterRaces" resname="filterRaces">
|
||||
<source>Filter races</source>
|
||||
<target>レースのフィルタリング</target>
|
||||
<target state="signed-off">レースのフィルタリング</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterByNameOrBoatClass" resname="filterByNameOrBoatClass">
|
||||
<source>by name or boat class</source>
|
||||
<target>名前または艇種別</target>
|
||||
<target state="signed-off">名前または艇種別</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterByRegatta" resname="filterByRegatta">
|
||||
<source>by regatta</source>
|
||||
<target>レガッタ別</target>
|
||||
<target state="signed-off">レガッタ別</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterMediaByName" resname="filterMediaByName">
|
||||
<source>Filter media by name</source>
|
||||
@@ -4887,6 +4887,10 @@
|
||||
<source>Remove suppressed mark passing</source>
|
||||
<target state="signed-off">非表示のマーク通過を削除</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="warningSettingFixedPassing" resname="warningSettingFixedPassing">
|
||||
<source>The time passing of <ph id="1">{0}</ph> waypoint can not be before the time of the previous waypoint or after the time of the following one</source>
|
||||
<target>変針点 <ph id="1">{0}</ph> を通過する時刻は、前の変針点の時刻より前であってはならず、後の変針点の時刻より後であってはなりません。</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="errorRemovingFixedPassing" resname="errorRemovingFixedPassing">
|
||||
<source>Error removing fixed mark passing: <ph id="1">{0}</ph></source>
|
||||
<target state="signed-off">固定マーク通過の削除でエラー発生: <ph id="1">{0}</ph></target>
|
||||
@@ -6421,7 +6425,7 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="currentRideHeightInMetersTooltip" resname="currentRideHeightInMetersTooltip">
|
||||
<source>The current Foiling ride height</source>
|
||||
<target state="signed-off">翼走での現在の浮上高さ</target>
|
||||
<target state="translated">フォイリングでの現在の浮上高さ</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="currentOrAverageRideHeightInMeters" resname="currentOrAverageRideHeightInMeters">
|
||||
<source>Ride Height (∅ at end)</source>
|
||||
@@ -6429,7 +6433,7 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="currentOrAverageRideHeightInMetersTooltip" resname="currentOrAverageRideHeightInMetersTooltip">
|
||||
<source>Current Foiling ride height in meters while leg is still running; average ride height when leg is completed.</source>
|
||||
<target state="signed-off">レグ航行中の翼走での現在の浮上高さ、レグ完了時の平均浮上高さ</target>
|
||||
<target state="translated">レグ航行中のフォイリングでの現在の浮上高さ、レグ完了時の平均浮上高さ</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="pleaseCreateAtLeastOneMappingForCompetitor" resname="pleaseCreateAtLeastOneMappingForCompetitor">
|
||||
<source>Please create at least one mapping by first selecting a track on the left hand side and then selecting a competitor on the right hand side</source>
|
||||
@@ -6461,15 +6465,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="externalLinks" resname="externalLinks">
|
||||
<source>External links</source>
|
||||
<target>外部リンク</target>
|
||||
<target state="signed-off">外部リンク</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="urlForAllLanguages" resname="urlForAllLanguages">
|
||||
<source>URL for all languages</source>
|
||||
<target>全言語向け URL</target>
|
||||
<target state="signed-off">全言語向け URL</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="urlForLanguage" resname="urlForLanguage">
|
||||
<source>URL for language ''<ph id="1">{0}</ph>''</source>
|
||||
<target>言語 ''<ph id="1">{0}</ph>'’ 向け URL</target>
|
||||
<target state="signed-off">言語 ''<ph id="1">{0}</ph>'' 向け URL</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="notificationRegattaConfigurationUpdatedUsingByMarks" resname="notificationRegattaConfigurationUpdatedUsingByMarks">
|
||||
<source>Active regatta configuration was set, using the "By Marks" course designer.</source>
|
||||
@@ -6845,15 +6849,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="raceStartAnalysis" resname="raceStartAnalysis">
|
||||
<source>Race Start Analysis</source>
|
||||
<target>レーススタート分析</target>
|
||||
<target state="signed-off">レーススタート分析</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="buoyZoneRadiusInHullLengths" resname="buoyZoneRadiusInHullLengths">
|
||||
<source>Buoy zone radius in hull lengths (e.g., 2 or 3)</source>
|
||||
<target>艇身単位のゾーン半径 (例: 2 または3)</target>
|
||||
<target state="signed-off">艇身単位のゾーン半径 (例: 2 または3)</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="incorrectValueForRegattaBuoyZoneRadiusInHullLengths" resname="incorrectValueForRegattaBuoyZoneRadiusInHullLengths">
|
||||
<source>Incorrect value for the buoy zone radius in hull lengths</source>
|
||||
<target>艇身単位のゾーン半径の値が不適切</target>
|
||||
<target state="signed-off">艇身単位のゾーン半径の値が不適切</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
|
||||
+16
-12
@@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:21:43Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:39Z" original="/usr/sap/ljs/app/Converter_577915206092257625/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="ce00744579f6c3e0cce2c8a712b97d0e" form="base64">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 truncated
|
||||
<internal-file crc="5dda908f3639fd822b6aa18b6f99c875" form="base64">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 truncated
|
||||
</skl>
|
||||
<phase-group>
|
||||
<phase company-name="SAP AG" date="2016-11-04T21:01:36Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
<phase company-name="SAP AG" date="2016-11-18T09:43:04Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
</phase-group>
|
||||
<tool tool-company="SAP AG" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter" tool-name="TEW: Javascript .properties Flexible File Converter" tool-version="1.1.0"/>
|
||||
</header>
|
||||
@@ -845,15 +845,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterRaces" resname="filterRaces">
|
||||
<source>Filter races</source>
|
||||
<target>Фильтровать гонки</target>
|
||||
<target state="signed-off">Фильтровать гонки</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterByNameOrBoatClass" resname="filterByNameOrBoatClass">
|
||||
<source>by name or boat class</source>
|
||||
<target>по названию или классу лодок</target>
|
||||
<target state="signed-off">по названию или классу лодок</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterByRegatta" resname="filterByRegatta">
|
||||
<source>by regatta</source>
|
||||
<target>по регате</target>
|
||||
<target state="signed-off">по регате</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterMediaByName" resname="filterMediaByName">
|
||||
<source>Filter media by name</source>
|
||||
@@ -4887,6 +4887,10 @@
|
||||
<source>Remove suppressed mark passing</source>
|
||||
<target state="signed-off">Удалить подавленное прохождение отметки</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="warningSettingFixedPassing" resname="warningSettingFixedPassing">
|
||||
<source>The time passing of <ph id="1">{0}</ph> waypoint can not be before the time of the previous waypoint or after the time of the following one</source>
|
||||
<target>Время прохождения отметки <ph id="1">{0}</ph> не может быть раньше времени предыдущей отметки или позже времени следующей</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="errorRemovingFixedPassing" resname="errorRemovingFixedPassing">
|
||||
<source>Error removing fixed mark passing: <ph id="1">{0}</ph></source>
|
||||
<target state="signed-off">Ошибка при удалении прохождения фиксированной отметки: <ph id="1">{0}</ph></target>
|
||||
@@ -6461,15 +6465,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="externalLinks" resname="externalLinks">
|
||||
<source>External links</source>
|
||||
<target>Внешние ссылки</target>
|
||||
<target state="signed-off">Внешние ссылки</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="urlForAllLanguages" resname="urlForAllLanguages">
|
||||
<source>URL for all languages</source>
|
||||
<target>URL-адрес для всех языков</target>
|
||||
<target state="signed-off">URL-адрес для всех языков</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="urlForLanguage" resname="urlForLanguage">
|
||||
<source>URL for language ''<ph id="1">{0}</ph>''</source>
|
||||
<target>URL-адрес для языка ''<ph id="1">{0}</ph>''</target>
|
||||
<target state="signed-off">URL-адрес для языка ''<ph id="1">{0}</ph>''</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="notificationRegattaConfigurationUpdatedUsingByMarks" resname="notificationRegattaConfigurationUpdatedUsingByMarks">
|
||||
<source>Active regatta configuration was set, using the "By Marks" course designer.</source>
|
||||
@@ -6845,15 +6849,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="raceStartAnalysis" resname="raceStartAnalysis">
|
||||
<source>Race Start Analysis</source>
|
||||
<target>Анализ старта гонки</target>
|
||||
<target state="signed-off">Анализ старта гонки</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="buoyZoneRadiusInHullLengths" resname="buoyZoneRadiusInHullLengths">
|
||||
<source>Buoy zone radius in hull lengths (e.g., 2 or 3)</source>
|
||||
<target>Радиус зоны буя в длинах корпуса (например, 2 или 3)</target>
|
||||
<target state="signed-off">Радиус зоны буя в длинах корпуса (например, 2 или 3)</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="incorrectValueForRegattaBuoyZoneRadiusInHullLengths" resname="incorrectValueForRegattaBuoyZoneRadiusInHullLengths">
|
||||
<source>Incorrect value for the buoy zone radius in hull lengths</source>
|
||||
<target>Неверное значение радиуса зоны буя в длинах корпуса</target>
|
||||
<target state="signed-off">Неверное значение радиуса зоны буя в длинах корпуса</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
|
||||
+16
-12
@@ -1,12 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:23:21Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-30T16:12:09Z" original="/usr/sap/ljs/app/Converter_577915206092257625/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="ce00744579f6c3e0cce2c8a712b97d0e" form="base64">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 truncated
|
||||
<internal-file crc="5dda908f3639fd822b6aa18b6f99c875" form="base64">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 truncated
|
||||
</skl>
|
||||
<phase-group>
|
||||
<phase company-name="SAP AG" date="2016-11-04T21:01:36Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
<phase company-name="SAP AG" date="2016-11-18T09:43:04Z" phase-name="file-creation" process-name="file-creation" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter"/>
|
||||
</phase-group>
|
||||
<tool tool-company="SAP AG" tool-id="urn:x-sap:sls-mlt:java:properties-flexible-converter" tool-name="TEW: Javascript .properties Flexible File Converter" tool-version="1.1.0"/>
|
||||
</header>
|
||||
@@ -845,15 +845,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterRaces" resname="filterRaces">
|
||||
<source>Filter races</source>
|
||||
<target>筛选比赛轮次</target>
|
||||
<target state="signed-off">筛选比赛轮次</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterByNameOrBoatClass" resname="filterByNameOrBoatClass">
|
||||
<source>by name or boat class</source>
|
||||
<target>按名称或船只级别</target>
|
||||
<target state="signed-off">按名称或船只级别</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterByRegatta" resname="filterByRegatta">
|
||||
<source>by regatta</source>
|
||||
<target>按比赛</target>
|
||||
<target state="signed-off">按比赛</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="filterMediaByName" resname="filterMediaByName">
|
||||
<source>Filter media by name</source>
|
||||
@@ -4887,6 +4887,10 @@
|
||||
<source>Remove suppressed mark passing</source>
|
||||
<target state="signed-off">移除禁止的绕标</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="warningSettingFixedPassing" resname="warningSettingFixedPassing">
|
||||
<source>The time passing of <ph id="1">{0}</ph> waypoint can not be before the time of the previous waypoint or after the time of the following one</source>
|
||||
<target state="signed-off">通过<ph id="1">{0}</ph>航路点的时间不能在上一航路点的时间之前或下一航路点的时间之后</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="errorRemovingFixedPassing" resname="errorRemovingFixedPassing">
|
||||
<source>Error removing fixed mark passing: <ph id="1">{0}</ph></source>
|
||||
<target state="signed-off">移除固定的绕标出错: <ph id="1">{0}</ph></target>
|
||||
@@ -6461,15 +6465,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="externalLinks" resname="externalLinks">
|
||||
<source>External links</source>
|
||||
<target>外部链接</target>
|
||||
<target state="signed-off">外部链接</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="urlForAllLanguages" resname="urlForAllLanguages">
|
||||
<source>URL for all languages</source>
|
||||
<target>所有语言的 URL</target>
|
||||
<target state="signed-off">所有语言的 URL</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="urlForLanguage" resname="urlForLanguage">
|
||||
<source>URL for language ''<ph id="1">{0}</ph>''</source>
|
||||
<target>语言 ''<ph id="1">{0}</ph>'’ 的 URL</target>
|
||||
<target state="translated">语言 ''<ph id="1">{0}</ph>'' 的 URL</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="notificationRegattaConfigurationUpdatedUsingByMarks" resname="notificationRegattaConfigurationUpdatedUsingByMarks">
|
||||
<source>Active regatta configuration was set, using the "By Marks" course designer.</source>
|
||||
@@ -6845,15 +6849,15 @@
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="raceStartAnalysis" resname="raceStartAnalysis">
|
||||
<source>Race Start Analysis</source>
|
||||
<target>比赛轮次开始分析</target>
|
||||
<target state="signed-off">比赛轮次开始分析</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="buoyZoneRadiusInHullLengths" resname="buoyZoneRadiusInHullLengths">
|
||||
<source>Buoy zone radius in hull lengths (e.g., 2 or 3)</source>
|
||||
<target>船体长度表示的浮标区半径(例如 2 或 3)</target>
|
||||
<target state="signed-off">船体长度表示的浮标区半径(例如 2 或 3)</target>
|
||||
</trans-unit>
|
||||
<trans-unit datatype="x-urn:x-sap:sls-mlt:java:flexible-converter:messageformat" id="incorrectValueForRegattaBuoyZoneRadiusInHullLengths" resname="incorrectValueForRegattaBuoyZoneRadiusInHullLengths">
|
||||
<source>Incorrect value for the buoy zone radius in hull lengths</source>
|
||||
<target>船体长度表示的浮标区半径的值不正确</target>
|
||||
<target state="signed-off">船体长度表示的浮标区半径的值不正确</target>
|
||||
</trans-unit>
|
||||
</body>
|
||||
</file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:19:08Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:05Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="f38aaa3e2ebfcee22c5187ca5b77bc00" form="base64">H4sIAAAAAAAAAIVWS28jKRC+8yu4jJQcRopn9qkVKznJ2vHKeci2Ntoj7i53o7TBApys59dvVdEP7Ew8F7rq4wOKetHLHUCpljQKHldgl1A4W4Zr2DgPaU6OroJcMyBuTYjaFrDy+hUaXN0BskPEg96CokHMoVoddqDwK0kQS22a2a2ij3zYb9fgxb+gvaKB2Aljfjv9oKNxVjcmHlQmi3HhnT1sVfsVC6h0jFq1X3Hj9j7A2INWSZQki2un402jQ1AkSRbFpAGIikex0AUoGnCH7Q6iic6rQeQNeK1Ygd4qGjLmEu9R1CtdZUtkAiWieEVdgl877UvygbHVrdtqYxcQvYFX8Dc1aiqjBbboHJnmAznv/I5VENOn5cT8d46GjM9Iwf3utX95Qucg89wCosmWl0xdQNg38UcGy0RLSx43mQd/dFPpNnKgk6EW9kg5b2Xi5P6ferff5Z6WjOSUfJYcTF7MHXN0eyLkF+EkRluLIXemu4DO7ZzcWz6Y92xsuYwebBXrmb0Gvceai4pg2eHSWNnNiOtNvFI3utmSNFJzU9VRauNJ/dKqaw/wDQj5qqZgYwMZ9JO6d3hFHXPwZzXxEOoM+UXh8c5WGfSrusPt5RvaRupvaqobnvi941YtMLpCxPlk40j9Y1yDZsjQY1/U3d57U6AbsI4brPJXWBbUfjpNsiovrrANhfiHHMk3jH28PKbP7BP4Avc+XYcu+3RKpWQ6t4CzlBeO18E1+wgLbV9Up0jSUsCoRb6LFvdNCtUm9j1zHJdRI6NvmdFJRiS2IhZSF36usQ2TSjmWdjomnLbptO3QqxPariBDx3Fi0F+Ur4p02o8RSZBIvfZx0yViUAmh/O2xnrXSxUvOYL2f/dtgiLJZ1vvZJ8D+HQ83xhfNEa2dkO0MWz3F2g2Pfu5CQC7bzZDEpprA4TlydNnUWE35oadToRNDXnyiY+dcU5eDfa40++3EWBPq3DqGZcKz62Cs80uQ+t7ya4hvALaPwNiW7QHfu5K8GLVhkZ//bE+8FLOAz2vxgu/tLMhW7K0Ymg737syg7BVKbX2ItH85JfOZXfdPQefXu1PSE07RVjSkVDz6T2jzru9njI43EXtcIrA8zN8aDwW96dimbQWq12UCqIBuocKeM5hEXhpMIk0868POGaziThDdy4WBVq3MUWfru+Qg+cPCYktP6yqZP5TVqjY+Ht6v4Lh+PVlAfeEN029I2XH5qm3UFbh9+MuWj5u5saA6nsyTN6dK5HLuGuqXVN10yp1uNlibNXCe0WuVCp0tiDXIGgm0jOQN136Dz9n3bfjwuJXZAvrDxlnnKEWQZIzC1aLiHkrd8M8US9xOxf+VN8i0cAoAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:21:16Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:05Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="f38aaa3e2ebfcee22c5187ca5b77bc00" form="base64">H4sIAAAAAAAAAIVWS28jKRC+8yu4jJQcRopn9qkVKznJ2vHKeci2Ntoj7i53o7TBApys59dvVdEP7Ew8F7rq4wOKetHLHUCpljQKHldgl1A4W4Zr2DgPaU6OroJcMyBuTYjaFrDy+hUaXN0BskPEg96CokHMoVoddqDwK0kQS22a2a2ij3zYb9fgxb+gvaKB2Aljfjv9oKNxVjcmHlQmi3HhnT1sVfsVC6h0jFq1X3Hj9j7A2INWSZQki2un402jQ1AkSRbFpAGIikex0AUoGnCH7Q6iic6rQeQNeK1Ygd4qGjLmEu9R1CtdZUtkAiWieEVdgl877UvygbHVrdtqYxcQvYFX8Dc1aiqjBbboHJnmAznv/I5VENOn5cT8d46GjM9Iwf3utX95Qucg89wCosmWl0xdQNg38UcGy0RLSx43mQd/dFPpNnKgk6EW9kg5b2Xi5P6ferff5Z6WjOSUfJYcTF7MHXN0eyLkF+EkRluLIXemu4DO7ZzcWz6Y92xsuYwebBXrmb0Gvceai4pg2eHSWNnNiOtNvFI3utmSNFJzU9VRauNJ/dKqaw/wDQj5qqZgYwMZ9JO6d3hFHXPwZzXxEOoM+UXh8c5WGfSrusPt5RvaRupvaqobnvi941YtMLpCxPlk40j9Y1yDZsjQY1/U3d57U6AbsI4brPJXWBbUfjpNsiovrrANhfiHHMk3jH28PKbP7BP4Avc+XYcu+3RKpWQ6t4CzlBeO18E1+wgLbV9Up0jSUsCoRb6LFvdNCtUm9j1zHJdRI6NvmdFJRiS2IhZSF36usQ2TSjmWdjomnLbptO3QqxPariBDx3Fi0F+Ur4p02o8RSZBIvfZx0yViUAmh/O2xnrXSxUvOYL2f/dtgiLJZ1vvZJ8D+HQ83xhfNEa2dkO0MWz3F2g2Pfu5CQC7bzZDEpprA4TlydNnUWE35oadToRNDXnyiY+dcU5eDfa40++3EWBPq3DqGZcKz62Cs80uQ+t7ya4hvALaPwNiW7QHfu5K8GLVhkZ//bE+8FLOAz2vxgu/tLMhW7K0Ymg737syg7BVKbX2ItH85JfOZXfdPQefXu1PSE07RVjSkVDz6T2jzru9njI43EXtcIrA8zN8aDwW96dimbQWq12UCqIBuocKeM5hEXhpMIk0868POGaziThDdy4WBVq3MUWfru+Qg+cPCYktP6yqZP5TVqjY+Ht6v4Lh+PVlAfeEN029I2XH5qm3UFbh9+MuWj5u5saA6nsyTN6dK5HLuGuqXVN10yp1uNlibNXCe0WuVCp0tiDXIGgm0jOQN136Dz9n3bfjwuJXZAvrDxlnnKEWQZIzC1aLiHkrd8M8US9xOxf+VN8i0cAoAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:22:54Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:06Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="f38aaa3e2ebfcee22c5187ca5b77bc00" form="base64">H4sIAAAAAAAAAIVWS28jKRC+8yu4jJQcRopn9qkVKznJ2vHKeci2Ntoj7i53o7TBApys59dvVdEP7Ew8F7rq4wOKetHLHUCpljQKHldgl1A4W4Zr2DgPaU6OroJcMyBuTYjaFrDy+hUaXN0BskPEg96CokHMoVoddqDwK0kQS22a2a2ij3zYb9fgxb+gvaKB2Aljfjv9oKNxVjcmHlQmi3HhnT1sVfsVC6h0jFq1X3Hj9j7A2INWSZQki2un402jQ1AkSRbFpAGIikex0AUoGnCH7Q6iic6rQeQNeK1Ygd4qGjLmEu9R1CtdZUtkAiWieEVdgl877UvygbHVrdtqYxcQvYFX8Dc1aiqjBbboHJnmAznv/I5VENOn5cT8d46GjM9Iwf3utX95Qucg89wCosmWl0xdQNg38UcGy0RLSx43mQd/dFPpNnKgk6EW9kg5b2Xi5P6ferff5Z6WjOSUfJYcTF7MHXN0eyLkF+EkRluLIXemu4DO7ZzcWz6Y92xsuYwebBXrmb0Gvceai4pg2eHSWNnNiOtNvFI3utmSNFJzU9VRauNJ/dKqaw/wDQj5qqZgYwMZ9JO6d3hFHXPwZzXxEOoM+UXh8c5WGfSrusPt5RvaRupvaqobnvi941YtMLpCxPlk40j9Y1yDZsjQY1/U3d57U6AbsI4brPJXWBbUfjpNsiovrrANhfiHHMk3jH28PKbP7BP4Avc+XYcu+3RKpWQ6t4CzlBeO18E1+wgLbV9Up0jSUsCoRb6LFvdNCtUm9j1zHJdRI6NvmdFJRiS2IhZSF36usQ2TSjmWdjomnLbptO3QqxPariBDx3Fi0F+Ur4p02o8RSZBIvfZx0yViUAmh/O2xnrXSxUvOYL2f/dtgiLJZ1vvZJ8D+HQ83xhfNEa2dkO0MWz3F2g2Pfu5CQC7bzZDEpprA4TlydNnUWE35oadToRNDXnyiY+dcU5eDfa40++3EWBPq3DqGZcKz62Cs80uQ+t7ya4hvALaPwNiW7QHfu5K8GLVhkZ//bE+8FLOAz2vxgu/tLMhW7K0Ymg737syg7BVKbX2ItH85JfOZXfdPQefXu1PSE07RVjSkVDz6T2jzru9njI43EXtcIrA8zN8aDwW96dimbQWq12UCqIBuocKeM5hEXhpMIk0868POGaziThDdy4WBVq3MUWfru+Qg+cPCYktP6yqZP5TVqjY+Ht6v4Lh+PVlAfeEN029I2XH5qm3UFbh9+MuWj5u5saA6nsyTN6dK5HLuGuqXVN10yp1uNlibNXCe0WuVCp0tiDXIGgm0jOQN136Dz9n3bfjwuJXZAvrDxlnnKEWQZIzC1aLiHkrd8M8US9xOxf+VN8i0cAoAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@ import com.sap.sse.common.TimePoint;
|
||||
*
|
||||
*/
|
||||
public class NOAAImporter {
|
||||
private static final String QUERY_URL = "http://www.ngdc.noaa.gov/geomag-web/calculators/calculateDeclination";
|
||||
private static final String QUERY_URL = "https://www.ngdc.noaa.gov/geomag-web/calculators/calculateDeclination";
|
||||
private static final String REGEXP_DECLINATION = "<p class=\"indent\"><b>Declination</b> = ([0-9]*)° ([0-9]*)' *([EW])";
|
||||
private static final String REGEXP_ANNUAL_CHANGE = "changing by *([0-9]*)° *([0-9]*)' ([EW])/year *</p>";
|
||||
|
||||
|
||||
+139
-50
@@ -6,7 +6,7 @@ import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.common.ColorMap;
|
||||
import com.sap.sse.common.Color;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.common.Util.Triple;
|
||||
import com.sap.sse.common.impl.HSVColor;
|
||||
|
||||
|
||||
@@ -24,24 +24,60 @@ public class ColorMapImpl<T> implements ColorMap<T> {
|
||||
private int colorCounter;
|
||||
|
||||
private HSVColor[] baseColors;
|
||||
|
||||
/**
|
||||
* Used for blocking a range of colors around each color in {@link ColorMapImpl#blockedColors}
|
||||
*/
|
||||
private static final double MIN_COLOR_DISTANCE = 0.5;
|
||||
|
||||
private static final float STEP = 0.1f;
|
||||
/*
|
||||
* Number of steps were made
|
||||
*/
|
||||
private static int stepsMade = 0;
|
||||
/**
|
||||
* <p>
|
||||
* There are 3 modes of color generation.
|
||||
* </p>
|
||||
* <ul>
|
||||
* <li>Mode "0" is used for generating colors with identical brightness and saturation.</li>
|
||||
* <li>Mode "1" is used for generating colors with different saturation and the constant brightness</li>
|
||||
* <li>Mode "2" is opposite of the mode "1"</li>
|
||||
* </ul>
|
||||
*/
|
||||
private static int mode = 0;
|
||||
|
||||
/**
|
||||
* Changes from 0 to line {@link ColorMapImpl#stepsMade} cyclically
|
||||
*/
|
||||
private static int factor = 0;
|
||||
|
||||
/** a list of already used colors which should be excluded from the automatic color assignment */
|
||||
private List<HSVColor> blockedColors;
|
||||
|
||||
public ColorMapImpl() {
|
||||
baseColors = new HSVColor[9];
|
||||
baseColors[0] = new HSVColor(0.0f, 1.0f, 1.0f); // Red
|
||||
baseColors[1] = new HSVColor(30.0f, 1.0f, 1.0f); // Orange
|
||||
baseColors[2] = new HSVColor(45.f, 1.0f, 1.0f);
|
||||
baseColors[3] = new HSVColor(120.0f, 1.0f, 0.8f); // Green
|
||||
baseColors[4] = new HSVColor(200.0f, 1.0f, 1.0f); // Cyan
|
||||
baseColors[5] = new HSVColor(285.0f, 1.0f, 1.0f);
|
||||
baseColors[6] = new HSVColor(270.0f, 1.0f, 1.0f); // Pink
|
||||
baseColors[7] = new HSVColor(300.0f, 1.0f, 1.0f); // Magenta
|
||||
baseColors[8] = new HSVColor(330.0f, 1.0f, 1.0f);
|
||||
|
||||
idColor = new HashMap<T, Color>();
|
||||
blockedColors = new ArrayList<HSVColor>();
|
||||
public ColorMapImpl(Color... initialBlockedColors) {
|
||||
baseColors = insertBaseColors();
|
||||
idColor = new HashMap<>();
|
||||
blockedColors = new ArrayList<>();
|
||||
for (Color initialBlockedColor : initialBlockedColors) {
|
||||
blockedColors.add(convertFromColorToHSV(initialBlockedColor));
|
||||
}
|
||||
}
|
||||
|
||||
private HSVColor[] insertBaseColors() {
|
||||
final HSVColor[] result = new HSVColor[] {
|
||||
new HSVColor(0, 1, 1), // Red
|
||||
new HSVColor(30, 1, 1), // Orange
|
||||
new HSVColor(45, 1, 1),
|
||||
new HSVColor(120, 1, 1), // Green
|
||||
new HSVColor(160, 1, 1),
|
||||
new HSVColor(190, 1, 1),
|
||||
new HSVColor(240, 1, 1), // Blue
|
||||
new HSVColor(270, 1, 1), // Pink
|
||||
new HSVColor(285, 1, 1),
|
||||
new HSVColor(300, 1, 1), // Magenta
|
||||
new HSVColor(330, 1, 1) };
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -53,28 +89,54 @@ public class ColorMapImpl<T> implements ColorMap<T> {
|
||||
* @return A color in hex/html-format (e.g. #ff0000)
|
||||
*/
|
||||
public Color getColorByID(T object) {
|
||||
final Color result;
|
||||
Color color = idColor.get(object);
|
||||
if (color == null) {
|
||||
color = createHexColor(colorCounter++);
|
||||
idColor.put(object, color);
|
||||
HSVColor newColor;
|
||||
do {
|
||||
newColor = generateColor(colorCounter++);
|
||||
} while (isContainColor(blockedColors, newColor));
|
||||
idColor.put(object, newColor);
|
||||
result = newColor;
|
||||
} else {
|
||||
result = color;
|
||||
}
|
||||
return color;
|
||||
return result;
|
||||
}
|
||||
|
||||
private boolean isColorsClose(HSVColor blockedColor, HSVColor newColor) {
|
||||
double distanceHue = Math.abs(blockedColor.getHue() - newColor.getHue());
|
||||
distanceHue = Math.min(distanceHue, 360 - distanceHue) / 180;
|
||||
double distanceSaturation = Math.abs(blockedColor.getSaturation() - newColor.getSaturation());
|
||||
double distanceBrightness = Math.abs(blockedColor.getBrightness() - newColor.getBrightness());
|
||||
double distance = Math.sqrt(distanceHue * distanceHue + distanceSaturation * distanceSaturation
|
||||
+ distanceBrightness * distanceBrightness);
|
||||
return distance < MIN_COLOR_DISTANCE;
|
||||
}
|
||||
|
||||
private boolean isContainColor(List<HSVColor> colors, HSVColor color) {
|
||||
for (HSVColor colorFromColors : colors) {
|
||||
if (isColorsClose(colorFromColors, color)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean addBlockedColor(Color color) {
|
||||
boolean result = false;
|
||||
if(color != null) {
|
||||
Util.Triple<Float, Float, Float> asHSV = color.getAsHSV();
|
||||
result = blockedColors.add(new HSVColor(asHSV.getA(), asHSV.getB(), asHSV.getC()));
|
||||
final boolean result;
|
||||
if (color != null && !blockedColors.contains(color)) {
|
||||
result = blockedColors.add(convertFromColorToHSV(color));
|
||||
} else {
|
||||
result = false;
|
||||
}
|
||||
return result;
|
||||
return result;
|
||||
}
|
||||
|
||||
public boolean removeBlockedColor(Color color) {
|
||||
boolean result = false;
|
||||
if(color != null) {
|
||||
Util.Triple<Float, Float, Float> asHSV = color.getAsHSV();
|
||||
result = blockedColors.remove(new HSVColor(asHSV.getA(), asHSV.getB(), asHSV.getC()));
|
||||
if (color != null) {
|
||||
result = blockedColors.remove(convertFromColorToHSV(color));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -82,42 +144,69 @@ public class ColorMapImpl<T> implements ColorMap<T> {
|
||||
public void clearBlockedColors() {
|
||||
blockedColors.clear();
|
||||
}
|
||||
|
||||
private static HSVColor convertFromColorToHSV(Color color) {
|
||||
Triple<Float, Float, Float> hsvColor = color.getAsHSV();
|
||||
return new HSVColor(hsvColor.getA(), hsvColor.getB(), hsvColor.getC());
|
||||
}
|
||||
|
||||
/**
|
||||
* Generator uses cyclic algorithm for generating colors. We have the array {@link ColorMapImpl#baseColors} and goes
|
||||
* through it cyclically. When a cycle starts from the beginning again then increase {@link ColorMapImpl#stepsMade}
|
||||
* that is used for getting new shade of basic colors and combining it with the previous ones.
|
||||
*
|
||||
* Only use this if you don't want the color to be cached.
|
||||
*
|
||||
* @param index
|
||||
* The index of e.g. a competitor. Make sure, that each competitor has a unique index.
|
||||
* @return A color computed using the {@code index}.
|
||||
* @author Stsiapan_Tsybulski
|
||||
*/
|
||||
private Color createHexColor(int index) {
|
||||
int baseColorCount = baseColors.length;
|
||||
int baseColorsIndex = index % baseColorCount;
|
||||
int factor = index / (baseColorCount*3);
|
||||
float decreaseStepSize = 0.075f;
|
||||
|
||||
float brightnessDecrease = 0;
|
||||
float saturationDecrease = 0;
|
||||
int mod3 = index % 3;
|
||||
switch(mod3) {
|
||||
private HSVColor generateColor(int index) {
|
||||
int baseColorsCount = baseColors.length;
|
||||
int currentColorIndex = index % baseColorsCount;
|
||||
float saturationDecrease = STEP;
|
||||
float brightnessDecrease = STEP;
|
||||
switch (mode) {
|
||||
case 0:
|
||||
brightnessDecrease = 0.0f;
|
||||
saturationDecrease = 0.0f;
|
||||
break;
|
||||
saturationDecrease = brightnessDecrease *= stepsMade;
|
||||
break;
|
||||
case 1:
|
||||
brightnessDecrease = decreaseStepSize;
|
||||
saturationDecrease = 0.0f;
|
||||
break;
|
||||
saturationDecrease *= factor;
|
||||
brightnessDecrease *= stepsMade;
|
||||
break;
|
||||
case 2:
|
||||
brightnessDecrease = 0.0f;
|
||||
saturationDecrease = decreaseStepSize;
|
||||
break;
|
||||
brightnessDecrease *= factor;
|
||||
saturationDecrease *= stepsMade;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
brightnessDecrease = factor * decreaseStepSize + brightnessDecrease;
|
||||
saturationDecrease = factor * decreaseStepSize + saturationDecrease;
|
||||
HSVColor hsvColor = baseColors[baseColorsIndex];
|
||||
HSVColor newColor = new HSVColor(hsvColor.getHue(), hsvColor.getSaturation() - saturationDecrease,
|
||||
if ((index + 1) % baseColorsCount == 0) {
|
||||
factor++;
|
||||
switch (mode) {
|
||||
case 0:
|
||||
stepsMade++;
|
||||
mode = 1;
|
||||
factor = 0;
|
||||
break;
|
||||
case 1:
|
||||
if (factor == stepsMade) {
|
||||
mode = 2;
|
||||
factor = 0;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (factor == stepsMade) {
|
||||
mode = 0;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
HSVColor hsvColor = baseColors[currentColorIndex];
|
||||
return new HSVColor(hsvColor.getHue(), hsvColor.getSaturation() - saturationDecrease,
|
||||
hsvColor.getBrightness() - brightnessDecrease);
|
||||
return newColor;
|
||||
}
|
||||
}
|
||||
+1
@@ -14,6 +14,7 @@ public enum Flags {
|
||||
INDIA,
|
||||
INDIA_ZULU, // the flag combination of I+Z flown at the same time
|
||||
NOVEMBER,
|
||||
OSCAR,
|
||||
PAPA,
|
||||
UNIFORM,
|
||||
XRAY,
|
||||
|
||||
+1
@@ -11,6 +11,7 @@ import java.util.List;
|
||||
public enum RacingProcedureType {
|
||||
UNKNOWN("Unknown"),
|
||||
RRS26("Fix Line Start (RRS26)"),
|
||||
SWC("Sailing World Cup Start"),
|
||||
GateStart("Gate Start"),
|
||||
ESS("\"Extreme Sailing Series\"-Start"),
|
||||
BASIC("Basic Countdown Start"),
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:20:30Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.domain.racelogtrackingadapter/resources/stringmessages/TrackingStringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:56:08Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.domain.racelogtrackingadapter/resources/stringmessages/TrackingStringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="cdbdcb19e10086d34f715e2a7da26eef" form="base64">H4sIAAAAAAAAAF2RTU/DMAyG7/0VvnGZEGekHgYSUiVgY+3gnLXeajWNo9jbqBD/naQtbOLm+PXH+zgaTN2ROxTuRGqU2D1xyKs5C5c07DlkUhv3tnnkBlfhnYR0G2zFGzyQKIal5C+mQ5BjQBj4CK05IWiL8HX3DUvvgZyosRabW6hadJDmjQV7tpbPaeM0HjhAbanuRtWS6+AoSY5jA0hvgvqWXZzOEOb1YCQ7o625x4rzjymKBRmtyq1gkLzU2AfxmcxkxjWBqbmWllNqkm2c6SL7Ce0wwlYtyXO0khf7Ec9EzICmSb40atAbssATUYMnqhHOpO34TvjGpvLhcoYFCPXeDjPrDuMREpIkN/fZ7shDha7BkKcQdIwz432pHLCYxlT4qclSw+5GLzdPCwfUBXiLRvB36X1qL1jyuftyDu9n/D/p+hzJwDqSxm/2/tX0mJfLNZSROOE/JHuTnEnMFa6kQ6v/S2HOZz95rIJYdwIAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:22:32Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.domain.racelogtrackingadapter/resources/stringmessages/TrackingStringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:56:08Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.domain.racelogtrackingadapter/resources/stringmessages/TrackingStringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="cdbdcb19e10086d34f715e2a7da26eef" form="base64">H4sIAAAAAAAAAF2RTU/DMAyG7/0VvnGZEGekHgYSUiVgY+3gnLXeajWNo9jbqBD/naQtbOLm+PXH+zgaTN2ROxTuRGqU2D1xyKs5C5c07DlkUhv3tnnkBlfhnYR0G2zFGzyQKIal5C+mQ5BjQBj4CK05IWiL8HX3DUvvgZyosRabW6hadJDmjQV7tpbPaeM0HjhAbanuRtWS6+AoSY5jA0hvgvqWXZzOEOb1YCQ7o625x4rzjymKBRmtyq1gkLzU2AfxmcxkxjWBqbmWllNqkm2c6SL7Ce0wwlYtyXO0khf7Ec9EzICmSb40atAbssATUYMnqhHOpO34TvjGpvLhcoYFCPXeDjPrDuMREpIkN/fZ7shDha7BkKcQdIwz432pHLCYxlT4qclSw+5GLzdPCwfUBXiLRvB36X1qL1jyuftyDu9n/D/p+hzJwDqSxm/2/tX0mJfLNZSROOE/JHuTnEnMFa6kQ6v/S2HOZz95rIJYdwIAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:24:24Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.domain.racelogtrackingadapter/resources/stringmessages/TrackingStringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:56:08Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.domain.racelogtrackingadapter/resources/stringmessages/TrackingStringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="cdbdcb19e10086d34f715e2a7da26eef" form="base64">H4sIAAAAAAAAAF2RTU/DMAyG7/0VvnGZEGekHgYSUiVgY+3gnLXeajWNo9jbqBD/naQtbOLm+PXH+zgaTN2ROxTuRGqU2D1xyKs5C5c07DlkUhv3tnnkBlfhnYR0G2zFGzyQKIal5C+mQ5BjQBj4CK05IWiL8HX3DUvvgZyosRabW6hadJDmjQV7tpbPaeM0HjhAbanuRtWS6+AoSY5jA0hvgvqWXZzOEOb1YCQ7o625x4rzjymKBRmtyq1gkLzU2AfxmcxkxjWBqbmWllNqkm2c6SL7Ce0wwlYtyXO0khf7Ec9EzICmSb40atAbssATUYMnqhHOpO34TvjGpvLhcoYFCPXeDjPrDuMREpIkN/fZ7shDha7BkKcQdIwz432pHLCYxlT4qclSw+5GLzdPCwfUBXiLRvB36X1qL1jyuftyDu9n/D/p+hzJwDqSxm/2/tX0mJfLNZSROOE/JHuTnEnMFa6kQ6v/S2HOZz95rIJYdwIAAA==</internal-file>
|
||||
|
||||
@@ -26,8 +26,10 @@ Export-Package: com.sap.sailing.domain.abstractlog,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.league,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.league.impl,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line,
|
||||
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl,
|
||||
com.sap.sailing.domain.abstractlog.race.tracking,
|
||||
com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl,
|
||||
com.sap.sailing.domain.abstractlog.race.tracking.impl,
|
||||
|
||||
-3
@@ -61,7 +61,4 @@ public class RRS26StartModeFlagFinder extends RaceLogAnalyzer<Flags> {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
+64
@@ -0,0 +1,64 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.analyzing.impl;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLog;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
|
||||
public class SWCStartModeFlagFinder extends RaceLogAnalyzer<Flags> {
|
||||
|
||||
private final static List<Flags> defaultStartModeFlags = Arrays.asList(Flags.BLACK, Flags.UNIFORM);
|
||||
|
||||
private final RacingProcedureTypeAnalyzer procedureAnalyzer;
|
||||
private final List<Flags> startModeFlags;
|
||||
|
||||
/**
|
||||
* Searches for the start mode flag of a SWC race.
|
||||
*
|
||||
* @param procedureAnalyzer
|
||||
* to be used to ensure a SWC race. Must operate on the same race log. Otherwise a
|
||||
* {@link IllegalArgumentException} is thrown.
|
||||
*/
|
||||
public SWCStartModeFlagFinder(RacingProcedureTypeAnalyzer procedureAnalyzer, RaceLog raceLog) {
|
||||
this(procedureAnalyzer, raceLog, defaultStartModeFlags);
|
||||
}
|
||||
|
||||
public SWCStartModeFlagFinder(RacingProcedureTypeAnalyzer procedureAnalyzer, RaceLog raceLog, List<Flags> startModeFlags) {
|
||||
super(raceLog);
|
||||
if (raceLog != procedureAnalyzer.getLog()) {
|
||||
throw new IllegalArgumentException("Both analyzers must operate on the same race log.");
|
||||
}
|
||||
this.procedureAnalyzer = procedureAnalyzer;
|
||||
this.startModeFlags = startModeFlags;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Flags performAnalysis() {
|
||||
RacingProcedureType type = procedureAnalyzer.analyze();
|
||||
if (!RacingProcedureType.SWC.equals(type)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
for (RaceLogEvent event : getPassEventsDescending()) {
|
||||
if (event instanceof RaceLogFlagEvent) {
|
||||
RaceLogFlagEvent flagEvent = (RaceLogFlagEvent) event;
|
||||
if (isStartModeFlagEvent(flagEvent)) {
|
||||
return flagEvent.getUpperFlag();
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private boolean isStartModeFlagEvent(RaceLogFlagEvent event) {
|
||||
// no matter if displayed or removed
|
||||
if (event.getLowerFlag().equals(Flags.NONE)) {
|
||||
return startModeFlags.contains(event.getUpperFlag());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+6
-1
@@ -8,7 +8,12 @@ public enum RaceStateEvents {
|
||||
RRS26_CLASS_UP,
|
||||
RRS26_STARTMODE_UP,
|
||||
RRS26_STARTMODE_DOWN,
|
||||
|
||||
|
||||
SWC_CLASS_OVER_OSCAR_UP,
|
||||
SWC_STARTMODE_UP,
|
||||
SWC_STARTMODE_DOWN,
|
||||
SWC_CLASS_OVER_OSCAR_DOWN,
|
||||
|
||||
ESS_AP_DOWN,
|
||||
ESS_THREE_UP,
|
||||
ESS_TWO_UP,
|
||||
|
||||
+3
-3
@@ -2,7 +2,7 @@ package com.sap.sailing.domain.abstractlog.race.state.racingprocedure;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.GateLaunchTimePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.PathfinderPrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl.StartmodePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.StartModePrerequisite;
|
||||
|
||||
/**
|
||||
* Something that has to be fulfilled before the race can start (e.g. decide which start mode flag is shown).
|
||||
@@ -11,7 +11,7 @@ public interface RacingProcedurePrerequisite {
|
||||
|
||||
/**
|
||||
* In charge of fulfilling all {@link RacingProcedurePrerequisite}. Implementations must call the
|
||||
* {@link RacingProcedurePrerequisite} "fulfill" (or {@link RacingProcedurePrerequisite#fulfillWithDefault()}
|
||||
* {@link RacingProcedurePrerequisite#resolve(Resolver)} or {@link RacingProcedurePrerequisite#fulfillWithDefault()}
|
||||
* methods to let the framework decide whether there are more prerequisites or the race can start.
|
||||
*/
|
||||
public interface Resolver {
|
||||
@@ -24,7 +24,7 @@ public interface RacingProcedurePrerequisite {
|
||||
|
||||
void fulfill(GateLaunchTimePrerequisite prerequisite);
|
||||
|
||||
void fulfill(StartmodePrerequisite prerequisite);
|
||||
void fulfill(StartModePrerequisite prerequisite);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+6
-6
@@ -33,7 +33,7 @@ import com.sap.sse.common.Util;
|
||||
|
||||
public class GateStartRacingProcedureImpl extends BaseRacingProcedure implements GateStartRacingProcedure {
|
||||
|
||||
private final static long startPhaseClassOverGolfUpIntervall = 8 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
private final static long startPhaseClassOverGolfUpInterval = 8 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
private final static long startPhasePapaUpInterval = 4 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
private final static long startPhasePapaDownInterval = 1 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
|
||||
@@ -99,7 +99,7 @@ public class GateStartRacingProcedureImpl extends BaseRacingProcedure implements
|
||||
public boolean isStartphaseActive(TimePoint startTime, TimePoint now) {
|
||||
if (now.before(startTime)) {
|
||||
long timeTillStart = startTime.minus(now.asMillis()).asMillis();
|
||||
return timeTillStart < startPhaseClassOverGolfUpIntervall;
|
||||
return timeTillStart < startPhaseClassOverGolfUpInterval;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -121,7 +121,7 @@ public class GateStartRacingProcedureImpl extends BaseRacingProcedure implements
|
||||
@Override
|
||||
protected Collection<RaceStateEvent> createStartStateEvents(TimePoint startTime) {
|
||||
return Arrays.<RaceStateEvent> asList(
|
||||
new RaceStateEventImpl(startTime.minus(startPhaseClassOverGolfUpIntervall),
|
||||
new RaceStateEventImpl(startTime.minus(startPhaseClassOverGolfUpInterval),
|
||||
RaceStateEvents.GATE_CLASS_OVER_GOLF_UP),
|
||||
new RaceStateEventImpl(startTime.minus(startPhasePapaUpInterval), RaceStateEvents.GATE_PAPA_UP),
|
||||
new RaceStateEventImpl(startTime.minus(startPhasePapaDownInterval), RaceStateEvents.GATE_PAPA_DOWN),
|
||||
@@ -153,13 +153,13 @@ public class GateStartRacingProcedureImpl extends BaseRacingProcedure implements
|
||||
public FlagPoleState getActiveFlags(TimePoint startTime, TimePoint now) {
|
||||
Flags classFlag = getConfiguration().getClassFlag() != null ? getConfiguration().getClassFlag() : Flags.CLASS;
|
||||
TimePoint gateShutdownTime = getGateShutdownTimePoint(startTime);
|
||||
if (now.before(startTime.minus(startPhaseClassOverGolfUpIntervall))) {
|
||||
if (now.before(startTime.minus(startPhaseClassOverGolfUpInterval))) {
|
||||
return new FlagPoleState(Arrays.asList(new FlagPole(classFlag, Flags.GOLF, false), new FlagPole(Flags.PAPA,
|
||||
false)), null, Arrays.asList(new FlagPole(classFlag, Flags.GOLF, true), new FlagPole(Flags.PAPA,
|
||||
false)), startTime.minus(startPhaseClassOverGolfUpIntervall));
|
||||
false)), startTime.minus(startPhaseClassOverGolfUpInterval));
|
||||
} else if (now.before(startTime.minus(startPhasePapaUpInterval))) {
|
||||
return new FlagPoleState(Arrays.asList(new FlagPole(classFlag, Flags.GOLF, true), new FlagPole(Flags.PAPA,
|
||||
false)), startTime.minus(startPhaseClassOverGolfUpIntervall), Arrays.asList(new FlagPole(classFlag,
|
||||
false)), startTime.minus(startPhaseClassOverGolfUpInterval), Arrays.asList(new FlagPole(classFlag,
|
||||
Flags.GOLF, true), new FlagPole(Flags.PAPA, true)), startTime.minus(startPhasePapaUpInterval));
|
||||
} else if (now.before(startTime.minus(startPhasePapaDownInterval))) {
|
||||
return new FlagPoleState(Arrays.asList(new FlagPole(classFlag, Flags.GOLF, true), new FlagPole(Flags.PAPA,
|
||||
|
||||
+2
-4
@@ -4,7 +4,7 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProce
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.Resolver;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.GateLaunchTimePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.PathfinderPrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl.StartmodePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.StartModePrerequisite;
|
||||
|
||||
/**
|
||||
* Always calls {@link RacingProcedurePrerequisite#fulfillWithDefault()}.
|
||||
@@ -22,13 +22,11 @@ public class RacingProcedurePrerequisiteAutoResolver implements Resolver {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fulfill(StartmodePrerequisite prerequisite) {
|
||||
public void fulfill(StartModePrerequisite prerequisite) {
|
||||
prerequisite.fulfillWithDefault();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFulfilled() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+4
-1
@@ -12,7 +12,8 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.basic.impl.
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess.impl.ESSRacingProcedureImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.GateStartRacingProcedureImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.league.impl.LeagueRacingProcedureImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl.RRS26RacingProcedureImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.RRS26RacingProcedureImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.SWCRacingProcedureImpl;
|
||||
import com.sap.sailing.domain.base.configuration.ConfigurationLoader;
|
||||
import com.sap.sailing.domain.base.configuration.RegattaConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
@@ -47,6 +48,8 @@ public class ReadonlyRacingProcedureFactory implements RacingProcedureFactory {
|
||||
loadedConfiguration.getGateStartConfiguration(), raceLogResolver);
|
||||
case RRS26:
|
||||
return new RRS26RacingProcedureImpl(raceLog, author, loadedConfiguration.getRRS26Configuration(), raceLogResolver);
|
||||
case SWC:
|
||||
return new SWCRacingProcedureImpl(raceLog, author, loadedConfiguration.getSWCStartConfiguration(), raceLogResolver);
|
||||
case BASIC:
|
||||
return new BasicRacingProcedureImpl(raceLog, author, loadedConfiguration.getBasicConfiguration(), raceLogResolver);
|
||||
case LEAGUE:
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
/**
|
||||
* A racing procedure for the typical line start as described in the 'Racing Rules of Sailing' (RRS)
|
||||
* published by the World Sailing association.
|
||||
* @author Frank
|
||||
*
|
||||
*/
|
||||
public interface ConfigurableStartModeFlagRacingProcedure extends RacingProcedure {
|
||||
|
||||
void addChangedListener(LineStartChangedListener listener);
|
||||
|
||||
ConfigurableStartModeFlagRacingProcedureConfiguration getConfiguration();
|
||||
|
||||
Flags getStartModeFlag();
|
||||
|
||||
Flags getDefaultStartMode();
|
||||
|
||||
void setStartModeFlag(TimePoint timePoint, Flags startMode);
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
|
||||
|
||||
public interface LineStartChangedListener extends RacingProcedureChangedListener {
|
||||
|
||||
void onStartModeChanged(ConfigurableStartModeFlagRacingProcedure racingProcedure);
|
||||
|
||||
}
|
||||
+2
-9
@@ -1,17 +1,10 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26;
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ReadonlyRacingProcedure;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public interface ReadonlyRRS26RacingProcedure extends ReadonlyRacingProcedure {
|
||||
|
||||
public interface RRS26RacingProcedure extends ConfigurableStartModeFlagRacingProcedure {
|
||||
public final static Flags DefaultStartMode = Flags.PAPA;
|
||||
|
||||
void addChangedListener(RRS26ChangedListener listener);
|
||||
|
||||
RRS26Configuration getConfiguration();
|
||||
|
||||
Flags getStartModeFlag();
|
||||
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public interface SWCRacingProcedure extends ConfigurableStartModeFlagRacingProcedure {
|
||||
|
||||
public final static Flags DefaultStartMode = Flags.UNIFORM;
|
||||
|
||||
SWCStartConfiguration getConfiguration();
|
||||
}
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLog;
|
||||
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartChangedListener;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
|
||||
public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseRacingProcedure implements ConfigurableStartModeFlagRacingProcedure {
|
||||
|
||||
public ConfigurableStartModeFlagRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
RacingProcedureConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
super(raceLog, author, configuration, raceLogResolver);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RacingProcedureChangedListeners<? extends RacingProcedureChangedListener> createChangedListenerContainer() {
|
||||
return new LineStartChangedListeners();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected LineStartChangedListeners getChangedListeners() {
|
||||
return (LineStartChangedListeners) super.getChangedListeners();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addChangedListener(LineStartChangedListener listener) {
|
||||
getChangedListeners().add(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConfigurableStartModeFlagRacingProcedureConfiguration getConfiguration() {
|
||||
return (ConfigurableStartModeFlagRacingProcedureConfiguration) super.getConfiguration();
|
||||
}
|
||||
}
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartChangedListener;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
|
||||
public class LineStartChangedListeners extends RacingProcedureChangedListeners<LineStartChangedListener> implements
|
||||
LineStartChangedListener {
|
||||
|
||||
@Override
|
||||
public void onStartModeChanged(ConfigurableStartModeFlagRacingProcedure racingProcedure) {
|
||||
for (LineStartChangedListener listener : getListeners()) {
|
||||
listener.onStartModeChanged(racingProcedure);
|
||||
}
|
||||
}
|
||||
}
|
||||
+11
-25
@@ -1,4 +1,4 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
@@ -14,21 +14,17 @@ import com.sap.sailing.domain.abstractlog.race.state.RaceStateEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEventImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEvents;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.FulfillmentFunction;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.NoMorePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26ChangedListener;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.RRS26RacingProcedure;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.common.racelog.FlagPole;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS26RacingProcedure {
|
||||
public class RRS26RacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements RRS26RacingProcedure {
|
||||
|
||||
private final static long startPhaseClassUpInterval = 5 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
private final static long startPhaseStartModeUpInterval = 4 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
@@ -87,7 +83,7 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
|
||||
public RacingProcedurePrerequisite checkPrerequisitesForStart(TimePoint now, TimePoint startTime,
|
||||
FulfillmentFunction function) {
|
||||
if (startTime.minus(startPhaseStartModeUpInterval).before(now) && !startmodeFlagHasBeenSet) {
|
||||
return new StartmodePrerequisite(function, this, now, startTime);
|
||||
return new StartModePrerequisite(function, this, now, startTime);
|
||||
}
|
||||
return new NoMorePrerequisite(function);
|
||||
}
|
||||
@@ -177,21 +173,6 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RacingProcedureChangedListeners<? extends RacingProcedureChangedListener> createChangedListenerContainer() {
|
||||
return new RRS26ChangedListeners();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RRS26ChangedListeners getChangedListeners() {
|
||||
return (RRS26ChangedListeners) super.getChangedListeners();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addChangedListener(RRS26ChangedListener listener) {
|
||||
getChangedListeners().add(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setStartModeFlag(TimePoint timePoint, Flags startMode) {
|
||||
raceLog.add(new RaceLogFlagEventImpl(timePoint, author, raceLog.getCurrentPassId(), startMode, Flags.NONE, true));
|
||||
@@ -201,7 +182,12 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
|
||||
public Flags getStartModeFlag() {
|
||||
return cachedStartmodeFlag;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Flags getDefaultStartMode() {
|
||||
return RRS26RacingProcedure.DefaultStartMode;
|
||||
}
|
||||
|
||||
public boolean startmodeFlagHasBeenSet() {
|
||||
return startmodeFlagHasBeenSet;
|
||||
}
|
||||
@@ -212,7 +198,7 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
|
||||
if (startmodeFlag != null && (!startmodeFlag.equals(cachedStartmodeFlag) || !startmodeFlagHasBeenSet)) {
|
||||
cachedStartmodeFlag = startmodeFlag;
|
||||
startmodeFlagHasBeenSet = true;
|
||||
getChangedListeners().onStartmodeChanged(this);
|
||||
getChangedListeners().onStartModeChanged(this);
|
||||
}
|
||||
super.update();
|
||||
}
|
||||
+194
@@ -0,0 +1,194 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
|
||||
import com.sap.sailing.domain.abstractlog.race.RaceLog;
|
||||
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
|
||||
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RacingProcedureTypeAnalyzer;
|
||||
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.SWCStartModeFlagFinder;
|
||||
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogFlagEventImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.RaceStateEvent;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEventImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEvents;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.FulfillmentFunction;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.NoMorePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.SWCRacingProcedure;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.FlagPole;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements SWCRacingProcedure {
|
||||
|
||||
private final static long CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL = 6 * 60 * 1000; // 6 minutes before start
|
||||
private final static long CLASS_OVER_OSCAR_AND_STARTMODE_DOWN_INTERVAL = 1 * 60 * 1000; // 1 minute after start
|
||||
|
||||
private final SWCStartModeFlagFinder startModeFlagAnalyzer;
|
||||
|
||||
private Flags cachedStartmodeFlag;
|
||||
private boolean startmodeFlagHasBeenSet;
|
||||
|
||||
public SWCRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
SWCStartConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
super(raceLog, author, configuration, raceLogResolver);
|
||||
|
||||
RacingProcedureTypeAnalyzer procedureAnalyzer = new RacingProcedureTypeAnalyzer(raceLog);
|
||||
if (configuration.getStartModeFlags() != null) {
|
||||
this.startModeFlagAnalyzer = new SWCStartModeFlagFinder(procedureAnalyzer, raceLog, configuration.getStartModeFlags());
|
||||
} else {
|
||||
this.startModeFlagAnalyzer = new SWCStartModeFlagFinder(procedureAnalyzer, raceLog);
|
||||
}
|
||||
|
||||
this.cachedStartmodeFlag = SWCRacingProcedure.DefaultStartMode;
|
||||
this.startmodeFlagHasBeenSet = false;
|
||||
|
||||
update();
|
||||
}
|
||||
|
||||
@Override
|
||||
public RacingProcedureType getType() {
|
||||
return RacingProcedureType.SWC;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasIndividualRecall() {
|
||||
boolean hasRecall = super.hasIndividualRecall();
|
||||
if (!hasRecall) {
|
||||
return false;
|
||||
} else if (startmodeFlagHasBeenSet) {
|
||||
return cachedStartmodeFlag != Flags.BLACK;
|
||||
} else {
|
||||
return hasRecall;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean hasIndividualRecallByDefault() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Boolean isResultEntryEnabledByDefault() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RacingProcedurePrerequisite checkPrerequisitesForStart(TimePoint now, TimePoint startTime,
|
||||
FulfillmentFunction function) {
|
||||
return new NoMorePrerequisite(function);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isStartphaseActive(TimePoint startTime, TimePoint now) {
|
||||
return now.before(startTime.minus(CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Collection<RaceStateEvent> createStartStateEvents(TimePoint startTime) {
|
||||
return Arrays.<RaceStateEvent> asList(
|
||||
new RaceStateEventImpl(startTime.minus(CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_CLASS_OVER_OSCAR_UP),
|
||||
new RaceStateEventImpl(startTime.minus(CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_STARTMODE_UP),
|
||||
new RaceStateEventImpl(startTime, RaceStateEvents.START),
|
||||
new RaceStateEventImpl(startTime.plus(CLASS_OVER_OSCAR_AND_STARTMODE_DOWN_INTERVAL), RaceStateEvents.SWC_STARTMODE_DOWN),
|
||||
new RaceStateEventImpl(startTime.plus(CLASS_OVER_OSCAR_AND_STARTMODE_DOWN_INTERVAL), RaceStateEvents.SWC_CLASS_OVER_OSCAR_DOWN));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean processStateEvent(RaceStateEvent event) {
|
||||
switch (event.getEventName()) {
|
||||
case SWC_STARTMODE_UP:
|
||||
if (!startmodeFlagHasBeenSet) {
|
||||
setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag);
|
||||
}
|
||||
case SWC_CLASS_OVER_OSCAR_UP:
|
||||
case SWC_STARTMODE_DOWN:
|
||||
case SWC_CLASS_OVER_OSCAR_DOWN:
|
||||
getChangedListeners().onActiveFlagsChanged(this);
|
||||
return true;
|
||||
default:
|
||||
return super.processStateEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FlagPoleState getActiveFlags(TimePoint startTime, TimePoint now) {
|
||||
Flags classFlag = getConfiguration().getClassFlag() != null ?
|
||||
getConfiguration().getClassFlag() : Flags.CLASS;
|
||||
|
||||
if (now.before(startTime.minus(CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, false), new FlagPole(cachedStartmodeFlag, false)),
|
||||
null,
|
||||
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, true), new FlagPole(cachedStartmodeFlag, true)),
|
||||
startTime.minus(CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL));
|
||||
} else if (now.before(startTime.plus(CLASS_OVER_OSCAR_AND_STARTMODE_DOWN_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, true), new FlagPole(cachedStartmodeFlag, true)),
|
||||
startTime.minus(CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(classFlag, Flags.OSCAR, false), new FlagPole(cachedStartmodeFlag, false)),
|
||||
startTime.plus(CLASS_OVER_OSCAR_AND_STARTMODE_DOWN_INTERVAL));
|
||||
} else {
|
||||
if (isIndividualRecallDisplayed(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.XRAY, true)),
|
||||
getIndividualRecallDisplayedTime(),
|
||||
Arrays.asList(new FlagPole(Flags.XRAY, false)),
|
||||
getIndividualRecallRemovalTime());
|
||||
} else if (isFinished(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, false)), getFinishedTime());
|
||||
} else if (isInFinishingPhase(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, true)),
|
||||
getFinishingTime(),
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, false)),
|
||||
null);
|
||||
} else {
|
||||
TimePoint recallRemoved = getIndividualRecallRemovalTime();
|
||||
return new FlagPoleState(Collections.<FlagPole>emptyList(), recallRemoved == null ? startTime : recallRemoved);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setStartModeFlag(TimePoint timePoint, Flags startMode) {
|
||||
raceLog.add(new RaceLogFlagEventImpl(timePoint, author, raceLog.getCurrentPassId(), startMode, Flags.NONE, true));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flags getStartModeFlag() {
|
||||
return cachedStartmodeFlag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Flags getDefaultStartMode() {
|
||||
return SWCRacingProcedure.DefaultStartMode;
|
||||
}
|
||||
|
||||
public boolean startmodeFlagHasBeenSet() {
|
||||
return startmodeFlagHasBeenSet;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void update() {
|
||||
Flags startmodeFlag = startModeFlagAnalyzer.analyze();
|
||||
if (startmodeFlag != null && (!startmodeFlag.equals(cachedStartmodeFlag) || !startmodeFlagHasBeenSet)) {
|
||||
cachedStartmodeFlag = startmodeFlag;
|
||||
startmodeFlagHasBeenSet = true;
|
||||
getChangedListeners().onStartModeChanged(this);
|
||||
}
|
||||
super.update();
|
||||
}
|
||||
|
||||
@Override
|
||||
public SWCStartConfiguration getConfiguration() {
|
||||
return (SWCStartConfiguration) super.getConfiguration();
|
||||
}
|
||||
|
||||
}
|
||||
+11
-7
@@ -1,14 +1,15 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public class StartmodePrerequisite extends BaseRRS26Prerequisite implements RacingProcedurePrerequisite {
|
||||
public class StartModePrerequisite extends BaseRacingProcedurePrerequisite implements RacingProcedurePrerequisite {
|
||||
|
||||
public StartmodePrerequisite(FulfillmentFunction function, RRS26RacingProcedure procedure, TimePoint originalNow,
|
||||
TimePoint originalStartTime) {
|
||||
public StartModePrerequisite(FulfillmentFunction function, ConfigurableStartModeFlagRacingProcedure procedure,
|
||||
TimePoint originalNow, TimePoint originalStartTime) {
|
||||
super(function, procedure, originalNow, originalStartTime);
|
||||
}
|
||||
|
||||
@@ -24,7 +25,10 @@ public class StartmodePrerequisite extends BaseRRS26Prerequisite implements Raci
|
||||
|
||||
@Override
|
||||
public void fulfillWithDefault() {
|
||||
fulfill(RRS26RacingProcedure.DefaultStartMode);
|
||||
fulfill(getProcedure().getDefaultStartMode());
|
||||
}
|
||||
|
||||
protected ConfigurableStartModeFlagRacingProcedure getProcedure() {
|
||||
return (ConfigurableStartModeFlagRacingProcedure) procedure;
|
||||
}
|
||||
|
||||
}
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
|
||||
|
||||
public interface RRS26ChangedListener extends RacingProcedureChangedListener {
|
||||
|
||||
void onStartmodeChanged(ReadonlyRRS26RacingProcedure racingProcedure);
|
||||
|
||||
}
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public interface RRS26RacingProcedure extends ReadonlyRRS26RacingProcedure, RacingProcedure {
|
||||
|
||||
void setStartModeFlag(TimePoint timePoint, Flags startMode);
|
||||
}
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
/**
|
||||
* Easy access to the {@link RRS26RacingProcedure}.
|
||||
*/
|
||||
public abstract class BaseRRS26Prerequisite extends BaseRacingProcedurePrerequisite implements RacingProcedurePrerequisite {
|
||||
|
||||
public BaseRRS26Prerequisite(FulfillmentFunction function, RRS26RacingProcedure procedure, TimePoint originalNow,
|
||||
TimePoint originalStartTime) {
|
||||
super(function, procedure, originalNow, originalStartTime);
|
||||
}
|
||||
|
||||
protected RRS26RacingProcedure getProcedure() {
|
||||
return (RRS26RacingProcedure) procedure;
|
||||
}
|
||||
|
||||
}
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
|
||||
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26ChangedListener;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.ReadonlyRRS26RacingProcedure;
|
||||
|
||||
public class RRS26ChangedListeners extends RacingProcedureChangedListeners<RRS26ChangedListener> implements
|
||||
RRS26ChangedListener {
|
||||
|
||||
@Override
|
||||
public void onStartmodeChanged(ReadonlyRRS26RacingProcedure racingProcedure) {
|
||||
for (RRS26ChangedListener listener : getListeners()) {
|
||||
listener.onStartmodeChanged(racingProcedure);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+8
-1
@@ -7,6 +7,7 @@ import com.sap.sailing.domain.base.configuration.procedures.ESSConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.GateStartConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LeagueConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.CourseDesignerMode;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
|
||||
@@ -31,7 +32,13 @@ public interface RegattaConfiguration extends Serializable, Cloneable {
|
||||
* @return <code>null</code> if there is no configuration.
|
||||
*/
|
||||
RRS26Configuration getRRS26Configuration();
|
||||
|
||||
|
||||
/**
|
||||
* Gets the configuration for SWC races.
|
||||
* @return <code>null</code> if there is no configuration.
|
||||
*/
|
||||
SWCStartConfiguration getSWCStartConfiguration();
|
||||
|
||||
/**
|
||||
* Gets the configuration for Gate Start races.
|
||||
* @return <code>null</code> if there is no configuration.
|
||||
|
||||
+2
-11
@@ -1,21 +1,12 @@
|
||||
package com.sap.sailing.domain.base.configuration.impl;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ESSConfiguration;
|
||||
|
||||
public class ESSConfigurationImpl extends RacingProcedureConfigurationImpl implements ESSConfiguration {
|
||||
|
||||
private static final long serialVersionUID = 5406098147408723197L;
|
||||
|
||||
protected ESSConfiguration copy() {
|
||||
ESSConfigurationImpl copy = (ESSConfigurationImpl) super.copy(new ESSConfigurationImpl());
|
||||
return copy;
|
||||
protected ESSConfigurationImpl newInstance() {
|
||||
return new ESSConfigurationImpl();
|
||||
}
|
||||
|
||||
@Override
|
||||
public RacingProcedureConfiguration merge(RacingProcedureConfiguration update) {
|
||||
ESSConfigurationImpl target = (ESSConfigurationImpl) super.merge(update);
|
||||
return target;
|
||||
}
|
||||
|
||||
}
|
||||
+1
@@ -18,6 +18,7 @@ public class EmptyRegattaConfiguration extends RegattaConfigurationImpl implemen
|
||||
setDefaultRacingProcedureType(RacingProcedureType.UNKNOWN);
|
||||
setDefaultCourseDesignerMode(CourseDesignerMode.UNKNOWN);
|
||||
setRRS26Configuration(new RRS26ConfigurationImpl());
|
||||
setSWCStartConfiguration(new SWCStartConfigurationImpl());
|
||||
setGateStartConfiguration(new GateStartConfigurationImpl());
|
||||
setESSConfiguration(new ESSConfigurationImpl());
|
||||
setBasicConfiguration(new RacingProcedureConfigurationImpl());
|
||||
|
||||
+7
-3
@@ -41,12 +41,16 @@ public class GateStartConfigurationImpl extends RacingProcedureConfigurationImpl
|
||||
return target;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected GateStartConfigurationImpl newInstance() {
|
||||
return new GateStartConfigurationImpl();
|
||||
}
|
||||
|
||||
protected GateStartConfiguration copy() {
|
||||
GateStartConfigurationImpl copy = (GateStartConfigurationImpl) super.copy(new GateStartConfigurationImpl());
|
||||
GateStartConfigurationImpl copy = (GateStartConfigurationImpl) super.copy();
|
||||
copy.setHasPathfinder(hasPathfinder);
|
||||
copy.setHasAdditionalGolfDownTime(hasAdditionalGolfDownTime);
|
||||
return copy;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+2
-11
@@ -1,20 +1,11 @@
|
||||
package com.sap.sailing.domain.base.configuration.impl;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LeagueConfiguration;
|
||||
|
||||
public class LeagueConfigurationImpl extends RacingProcedureConfigurationImpl implements LeagueConfiguration {
|
||||
private static final long serialVersionUID = 3625803505541394766L;
|
||||
|
||||
protected LeagueConfigurationImpl copy() {
|
||||
LeagueConfigurationImpl copy = (LeagueConfigurationImpl) super.copy(new LeagueConfigurationImpl());
|
||||
return copy;
|
||||
protected LeagueConfigurationImpl newInstance() {
|
||||
return new LeagueConfigurationImpl();
|
||||
}
|
||||
|
||||
@Override
|
||||
public RacingProcedureConfiguration merge(RacingProcedureConfiguration update) {
|
||||
LeagueConfigurationImpl target = (LeagueConfigurationImpl) super.merge(update);
|
||||
return target;
|
||||
}
|
||||
|
||||
}
|
||||
+4
-20
@@ -1,27 +1,13 @@
|
||||
package com.sap.sailing.domain.base.configuration.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public class RRS26ConfigurationImpl extends RacingProcedureConfigurationImpl implements
|
||||
RRS26Configuration {
|
||||
public class RRS26ConfigurationImpl extends RacingProcedureWithConfigurableStartModeFlagConfigurationImpl
|
||||
implements RRS26Configuration {
|
||||
|
||||
private static final long serialVersionUID = 260941807346644026L;
|
||||
|
||||
private List<Flags> startModeFlags;
|
||||
|
||||
@Override
|
||||
public List<Flags> getStartModeFlags() {
|
||||
return startModeFlags;
|
||||
}
|
||||
|
||||
public void setStartModeFlags(List<Flags> flags) {
|
||||
this.startModeFlags = flags;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RacingProcedureConfiguration merge(RacingProcedureConfiguration value) {
|
||||
RRS26Configuration update = (RRS26Configuration) value;
|
||||
@@ -32,10 +18,8 @@ public class RRS26ConfigurationImpl extends RacingProcedureConfigurationImpl imp
|
||||
return target;
|
||||
}
|
||||
|
||||
protected RRS26Configuration copy() {
|
||||
RRS26ConfigurationImpl copy = (RRS26ConfigurationImpl) super.copy(new RRS26ConfigurationImpl());
|
||||
copy.setStartModeFlags(startModeFlags);
|
||||
return copy;
|
||||
protected RRS26ConfigurationImpl newInstance() {
|
||||
return new RRS26ConfigurationImpl();
|
||||
}
|
||||
|
||||
}
|
||||
+5
-1
@@ -49,8 +49,12 @@ public class RacingProcedureConfigurationImpl implements RacingProcedureConfigur
|
||||
this.isResultEntryEnabled = isResultEntryEnabled;
|
||||
}
|
||||
|
||||
protected RacingProcedureConfigurationImpl newInstance() {
|
||||
return new RacingProcedureConfigurationImpl();
|
||||
}
|
||||
|
||||
protected RacingProcedureConfiguration copy() {
|
||||
return copy(new RacingProcedureConfigurationImpl());
|
||||
return copy(newInstance());
|
||||
}
|
||||
|
||||
protected RacingProcedureConfiguration copy(RacingProcedureConfigurationImpl target) {
|
||||
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package com.sap.sailing.domain.base.configuration.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public abstract class RacingProcedureWithConfigurableStartModeFlagConfigurationImpl extends RacingProcedureConfigurationImpl implements ConfigurableStartModeFlagRacingProcedureConfiguration {
|
||||
|
||||
private static final long serialVersionUID = 5141617199229598965L;
|
||||
|
||||
private List<Flags> startModeFlags;
|
||||
|
||||
@Override
|
||||
public List<Flags> getStartModeFlags() {
|
||||
return startModeFlags;
|
||||
}
|
||||
|
||||
public void setStartModeFlags(List<Flags> flags) {
|
||||
this.startModeFlags = flags;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RacingProcedureConfiguration merge(RacingProcedureConfiguration value) {
|
||||
ConfigurableStartModeFlagRacingProcedureConfiguration update = (ConfigurableStartModeFlagRacingProcedureConfiguration) value;
|
||||
RacingProcedureWithConfigurableStartModeFlagConfigurationImpl target = (RacingProcedureWithConfigurableStartModeFlagConfigurationImpl) super.merge(update);
|
||||
if (update.getStartModeFlags() != null) {
|
||||
target.setStartModeFlags(update.getStartModeFlags());
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
||||
protected ConfigurableStartModeFlagRacingProcedureConfiguration copy() {
|
||||
RacingProcedureWithConfigurableStartModeFlagConfigurationImpl copy = (RacingProcedureWithConfigurableStartModeFlagConfigurationImpl) super.copy();
|
||||
copy.setStartModeFlags(startModeFlags);
|
||||
return copy;
|
||||
}
|
||||
}
|
||||
+16
@@ -6,6 +6,7 @@ import com.sap.sailing.domain.base.configuration.procedures.ESSConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.GateStartConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LeagueConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.CourseDesignerMode;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
|
||||
@@ -17,6 +18,7 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
|
||||
private CourseDesignerMode defaultCourseDesignerMode;
|
||||
|
||||
private RRS26Configuration rrs26Configuration;
|
||||
private SWCStartConfiguration swcStartConfiguration;
|
||||
private GateStartConfiguration gateStartConfiguration;
|
||||
private ESSConfiguration essConfiguration;
|
||||
private LeagueConfiguration leagueConfiguration;
|
||||
@@ -49,6 +51,15 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
|
||||
this.rrs26Configuration = rrs26Configuration;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SWCStartConfiguration getSWCStartConfiguration() {
|
||||
return swcStartConfiguration;
|
||||
}
|
||||
|
||||
public void setSWCStartConfiguration(SWCStartConfiguration swcStartConfiguration) {
|
||||
this.swcStartConfiguration = swcStartConfiguration;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GateStartConfiguration getGateStartConfiguration() {
|
||||
return gateStartConfiguration;
|
||||
@@ -91,6 +102,7 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
|
||||
copy.setDefaultRacingProcedureType(defaultRacingProcedureType);
|
||||
copy.setDefaultCourseDesignerMode(defaultCourseDesignerMode);
|
||||
copy.setRRS26Configuration(rrs26Configuration);
|
||||
copy.setSWCStartConfiguration(swcStartConfiguration);
|
||||
copy.setGateStartConfiguration(gateStartConfiguration);
|
||||
copy.setESSConfiguration(essConfiguration);
|
||||
copy.setBasicConfiguration(basicConfiguration);
|
||||
@@ -112,6 +124,10 @@ public class RegattaConfigurationImpl implements RegattaConfiguration {
|
||||
target.setRRS26Configuration(
|
||||
(RRS26Configuration) target.getRRS26Configuration().merge(update.getRRS26Configuration()));
|
||||
}
|
||||
if (update.getSWCStartConfiguration() != null) {
|
||||
target.setSWCStartConfiguration(
|
||||
(SWCStartConfiguration) target.getSWCStartConfiguration().merge(update.getSWCStartConfiguration()));
|
||||
}
|
||||
if (update.getGateStartConfiguration() != null) {
|
||||
target.setGateStartConfiguration(
|
||||
(GateStartConfiguration) target.getGateStartConfiguration().merge(update.getGateStartConfiguration()));
|
||||
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package com.sap.sailing.domain.base.configuration.impl;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
|
||||
public class SWCStartConfigurationImpl extends RacingProcedureWithConfigurableStartModeFlagConfigurationImpl
|
||||
implements SWCStartConfiguration {
|
||||
|
||||
private static final long serialVersionUID = 5141617199229598965L;
|
||||
|
||||
@Override
|
||||
public RacingProcedureConfiguration merge(RacingProcedureConfiguration value) {
|
||||
SWCStartConfiguration update = (SWCStartConfiguration) value;
|
||||
SWCStartConfigurationImpl target = (SWCStartConfigurationImpl) super.merge(update);
|
||||
if (update.getStartModeFlags() != null) {
|
||||
target.setStartModeFlags(update.getStartModeFlags());
|
||||
}
|
||||
return target;
|
||||
}
|
||||
|
||||
protected SWCStartConfigurationImpl newInstance() {
|
||||
return new SWCStartConfigurationImpl();
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package com.sap.sailing.domain.base.configuration.procedures;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public interface ConfigurableStartModeFlagRacingProcedureConfiguration extends RacingProcedureConfiguration {
|
||||
|
||||
List<Flags> getStartModeFlags();
|
||||
|
||||
}
|
||||
+4
-12
@@ -1,12 +1,4 @@
|
||||
package com.sap.sailing.domain.base.configuration.procedures;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public interface RRS26Configuration extends RacingProcedureConfiguration {
|
||||
|
||||
List<Flags> getStartModeFlags();
|
||||
|
||||
}
|
||||
package com.sap.sailing.domain.base.configuration.procedures;
|
||||
|
||||
public interface RRS26Configuration extends ConfigurableStartModeFlagRacingProcedureConfiguration {
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package com.sap.sailing.domain.base.configuration.procedures;
|
||||
|
||||
|
||||
/**
|
||||
* Start procedure for the Sailing World Cup
|
||||
* @author Frank
|
||||
*
|
||||
*/
|
||||
public interface SWCStartConfiguration extends ConfigurableStartModeFlagRacingProcedureConfiguration {
|
||||
}
|
||||
+18
-8
@@ -1,4 +1,4 @@
|
||||
package com.sap.sailing.gwt.ui.test;
|
||||
package com.sap.sailing.domain.common.test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
@@ -8,12 +8,17 @@ import java.util.List;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.sap.sailing.domain.common.impl.ColorMapImpl;
|
||||
import com.sap.sse.common.Color;
|
||||
import com.sap.sse.common.impl.RGBColor;
|
||||
|
||||
public class ColorMapTest {
|
||||
// this is a duplicate variable to RaceMap.WATER_COLOR, as the RaceMap class cannot be loaded without a GWT context,
|
||||
// due to the GWT.create(), this would fail the junit test
|
||||
public static final Color WATER_COLOR = new RGBColor(0, 67, 125);
|
||||
|
||||
@Test
|
||||
public void testHundredDistinctColors() {
|
||||
ColorMapImpl<Integer> colorMap = new ColorMapImpl<Integer>();
|
||||
ColorMapImpl<Integer> colorMap = new ColorMapImpl<Integer>(WATER_COLOR);
|
||||
List<String> existingColors = new ArrayList<String>();
|
||||
int amountOfDistinctColorsToCreate = 100;
|
||||
for (int i = 1; i <= amountOfDistinctColorsToCreate; i++) {
|
||||
@@ -26,20 +31,25 @@ public class ColorMapTest {
|
||||
}
|
||||
|
||||
/**
|
||||
* A function only useful for visual tests.
|
||||
* It creates an HTML file (as string) with 100 distinct colors on top of the water color of the google map.
|
||||
* A function only useful for visual tests. It creates an HTML file (as string) with 100 distinct colors on top of
|
||||
* the water color of the google map.
|
||||
*/
|
||||
public void createColorMapAsHtml() {
|
||||
ColorMapImpl<Integer> colorMap = new ColorMapImpl<Integer>();
|
||||
ColorMapImpl<Integer> colorMap = new ColorMapImpl<Integer>(WATER_COLOR);
|
||||
int amountOfDistinctColorsToCreate = 100;
|
||||
|
||||
String colorMapAsHtml = "<html><head></head><body style='background-color: #A5BFDD'>";
|
||||
String colorMapAsHtml = "<html><head></head><body style='background-color: " + WATER_COLOR.getAsHtml() + "'>";
|
||||
|
||||
for(int i = 1; i <= amountOfDistinctColorsToCreate; i++) {
|
||||
colorMapAsHtml += "<div style='height:3px; background-color:" + colorMap.getColorByID(i) + "'></div><br/>";
|
||||
for (int i = 1; i <= amountOfDistinctColorsToCreate; i++) {
|
||||
colorMapAsHtml += "<div style='height:3px; background-color:" + colorMap.getColorByID(i).getAsHtml()
|
||||
+ "'></div><br/>";
|
||||
}
|
||||
|
||||
colorMapAsHtml += "</body></html>";
|
||||
System.out.println(colorMapAsHtml);
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
new ColorMapTest().createColorMapAsHtml();
|
||||
}
|
||||
}
|
||||
+1
@@ -38,6 +38,7 @@ public class FlagImageResolver {
|
||||
flagImageMap.put(Flags.UNIFORM, resources.flagUniform());
|
||||
flagImageMap.put(Flags.XRAY, resources.flagXray());
|
||||
flagImageMap.put(Flags.ZULU, resources.flagZulu());
|
||||
flagImageMap.put(Flags.OSCAR, resources.flagOscar());
|
||||
}
|
||||
|
||||
public ImageResource resolveFlagToImage(Flags flag, boolean isDisplayed, boolean displayStateChanged) {
|
||||
|
||||
+3
-2
@@ -16,7 +16,7 @@ import com.google.gwt.user.client.ui.SimplePanel;
|
||||
import com.google.gwt.user.client.ui.VerticalPanel;
|
||||
import com.sap.sailing.gwt.ui.client.StringMessages;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.GateStartInfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.RRS26InfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.LineStartInfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RegattaOverviewEntryDTO;
|
||||
|
||||
public class RaceDetailPanel extends SimplePanel {
|
||||
@@ -222,7 +222,8 @@ public class RaceDetailPanel extends SimplePanel {
|
||||
if (data.raceInfo.startProcedureDTO != null) {
|
||||
switch (data.raceInfo.startProcedure) {
|
||||
case RRS26:
|
||||
RRS26InfoDTO rrsInfo = (RRS26InfoDTO) data.raceInfo.startProcedureDTO;
|
||||
case SWC:
|
||||
LineStartInfoDTO rrsInfo = (LineStartInfoDTO) data.raceInfo.startProcedureDTO;
|
||||
if (rrsInfo != null) {
|
||||
if (rrsInfo.startModeFlag != null) {
|
||||
showProcedureInfo("Start mode", rrsInfo.startModeFlag.toString());
|
||||
|
||||
+4
-1
@@ -54,7 +54,10 @@ interface RegattaRaceStatesFlagsResources extends ClientBundle {
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/uniform.png")
|
||||
ImageResource flagUniform();
|
||||
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/oscar.png")
|
||||
ImageResource flagOscar();
|
||||
|
||||
@Source("com/sap/sailing/gwt/ui/client/images/flags/flags_racecommittee/whiskey.png")
|
||||
ImageResource flagWhiskey();
|
||||
|
||||
|
||||
+82
@@ -44,6 +44,13 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
|
||||
private CheckBox rrs26ResultEntryBox;
|
||||
private ListBox rrs26StartModeFlagsBox;
|
||||
|
||||
private DisclosurePanel swcStartDisclosurePanel;
|
||||
private CheckBox swcStartEnabledBox;
|
||||
private ListBox swcStartClassFlagListBox;
|
||||
private CheckBox swcStartRecallBox;
|
||||
private CheckBox swcStartResultEntryBox;
|
||||
private ListBox swcStartModeFlagsBox;
|
||||
|
||||
private DisclosurePanel gateStartDisclosurePanel;
|
||||
private CheckBox gateStartEnabledBox;
|
||||
private ListBox gateStartClassFlagListBox;
|
||||
@@ -82,6 +89,7 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
|
||||
contentPanel = new VerticalPanel();
|
||||
setupGeneral();
|
||||
setupRRS26();
|
||||
setupSWCStart();
|
||||
setupGateStart();
|
||||
setupESS();
|
||||
setupBasic();
|
||||
@@ -90,6 +98,9 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
|
||||
if (rrs26EnabledBox.getValue()) {
|
||||
rrs26DisclosurePanel.setOpen(true);
|
||||
}
|
||||
if (swcStartEnabledBox.getValue()) {
|
||||
swcStartDisclosurePanel.setOpen(true);
|
||||
}
|
||||
if (gateStartEnabledBox.getValue()) {
|
||||
gateStartDisclosurePanel.setOpen(true);
|
||||
}
|
||||
@@ -245,6 +256,66 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
|
||||
});
|
||||
}
|
||||
|
||||
private void setupSWCStart() {
|
||||
swcStartDisclosurePanel = new DisclosurePanel(stringMessages.sailingWorldCupStart());
|
||||
VerticalPanel panel = new VerticalPanel();
|
||||
|
||||
Grid grid = new Grid(4, 3);
|
||||
swcStartEnabledBox = new CheckBox(stringMessages.setConfiguration());
|
||||
swcStartEnabledBox.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
|
||||
@Override
|
||||
public void onValueChange(ValueChangeEvent<Boolean> event) {
|
||||
boolean isActive = event.getValue();
|
||||
swcStartClassFlagListBox.setEnabled(isActive);
|
||||
swcStartRecallBox.setEnabled(isActive);
|
||||
swcStartResultEntryBox.setEnabled(isActive);
|
||||
swcStartModeFlagsBox.setEnabled(isActive);
|
||||
}
|
||||
});
|
||||
swcStartClassFlagListBox = setupClassFlagListBox(originalConfiguration == null ? null
|
||||
: originalConfiguration.swcStartConfiguration);
|
||||
swcStartClassFlagListBox.setWidth("100%");
|
||||
swcStartRecallBox = setupRecallBox(originalConfiguration==null?null:originalConfiguration.swcStartConfiguration);
|
||||
swcStartResultEntryBox = setupResultEntryBox(originalConfiguration==null?null:originalConfiguration.swcStartConfiguration);
|
||||
setupSWCStartModeFlags();
|
||||
|
||||
grid.setWidget(0, 0, new Label(stringMessages.classFlag() + ":"));
|
||||
grid.setWidget(0, 1, swcStartClassFlagListBox);
|
||||
grid.setWidget(0, 2, createHelpImage(stringMessages.classFlagHelpText("SWC Start")));
|
||||
grid.setWidget(1, 0, swcStartRecallBox);
|
||||
grid.setWidget(1, 2, createHelpImage(stringMessages.individualRecallHelpText()));
|
||||
grid.setWidget(2, 0, swcStartResultEntryBox);
|
||||
grid.setWidget(2, 2, createHelpImage(stringMessages.resultEntryHelpText()));
|
||||
grid.setWidget(3, 0, new Label(stringMessages.startmodeFlags() + ":"));
|
||||
grid.setWidget(3, 1, swcStartModeFlagsBox);
|
||||
grid.setWidget(3, 2, createHelpImage(stringMessages.startmodeFlagsHelpText()));
|
||||
|
||||
swcStartEnabledBox.setValue(originalConfiguration != null && originalConfiguration.swcStartConfiguration != null);
|
||||
ValueChangeEvent.fire(swcStartEnabledBox, swcStartEnabledBox.getValue());
|
||||
|
||||
panel.add(swcStartEnabledBox);
|
||||
panel.add(grid);
|
||||
swcStartDisclosurePanel.add(panel);
|
||||
contentPanel.add(swcStartDisclosurePanel);
|
||||
}
|
||||
|
||||
private void setupSWCStartModeFlags() {
|
||||
swcStartModeFlagsBox = new ListBox();
|
||||
swcStartModeFlagsBox.setMultipleSelect(true);
|
||||
swcStartModeFlagsBox.setWidth("100%");
|
||||
List<Flags> selectedFlags = new ArrayList<Flags>();
|
||||
if (originalConfiguration != null && originalConfiguration.swcStartConfiguration != null
|
||||
&& originalConfiguration.swcStartConfiguration.startModeFlags != null) {
|
||||
selectedFlags = originalConfiguration.swcStartConfiguration.startModeFlags;
|
||||
}
|
||||
ListBoxUtils.setupStartmodeFlagsListBox(swcStartModeFlagsBox, selectedFlags);
|
||||
swcStartModeFlagsBox.addChangeHandler(new ChangeHandler() {
|
||||
@Override
|
||||
public void onChange(ChangeEvent event) {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setupGateStart() {
|
||||
gateStartDisclosurePanel = new DisclosurePanel(stringMessages.gateStart());
|
||||
VerticalPanel panel = new VerticalPanel();
|
||||
@@ -440,6 +511,17 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
|
||||
}
|
||||
result.rrs26Configuration.startModeFlags = flags.isEmpty() ? null : flags;
|
||||
}
|
||||
if (swcStartEnabledBox.getValue()) {
|
||||
result.swcStartConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.SWCStartConfigurationDTO();
|
||||
getRacingProcedureConfigurationResults(result.swcStartConfiguration, swcStartClassFlagListBox, swcStartRecallBox, swcStartResultEntryBox);
|
||||
List<Flags> flags = new ArrayList<Flags>();
|
||||
for (int i = 0; i < swcStartModeFlagsBox.getItemCount(); i++) {
|
||||
if (swcStartModeFlagsBox.isItemSelected(i)) {
|
||||
flags.add(Flags.valueOf(swcStartModeFlagsBox.getValue(i)));
|
||||
}
|
||||
}
|
||||
result.swcStartConfiguration.startModeFlags = flags.isEmpty() ? null : flags;
|
||||
}
|
||||
if (gateStartEnabledBox.getValue()) {
|
||||
result.gateStartConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.GateStartConfigurationDTO();
|
||||
getRacingProcedureConfigurationResults(result.gateStartConfiguration, gateStartClassFlagListBox,
|
||||
|
||||
+2
-1
@@ -10,6 +10,7 @@ import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
|
||||
import com.sap.sailing.domain.common.dto.BoatDTO;
|
||||
import com.sap.sailing.domain.common.dto.CompetitorDTO;
|
||||
import com.sap.sailing.domain.common.impl.ColorMapImpl;
|
||||
import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMap;
|
||||
import com.sap.sse.common.Color;
|
||||
|
||||
public class CompetitorColorProviderImpl implements CompetitorColorProvider {
|
||||
@@ -25,7 +26,7 @@ public class CompetitorColorProviderImpl implements CompetitorColorProvider {
|
||||
|
||||
public CompetitorColorProviderImpl(RegattaAndRaceIdentifier raceIdentifier,
|
||||
Map<CompetitorDTO, BoatDTO> competitorsAndTheirBoats) {
|
||||
this.competitorsColorMap = new ColorMapImpl<>();
|
||||
this.competitorsColorMap = new ColorMapImpl<>(RaceMap.WATER_COLOR);
|
||||
this.competitorsBoatColorsPerRace = new HashMap<RegattaAndRaceIdentifier, Map<CompetitorDTO, Color>>();
|
||||
if (raceIdentifier != null) {
|
||||
for (Entry<CompetitorDTO, BoatDTO> competitorAndBoat : competitorsAndTheirBoats.entrySet()) {
|
||||
|
||||
+2
@@ -988,6 +988,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
|
||||
String activateIndividualRecall();
|
||||
String activateResultEntry();
|
||||
String rrs26Start();
|
||||
String sailingWorldCupStart();
|
||||
String setConfiguration();
|
||||
String classFlag();
|
||||
String classFlagHelpText(String procedure);
|
||||
@@ -1184,6 +1185,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
|
||||
String raceIsInLiveTimePanelMode();
|
||||
String backToLiveTimePanelMode();
|
||||
String windChart();
|
||||
String windChartLoading();
|
||||
String mediaNoVideosCaption();
|
||||
String mediaShowVideoCaption();
|
||||
String mediaShowVideoTooltip(String title);
|
||||
|
||||
+2
@@ -959,6 +959,7 @@ racingProcedureConfiguration=Regatta configuration
|
||||
activateIndividualRecall=Activate individual recall
|
||||
activateResultEntry=Activate result entry
|
||||
rrs26Start=RRS26 start
|
||||
sailingWorldCupStart=Sailing World Cup Start
|
||||
setConfiguration=Activate configuration
|
||||
classFlag=Class flag
|
||||
classFlagHelpText=Sets the class flag used for {0}. Choose ''Don''t Overwrite'' to activate the procedure''s default flag.
|
||||
@@ -1156,6 +1157,7 @@ leaderboardGroupNotContainedInEvent=The leaderboard group {0} is not contained i
|
||||
raceIsInLiveTimePanelMode=Race is Live
|
||||
backToLiveTimePanelMode=Back to Live
|
||||
windChart=Wind Chart
|
||||
windChartLoading=Loading wind data...
|
||||
mediaNoVideosCaption=No Videos
|
||||
mediaShowVideoCaption=Show Video
|
||||
mediaShowVideoTooltip=Click to show video: {0}
|
||||
|
||||
+3
-1
@@ -532,7 +532,7 @@ legend=Legende
|
||||
live=live
|
||||
swissTimingArchiveConnector=SwissTiming Historische Veranstaltungen
|
||||
errorFetchingChartData=Fehler beim Laden der Chartdaten: {0}
|
||||
loadingCompetitorData=Lade Teilnehmer-Daten
|
||||
loadingCompetitorData=Lade Teilnehmer-Daten...
|
||||
competitorRegattaDataAfterRaceN={0} nach Rennen {1}
|
||||
rankChart=Ranking
|
||||
netPoints=Gesamtpunktzahl
|
||||
@@ -952,6 +952,7 @@ racingProcedureConfiguration=Rennart-Konfiguration
|
||||
activateIndividualRecall=Aktiviere Einzelrückruf
|
||||
activateResultEntry=Aktiviere Ergebniseingabe
|
||||
rrs26Start=RRS26 Start
|
||||
sailingWorldCupStart=Sailing World Cup Start
|
||||
setConfiguration=Aktiviere Konfiguration
|
||||
classFlag=Klassenflagge
|
||||
classFlagHelpText=Setzt die Klassenflagge für {0}. Wähle 'Nicht überschreiben' um die Standardflagge der Rennart zu wählen.
|
||||
@@ -1148,6 +1149,7 @@ leaderboardGroupNotContainedInEvent=Die Wettfahrtgruppe {0} gehört nicht zur Ve
|
||||
raceIsInLiveTimePanelMode=Rennen ist live
|
||||
backToLiveTimePanelMode=Zurück zu live
|
||||
windChart=Winddiagramm
|
||||
windChartLoading=Winddaten werden geladen...
|
||||
mediaNoVideosCaption=Keine Videos
|
||||
mediaShowVideoCaption=Video ein
|
||||
mediaShowVideoTooltip=Video abspielen: {0}
|
||||
|
||||
+4
-2
@@ -956,6 +956,7 @@ racingProcedureConfiguration=レガッタ設定
|
||||
activateIndividualRecall=個別リコール有効化
|
||||
activateResultEntry=結果エントリ有効化
|
||||
rrs26Start=RRS26 開始
|
||||
sailingWorldCupStart=Sailing World Cup Start
|
||||
setConfiguration=設定有効化
|
||||
classFlag=クラス旗
|
||||
classFlagHelpText={0} に使用するクラス旗を選定します。手順にある初期値の旗を有効化するには、''上書きしない'' を選択してください。
|
||||
@@ -1220,6 +1221,7 @@ removeFixedPassings=固定マーク通過を削除
|
||||
setFixedPassing=マーク通過の時刻を設定
|
||||
setSuppressedPassing=現在のもので開始したマーク通過を非表示
|
||||
removeSuppressedPassing=非表示のマーク通過を削除
|
||||
warningSettingFixedPassing=変針点 {0} を通過する時刻は、前の変針点の時刻より前であってはならず、後の変針点の時刻より後であってはなりません。
|
||||
errorRemovingFixedPassing=固定マーク通過の削除でエラー発生: {0}
|
||||
errorSettingFixedPassing=固定マーク通過の設定でエラー発生: {0}
|
||||
errorSuppressingPassing=マーク通過の非表示でエラー発生: {0}
|
||||
@@ -1604,9 +1606,9 @@ favoriteBoatClasses=お気に入りの艇種
|
||||
notificationAboutNewResults=新しい結果に関する通知の送信
|
||||
notificationAboutUpcomingRaces=予定されているレースに関する通知の送信
|
||||
currentRideHeightInMeters=浮上高さ
|
||||
currentRideHeightInMetersTooltip=翼走での現在の浮上高さ
|
||||
currentRideHeightInMetersTooltip=フォイリングでの現在の浮上高さ
|
||||
currentOrAverageRideHeightInMeters=浮上高さ (終了時 ∅)
|
||||
currentOrAverageRideHeightInMetersTooltip=レグ航行中の翼走での現在の浮上高さ、レグ完了時の平均浮上高さ
|
||||
currentOrAverageRideHeightInMetersTooltip=レグ航行中のフォイリングでの現在の浮上高さ、レグ完了時の平均浮上高さ
|
||||
pleaseCreateAtLeastOneMappingForCompetitor=左側にあるトラックを最初に選択してから右側にある競技者を選択してマッピングを少なくとも 1 つ登録してください
|
||||
importAdditionalSensorData=追加センサーデータのインポート
|
||||
watchLive=ライブ視聴
|
||||
|
||||
+2
-1
@@ -956,6 +956,7 @@ racingProcedureConfiguration=Конфигурация регаты
|
||||
activateIndividualRecall=Активировать индивидуальный отзыв
|
||||
activateResultEntry=Активировать запись результата
|
||||
rrs26Start=RRS26 старт
|
||||
sailingWorldCupStart=Sailing World Cup Start
|
||||
setConfiguration=Активировать конфигурацию
|
||||
classFlag=Флаг класса
|
||||
classFlagHelpText=Установка флага класса для {0}. Выберите ''Не перезаписывать'', чтобы активировать соответствующий флаг процедуры по умолчанию.
|
||||
@@ -1220,7 +1221,7 @@ removeFixedPassings=Удалить прохождение фиксированн
|
||||
setFixedPassing=Установить время как прохождение отметки
|
||||
setSuppressedPassing=Подавить прохождение отметки, начиная с текущей
|
||||
removeSuppressedPassing=Удалить подавленное прохождение отметки
|
||||
warningSettingFixedPassing=Время прохождения путевой точки {0} не может быть ранее времени предыдущей путевой точки или позднее времени следующей
|
||||
warningSettingFixedPassing=Время прохождения отметки {0} не может быть раньше времени предыдущей отметки или позже времени следующей
|
||||
errorRemovingFixedPassing=Ошибка при удалении прохождения фиксированной отметки: {0}
|
||||
errorSettingFixedPassing=Ошибка при настройке прохождение фиксированной отметки: {0}
|
||||
errorSuppressingPassing=Ошибка при подавлении прохождений отметок: {0}
|
||||
|
||||
+2
@@ -956,6 +956,7 @@ racingProcedureConfiguration=比赛配置
|
||||
activateIndividualRecall=激活个别召回
|
||||
activateResultEntry=激活结果条目
|
||||
rrs26Start=RRS26 开始
|
||||
sailingWorldCupStart=Sailing World Cup Start
|
||||
setConfiguration=激活配置
|
||||
classFlag=级别旗标
|
||||
classFlagHelpText=设置用于{0}的级别旗标。 选择“不要覆盖”,激活程序的默认旗标。
|
||||
@@ -1220,6 +1221,7 @@ removeFixedPassings=移除固定的绕标
|
||||
setFixedPassing=设置绕标时间
|
||||
setSuppressedPassing=从当前开始禁止绕标
|
||||
removeSuppressedPassing=移除禁止的绕标
|
||||
warningSettingFixedPassing=通过{0}航路点的时间不能在上一航路点的时间之前或下一航路点的时间之后
|
||||
errorRemovingFixedPassing=移除固定的绕标出错: {0}
|
||||
errorSettingFixedPassing=设置固定的绕标出错: {0}
|
||||
errorSuppressingPassing=禁止绕标出错: {0}
|
||||
|
||||
+2
@@ -956,6 +956,7 @@ racingProcedureConfiguration=比赛配置
|
||||
activateIndividualRecall=激活个别召回
|
||||
activateResultEntry=激活结果条目
|
||||
rrs26Start=RRS26 开始
|
||||
sailingWorldCupStart=Sailing World Cup Start
|
||||
setConfiguration=激活配置
|
||||
classFlag=级别旗标
|
||||
classFlagHelpText=设置用于{0}的级别旗标。 选择“不要覆盖”,激活程序的默认旗标。
|
||||
@@ -1220,6 +1221,7 @@ removeFixedPassings=移除固定的绕标
|
||||
setFixedPassing=设置绕标时间
|
||||
setSuppressedPassing=从当前开始禁止绕标
|
||||
removeSuppressedPassing=移除禁止的绕标
|
||||
warningSettingFixedPassing=通过{0}航路点的时间不能在上一航路点的时间之前或下一航路点的时间之后
|
||||
errorRemovingFixedPassing=移除固定的绕标出错: {0}
|
||||
errorSettingFixedPassing=设置固定的绕标出错: {0}
|
||||
errorSuppressingPassing=禁止绕标出错: {0}
|
||||
|
||||
+6
-1
@@ -221,7 +221,11 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
|
||||
|
||||
private void loadData(final Date from, final Date to, final List<CompetitorDTO> competitors, final boolean append) {
|
||||
if (isVisible()) {
|
||||
showLoading(stringMessages.loadingCompetitorData());
|
||||
// if no data is loaded yet, or if it is not playing and not live (append loading every second) show loading
|
||||
// indicator
|
||||
if (shouldShowLoading(primary.timeOfLatestRequestInMillis)) {
|
||||
showLoading(stringMessages.loadingCompetitorData());
|
||||
}
|
||||
ArrayList<CompetitorDTO> competitorsToLoad = new ArrayList<CompetitorDTO>();
|
||||
for (CompetitorDTO competitorDTO : competitors) {
|
||||
competitorsToLoad.add(competitorDTO);
|
||||
@@ -282,6 +286,7 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
|
||||
@Override
|
||||
public void addedToSelection(CompetitorDTO competitor) {
|
||||
if (isVisible()) {
|
||||
showLoading(stringMessages.loadingCompetitorData());
|
||||
ArrayList<CompetitorDTO> competitorsToLoad = new ArrayList<CompetitorDTO>();
|
||||
competitorsToLoad.add(competitor);
|
||||
|
||||
|
||||
+16
-9
@@ -35,6 +35,7 @@ import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider;
|
||||
import com.sap.sse.gwt.client.player.TimeZoomChangeListener;
|
||||
import com.sap.sse.gwt.client.player.Timer;
|
||||
import com.sap.sse.gwt.client.player.Timer.PlayModes;
|
||||
import com.sap.sse.gwt.client.player.Timer.PlayStates;
|
||||
import com.sap.sse.gwt.client.shared.components.Component;
|
||||
import com.sap.sse.gwt.client.shared.components.SettingsDialog;
|
||||
|
||||
@@ -137,20 +138,16 @@ public abstract class AbstractRaceChart<SettingsType extends Settings> extends A
|
||||
}
|
||||
|
||||
protected void showLoading(String message) {
|
||||
if (timer.getPlayMode() != PlayModes.Live) {
|
||||
if (chart.isRendered()) {
|
||||
chart.showLoading(message);
|
||||
} else {
|
||||
add(busyIndicator);
|
||||
}
|
||||
if (chart.isRendered()) {
|
||||
chart.showLoading(message);
|
||||
} else {
|
||||
add(busyIndicator);
|
||||
}
|
||||
isLoading = true;
|
||||
}
|
||||
|
||||
protected void hideLoading() {
|
||||
if (timer.getPlayMode() != PlayModes.Live) {
|
||||
chart.hideLoading();
|
||||
}
|
||||
chart.hideLoading();
|
||||
isLoading = false;
|
||||
remove(busyIndicator);
|
||||
}
|
||||
@@ -261,4 +258,14 @@ public abstract class AbstractRaceChart<SettingsType extends Settings> extends A
|
||||
public String getId() {
|
||||
return getLocalizedShortName();
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines if a standard loading message is allowed to appear over the chart or not.
|
||||
*
|
||||
* @return <code>true</code> if the message is allowed, <code>false</code> otherwise.
|
||||
*/
|
||||
protected boolean shouldShowLoading(Long timestamp) {
|
||||
return timestamp == null
|
||||
|| (timer.getPlayState() != PlayStates.Playing && timer.getPlayMode() != PlayModes.Live);
|
||||
}
|
||||
}
|
||||
+4
-1
@@ -468,7 +468,10 @@ public class WindChart extends AbstractRaceChart<WindChartSettings> implements R
|
||||
clearChart();
|
||||
} else if (needsDataLoading() && from != null && to != null) {
|
||||
setWidget(chart);
|
||||
showLoading("Loading wind data...");
|
||||
// if not playing or empty show loading message
|
||||
if (shouldShowLoading(timeOfLatestRequestInMillis)) {
|
||||
showLoading(stringMessages.windChartLoading());
|
||||
}
|
||||
GetWindInfoAction getWindInfoAction = new GetWindInfoAction(sailingService, selectedRaceIdentifier,
|
||||
from, to, settings.getResolutionInMilliseconds(), null, /* onlyUpToNewestEvent==true because we don't want
|
||||
to overshoot the evidence so far */ true);
|
||||
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
package com.sap.sailing.gwt.ui.client.shared.racemap;
|
||||
|
||||
import com.google.gwt.core.client.JavaScriptObject;
|
||||
import com.google.gwt.maps.client.controls.MapTypeStyle;
|
||||
import com.google.gwt.maps.client.maptypes.MapTypeStyler;
|
||||
|
||||
/**
|
||||
* A {@code color} styler for Google Maps that can use an RGB color code to set an absolute color. This is an
|
||||
* alternative to the rather complicated hue/saturation/lightness model that is relative to Google's base values which
|
||||
* may change without notice and which are difficult to map to from an RGB color.
|
||||
* <p>
|
||||
*
|
||||
* To use together with {@link MapTypeStyle#setStylers(MapTypeStyler[])}, {@link JavaScriptObject#cast()} an object of
|
||||
* this type to type {@link MapTypeStyler} and place it as an element into an array of type {@link MapTypeStyler}.<p>
|
||||
*
|
||||
* See <a href= "https://developers.google.com/maps/documentation/javascript/reference#MapTypeStyler" >MapTypeStyler API
|
||||
* Doc</a>
|
||||
*
|
||||
* @author Axel Uhl (D043530)
|
||||
*/
|
||||
public class ColorMapTypeStyler extends JavaScriptObject {
|
||||
/**
|
||||
* A styler affects how a map's elements will be styled. Each ColorMapTypeStyler should contain one and only one key. If
|
||||
* more than one key is specified in a single ColorMapTypeStyler, all but one will be ignored. For example: var rule =
|
||||
* {color: '#ff0000'}. use newInstance();
|
||||
*/
|
||||
protected ColorMapTypeStyler() {
|
||||
}
|
||||
|
||||
public final static ColorMapTypeStyler newColorStyler(String color) {
|
||||
ColorMapTypeStyler styler = JavaScriptObject.createObject().cast();
|
||||
styler.setColor(color);
|
||||
return styler;
|
||||
}
|
||||
|
||||
/**
|
||||
* sets Sets the color of the feature to match the hue of the color supplied.
|
||||
*/
|
||||
private final native void setColor(String color) /*-{
|
||||
this.color = color;
|
||||
}-*/;
|
||||
|
||||
public final native String getColor() /*-{
|
||||
return this.color;
|
||||
}-*/;
|
||||
}
|
||||
+76
-52
@@ -21,6 +21,8 @@ import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
|
||||
import com.sap.sailing.gwt.ui.shared.GPSFixDTOWithSpeedWindTackAndLegType;
|
||||
import com.sap.sse.common.Util;
|
||||
import com.sap.sse.common.Util.Triple;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sse.common.impl.TimeRangeImpl;
|
||||
import com.sap.sse.common.util.Trigger;
|
||||
import com.sap.sse.common.util.Triggerable;
|
||||
import com.sap.sse.gwt.client.TriggerableTimer;
|
||||
@@ -225,31 +227,44 @@ public class FixesAndTails {
|
||||
Map<CompetitorDTO, Boolean> overlapsWithKnownFixes, TailFactory tailFactory, long timeForPositionTransitionMillis) {
|
||||
for (final Map.Entry<CompetitorDTO, List<GPSFixDTOWithSpeedWindTackAndLegType>> e : fixesForCompetitors.entrySet()) {
|
||||
if (e.getValue() != null && !e.getValue().isEmpty()) {
|
||||
List<GPSFixDTOWithSpeedWindTackAndLegType> fixesForCompetitor = fixes.get(e.getKey());
|
||||
final CompetitorDTO competitor = e.getKey();
|
||||
List<GPSFixDTOWithSpeedWindTackAndLegType> fixesForCompetitor = fixes.get(competitor);
|
||||
if (fixesForCompetitor == null) {
|
||||
fixesForCompetitor = new ArrayList<GPSFixDTOWithSpeedWindTackAndLegType>();
|
||||
fixes.put(e.getKey(), fixesForCompetitor);
|
||||
fixes.put(competitor, fixesForCompetitor);
|
||||
}
|
||||
if (!overlapsWithKnownFixes.get(e.getKey())) {
|
||||
if (!overlapsWithKnownFixes.get(competitor)) {
|
||||
// clearing and then re-populating establishes the invariant that an extrapolated fix must be the last
|
||||
fixesForCompetitor.clear();
|
||||
// to re-establish the invariants for tails, firstShownFix and lastShownFix, we now need to remove
|
||||
// all points from the competitor's polyline and clear the entries in firstShownFix and lastShownFix
|
||||
final Triggerable triggerable = new Triggerable(new Runnable() { @Override public void run() { clearTail(e.getKey()); } });
|
||||
final Trigger<Polyline> tailTrigger = tails.get(e.getKey());
|
||||
if (tailTrigger != null) {
|
||||
tailTrigger.register(triggerable);
|
||||
}
|
||||
registerIndexTrigger(triggerable, firstShownFix, e.getKey());
|
||||
registerIndexTrigger(triggerable, lastShownFix, e.getKey());
|
||||
final Triggerable triggerable = new Triggerable(new Runnable() { @Override public void run() { clearTail(competitor); } });
|
||||
registerTriggerable(competitor, triggerable);
|
||||
fixesForCompetitor.addAll(e.getValue());
|
||||
overlapsWithKnownFixes.put(e.getKey(), true); // In case this was only one part of a split request, the next request *does* have an overlap
|
||||
overlapsWithKnownFixes.put(competitor, true); // In case this was only one part of a split request, the next request *does* have an overlap
|
||||
} else {
|
||||
mergeFixes(e.getKey(), e.getValue(), timeForPositionTransitionMillis);
|
||||
mergeFixes(competitor, e.getValue(), timeForPositionTransitionMillis);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A {@link Triggerable} that is usually a {@link TriggerableTimer} and is or will be scheduled for delayed execution
|
||||
* will be registered with the {@link #tails}, {@link #firstShownFix} and {@link #lastShownFix} structures such that
|
||||
* when any of them is accessed for the {@code competitor} passed as parameter then the {@code triggerable} will be
|
||||
* triggered to ensure consistency and establish all invariants. This way, invariants may temporarily be left unmet
|
||||
* which gives the UI a better chance of delaying particularly the tail updates. However, in case of read access the
|
||||
* invariants all must be established, hence the trigger pattern.
|
||||
*/
|
||||
private void registerTriggerable(final CompetitorDTO competitor, final Triggerable triggerable) {
|
||||
final Trigger<Polyline> tailTrigger = tails.get(competitor);
|
||||
if (tailTrigger != null) {
|
||||
tailTrigger.register(triggerable);
|
||||
}
|
||||
registerIndexTrigger(triggerable, firstShownFix, competitor);
|
||||
registerIndexTrigger(triggerable, lastShownFix, competitor);
|
||||
}
|
||||
|
||||
private void registerIndexTrigger(Triggerable triggerable, Map<CompetitorDTO, Trigger<Integer>> indexMap, CompetitorDTO competitor) {
|
||||
Trigger<Integer> firstShownFixTrigger = indexMap.get(competitor);
|
||||
@@ -290,13 +305,14 @@ public class FixesAndTails {
|
||||
int indexOfLastShownFix = lastShownFix.get(competitorDTO).get() == null ? -1 : lastShownFix.get(competitorDTO).get();
|
||||
final Polyline tail = getTail(competitorDTO);
|
||||
int intoThisIndex = 0;
|
||||
final Comparator<GPSFixDTOWithSpeedWindTackAndLegType> fixByTimePointComparator = new Comparator<GPSFixDTOWithSpeedWindTackAndLegType>() {
|
||||
@Override
|
||||
public int compare(GPSFixDTOWithSpeedWindTackAndLegType o1, GPSFixDTOWithSpeedWindTackAndLegType o2) {
|
||||
return o1.timepoint.compareTo(o2.timepoint);
|
||||
}
|
||||
};
|
||||
for (GPSFixDTOWithSpeedWindTackAndLegType mergeThisFix : mergeThis) {
|
||||
intoThisIndex = Collections.binarySearch(intoThis, mergeThisFix, new Comparator<GPSFixDTOWithSpeedWindTackAndLegType>() {
|
||||
@Override
|
||||
public int compare(GPSFixDTOWithSpeedWindTackAndLegType o1, GPSFixDTOWithSpeedWindTackAndLegType o2) {
|
||||
return o1.timepoint.compareTo(o2.timepoint);
|
||||
}
|
||||
});
|
||||
intoThisIndex = Collections.binarySearch(intoThis, mergeThisFix, fixByTimePointComparator);
|
||||
if (intoThisIndex < 0) {
|
||||
intoThisIndex = -intoThisIndex-1;
|
||||
}
|
||||
@@ -322,6 +338,7 @@ public class FixesAndTails {
|
||||
tail.getPath().removeAt(finalIntoThisIndex - finalIndexOfFirstShownFix);
|
||||
}
|
||||
});
|
||||
registerTriggerable(competitorDTO, triggerable);
|
||||
Timer timer = new TriggerableTimer(triggerable);
|
||||
runDelayedOrImmediately(timer, (int) (timeForPositionTransitionMillis==-1?-1:timeForPositionTransitionMillis/2));
|
||||
}
|
||||
@@ -334,40 +351,47 @@ public class FixesAndTails {
|
||||
intoThisIndex--;
|
||||
}
|
||||
} else {
|
||||
intoThis.add(intoThisIndex, mergeThisFix);
|
||||
if (tail != null && intoThisIndex >= indexOfFirstShownFix && intoThisIndex <= indexOfLastShownFix) {
|
||||
// fix inserted at a position currently visualized by tail
|
||||
tail.getPath().insertAt(intoThisIndex - indexOfFirstShownFix, coordinateSystem.toLatLng(mergeThisFix.position));
|
||||
}
|
||||
if (intoThisIndex < indexOfFirstShownFix) {
|
||||
indexOfFirstShownFix++;
|
||||
}
|
||||
if (intoThisIndex <= indexOfLastShownFix) {
|
||||
indexOfLastShownFix++;
|
||||
}
|
||||
// If there is a fix prior to the one added and that prior fix was obtained by extrapolation, remove it now because
|
||||
// extrapolated fixes can only be the last in the list
|
||||
if (intoThisIndex > 0 && intoThis.get(intoThisIndex-1).extrapolated) {
|
||||
intoThis.remove(intoThisIndex-1);
|
||||
if (tail != null && intoThisIndex-1 >= indexOfFirstShownFix && intoThisIndex-1 <= indexOfLastShownFix) {
|
||||
final int finalIntoThisIndex = intoThisIndex;
|
||||
final int finalIndexOfFirstShownFix = indexOfFirstShownFix;
|
||||
Triggerable triggerable = new Triggerable(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
tail.getPath().removeAt(finalIntoThisIndex-1 - finalIndexOfFirstShownFix);
|
||||
}
|
||||
});
|
||||
Timer timer = new TriggerableTimer(triggerable);
|
||||
runDelayedOrImmediately(timer, (int) (timeForPositionTransitionMillis==-1?-1:timeForPositionTransitionMillis/2));
|
||||
// insert the fix only if it is not extrapolated or if the extrapolated fix is to be appended to the end (including
|
||||
// being the only fix)
|
||||
if (!mergeThisFix.extrapolated || intoThisIndex == intoThis.size()) {
|
||||
intoThis.add(intoThisIndex, mergeThisFix);
|
||||
if (tail != null && intoThisIndex >= indexOfFirstShownFix && intoThisIndex <= indexOfLastShownFix) {
|
||||
// fix inserted at a position currently visualized by tail
|
||||
tail.getPath().insertAt(intoThisIndex - indexOfFirstShownFix, coordinateSystem.toLatLng(mergeThisFix.position));
|
||||
}
|
||||
if (intoThisIndex-1 < indexOfFirstShownFix) {
|
||||
indexOfFirstShownFix--;
|
||||
if (intoThisIndex < indexOfFirstShownFix) {
|
||||
indexOfFirstShownFix++;
|
||||
}
|
||||
if (intoThisIndex-1 <= indexOfLastShownFix) {
|
||||
indexOfLastShownFix--;
|
||||
if (intoThisIndex <= indexOfLastShownFix) {
|
||||
indexOfLastShownFix++;
|
||||
}
|
||||
intoThisIndex--;
|
||||
// If there is a fix prior to the one added and that prior fix was obtained by extrapolation, remove it now because
|
||||
// extrapolated fixes can only be the last in the list
|
||||
if (intoThisIndex > 0 && intoThis.get(intoThisIndex-1).extrapolated) {
|
||||
intoThis.remove(intoThisIndex-1);
|
||||
if (tail != null && intoThisIndex-1 >= indexOfFirstShownFix && intoThisIndex-1 <= indexOfLastShownFix) {
|
||||
final int finalIntoThisIndex = intoThisIndex;
|
||||
final int finalIndexOfFirstShownFix = indexOfFirstShownFix;
|
||||
Triggerable triggerable = new Triggerable(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
tail.getPath().removeAt(finalIntoThisIndex-1 - finalIndexOfFirstShownFix);
|
||||
}
|
||||
});
|
||||
registerTriggerable(competitorDTO, triggerable);
|
||||
Timer timer = new TriggerableTimer(triggerable);
|
||||
runDelayedOrImmediately(timer, (int) (timeForPositionTransitionMillis==-1?-1:timeForPositionTransitionMillis/2));
|
||||
}
|
||||
if (intoThisIndex-1 < indexOfFirstShownFix) {
|
||||
indexOfFirstShownFix--;
|
||||
}
|
||||
if (intoThisIndex-1 <= indexOfLastShownFix) {
|
||||
indexOfLastShownFix--;
|
||||
}
|
||||
intoThisIndex--;
|
||||
}
|
||||
} else {
|
||||
intoThisIndex--; // to compensate for the following ++
|
||||
}
|
||||
}
|
||||
intoThisIndex++;
|
||||
@@ -519,13 +543,14 @@ public class FixesAndTails {
|
||||
Date toDate;
|
||||
Date timepointOfLastKnownFix = fixesForCompetitor == null ? null : getTimepointOfLastNonExtrapolated(fixesForCompetitor);
|
||||
Date timepointOfFirstKnownFix = fixesForCompetitor == null ? null : getTimepointOfFirstNonExtrapolated(fixesForCompetitor);
|
||||
boolean overlap = false;
|
||||
boolean overlap = timepointOfFirstKnownFix != null && timepointOfLastKnownFix != null &&
|
||||
new TimeRangeImpl(new MillisecondsTimePoint(tailstart), new MillisecondsTimePoint(upTo)).intersects(
|
||||
new TimeRangeImpl(new MillisecondsTimePoint(timepointOfFirstKnownFix), new MillisecondsTimePoint(timepointOfLastKnownFix)));
|
||||
if (fixesForCompetitor != null && timepointOfFirstKnownFix != null
|
||||
&& !tailstart.before(timepointOfFirstKnownFix) && timepointOfLastKnownFix != null
|
||||
&& !tailstart.after(timepointOfLastKnownFix)) {
|
||||
// the beginning of what we need is contained in the interval we already have; skip what we already have
|
||||
fromDate = new Date(timepointOfLastKnownFix.getTime()+1l); // "from" is "inclusive", so add 1ms to also skip the last fix we have
|
||||
overlap = true;
|
||||
} else {
|
||||
fromDate = tailstart;
|
||||
}
|
||||
@@ -534,7 +559,6 @@ public class FixesAndTails {
|
||||
&& !upTo.after(timepointOfLastKnownFix)) {
|
||||
// the end of what we need is contained in the interval we already have; skip what we already have
|
||||
toDate = timepointOfFirstKnownFix;
|
||||
overlap = true;
|
||||
} else {
|
||||
toDate = upTo;
|
||||
}
|
||||
|
||||
+2
-4
@@ -152,6 +152,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
|
||||
public static final String GET_WIND_DATA_CATEGORY = "getWindData";
|
||||
|
||||
private static final String COMPACT_HEADER_STYLE = "compactHeader";
|
||||
public static final Color WATER_COLOR = new RGBColor(0, 67, 125);
|
||||
|
||||
private MapWidget map;
|
||||
|
||||
@@ -2805,10 +2806,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
|
||||
// simplify road display
|
||||
mapTypeStyles[2] = GoogleMapStyleHelper.createSimplifiedStyle(MapTypeStyleFeatureType.ROAD);
|
||||
// set water color
|
||||
// To play with the styles, check out http://gmaps-samples-v3.googlecode.com/svn/trunk/styledmaps/wizard/index.html.
|
||||
// To convert an RGB color into the strange hue/saturation/lightness model used by the Google Map use
|
||||
// http://software.stadtwerk.org/google_maps_colorizr/#water/all/123456/.
|
||||
mapTypeStyles[3] = GoogleMapStyleHelper.createColorStyle(MapTypeStyleFeatureType.WATER, new RGBColor(0, 136, 255), 0, -70);
|
||||
mapTypeStyles[3] = GoogleMapStyleHelper.createColorStyle(MapTypeStyleFeatureType.WATER, WATER_COLOR);
|
||||
|
||||
MapTypeControlOptions mapTypeControlOptions = MapTypeControlOptions.newInstance();
|
||||
mapTypeControlOptions.setPosition(ControlPosition.BOTTOM_RIGHT);
|
||||
|
||||
+52
-27
@@ -77,7 +77,7 @@ import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.impl.ReadonlyRaceStateImpl;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.ReadonlyGateStartRacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.ReadonlyRRS26RacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogTrackingStateAnalyzer;
|
||||
import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;
|
||||
import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent;
|
||||
@@ -118,6 +118,7 @@ import com.sap.sailing.domain.base.SpeedWithBearingWithConfidence;
|
||||
import com.sap.sailing.domain.base.Waypoint;
|
||||
import com.sap.sailing.domain.base.configuration.DeviceConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.DeviceConfigurationMatcher;
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.RegattaConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.impl.DeviceConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.DeviceConfigurationMatcherSingle;
|
||||
@@ -126,7 +127,10 @@ import com.sap.sailing.domain.base.configuration.impl.GateStartConfigurationImpl
|
||||
import com.sap.sailing.domain.base.configuration.impl.LeagueConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.RRS26ConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.RacingProcedureConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.RacingProcedureWithConfigurableStartModeFlagConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.RegattaConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.SWCStartConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.impl.BoatImpl;
|
||||
import com.sap.sailing.domain.base.impl.CourseDataImpl;
|
||||
import com.sap.sailing.domain.base.impl.CourseImpl;
|
||||
@@ -309,6 +313,7 @@ import com.sap.sailing.gwt.ui.shared.CoursePositionsDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationDTO.RegattaConfigurationDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationDTO.RegattaConfigurationDTO.RacingProcedureConfigurationDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationDTO.RegattaConfigurationDTO.RacingProcedureWithConfigurableStartModeFlagConfigurationDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceConfigurationMatcherDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceIdentifierDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.DeviceMappingDTO;
|
||||
@@ -332,7 +337,7 @@ import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceGroupSeriesDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.GateStartInfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.RRS26InfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.LineStartInfoDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.RaceInfoExtensionDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceLogDTO;
|
||||
import com.sap.sailing.gwt.ui.shared.RaceLogEventDTO;
|
||||
@@ -981,8 +986,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
info = new GateStartInfoDTO(gateStart.getPathfinder(), gateStart.getGateLaunchStopTime());
|
||||
break;
|
||||
case RRS26:
|
||||
ReadonlyRRS26RacingProcedure rrs26 = state.getTypedReadonlyRacingProcedure();
|
||||
info = new RRS26InfoDTO(rrs26.getStartModeFlag());
|
||||
case SWC:
|
||||
ConfigurableStartModeFlagRacingProcedure linestart = state.getTypedReadonlyRacingProcedure();
|
||||
info = new LineStartInfoDTO(linestart.getStartModeFlag());
|
||||
case UNKNOWN:
|
||||
default:
|
||||
break;
|
||||
@@ -1720,12 +1726,13 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
* date provided as value
|
||||
* @param to
|
||||
* for the list of competitors provided as keys (expected to be equal to the set of competitors used as
|
||||
* keys in the <code>from</code> parameter, requests the GPS fixes up to but excluding the date provided
|
||||
* as value
|
||||
* keys in the <code>from</code> parameter, requests the GPS fixes up to but excluding (except
|
||||
* {@code extrapolate} is {@code true}) the date provided as value
|
||||
* @param extrapolate
|
||||
* if <code>true</code> and no (exact or interpolated) position is known for <code>date</code>, the last
|
||||
* if <code>true</code> and no (exact or interpolated) position is known for <code>to</code>, the last
|
||||
* entry returned in the list of GPS fixes will be obtained by extrapolating from the competitors last
|
||||
* known position before <code>date</code> and the estimated speed.
|
||||
* known position at <code>to</code> and the estimated speed. With this, the {@code to} time point is no
|
||||
* longer exclusive.
|
||||
* @return a map where for each competitor participating in the race the list of GPS fixes in increasing
|
||||
* chronological order is provided. The last one is the last position at or before <code>date</code>.
|
||||
*/
|
||||
@@ -1753,7 +1760,8 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
Iterator<GPSFixMoving> fixIter = track.getFixesIterator(fromTimePoint, /* inclusive */true);
|
||||
while (fixIter.hasNext()) {
|
||||
GPSFixMoving fix = fixIter.next();
|
||||
if (fix.getTimePoint().before(toTimePointExcluding)) {
|
||||
if (fix.getTimePoint().before(toTimePointExcluding) ||
|
||||
(extrapolate && fix.getTimePoint().equals(toTimePointExcluding))) {
|
||||
if (logger.isLoggable(Level.FINEST)) {
|
||||
logger.finest(""+competitor.getName()+": " + fix);
|
||||
}
|
||||
@@ -1817,7 +1825,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
if (fixIter.hasNext()) {
|
||||
fix = fixIter.next();
|
||||
} else {
|
||||
// check if fix was at date and if extrapolation is requested
|
||||
// check if fix was at date and if extrapolation is requested;
|
||||
if (!fix.getTimePoint().equals(toTimePointExcluding) && extrapolate) {
|
||||
Position position = track.getEstimatedPosition(toTimePointExcluding, extrapolate);
|
||||
Wind wind2 = trackedRace.getWind(position, toTimePointExcluding);
|
||||
@@ -4854,39 +4862,44 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
|
||||
if (configuration.getRRS26Configuration() != null) {
|
||||
dto.rrs26Configuration = new DeviceConfigurationDTO.RegattaConfigurationDTO.RRS26ConfigurationDTO();
|
||||
dto.rrs26Configuration.classFlag = configuration.getRRS26Configuration().getClassFlag();
|
||||
dto.rrs26Configuration.hasIndividualRecall = configuration.getRRS26Configuration().hasIndividualRecall();
|
||||
dto.rrs26Configuration.isResultEntryEnabled = configuration.getRRS26Configuration().isResultEntryEnabled();
|
||||
dto.rrs26Configuration.startModeFlags = configuration.getRRS26Configuration().getStartModeFlags();
|
||||
copyBasicRacingProcedureProperties(configuration.getRRS26Configuration(), dto.rrs26Configuration);
|
||||
copyRacingProcedureWithConfigurableStartModeFlagProperties(configuration.getRRS26Configuration(), dto.rrs26Configuration);
|
||||
}
|
||||
if (configuration.getSWCStartConfiguration() != null) {
|
||||
dto.swcStartConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.SWCStartConfigurationDTO();
|
||||
copyBasicRacingProcedureProperties(configuration.getSWCStartConfiguration(), dto.swcStartConfiguration);
|
||||
copyRacingProcedureWithConfigurableStartModeFlagProperties(configuration.getSWCStartConfiguration(), dto.swcStartConfiguration);
|
||||
}
|
||||
if (configuration.getGateStartConfiguration() != null) {
|
||||
dto.gateStartConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.GateStartConfigurationDTO();
|
||||
dto.gateStartConfiguration.classFlag = configuration.getGateStartConfiguration().getClassFlag();
|
||||
dto.gateStartConfiguration.hasIndividualRecall = configuration.getGateStartConfiguration().hasIndividualRecall();
|
||||
dto.gateStartConfiguration.isResultEntryEnabled = configuration.getGateStartConfiguration().isResultEntryEnabled();
|
||||
copyBasicRacingProcedureProperties(configuration.getGateStartConfiguration(), dto.gateStartConfiguration);
|
||||
dto.gateStartConfiguration.hasPathfinder = configuration.getGateStartConfiguration().hasPathfinder();
|
||||
dto.gateStartConfiguration.hasAdditionalGolfDownTime = configuration.getGateStartConfiguration().hasAdditionalGolfDownTime();
|
||||
}
|
||||
if (configuration.getESSConfiguration() != null) {
|
||||
dto.essConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.ESSConfigurationDTO();
|
||||
dto.essConfiguration.classFlag = configuration.getESSConfiguration().getClassFlag();
|
||||
dto.essConfiguration.hasIndividualRecall = configuration.getESSConfiguration().hasIndividualRecall();
|
||||
dto.essConfiguration.isResultEntryEnabled = configuration.getESSConfiguration().isResultEntryEnabled();
|
||||
copyBasicRacingProcedureProperties(configuration.getESSConfiguration(), dto.essConfiguration);
|
||||
}
|
||||
if (configuration.getBasicConfiguration() != null) {
|
||||
dto.basicConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.RacingProcedureConfigurationDTO();
|
||||
dto.basicConfiguration.classFlag = configuration.getBasicConfiguration().getClassFlag();
|
||||
dto.basicConfiguration.hasIndividualRecall = configuration.getBasicConfiguration().hasIndividualRecall();
|
||||
dto.basicConfiguration.isResultEntryEnabled = configuration.getBasicConfiguration().isResultEntryEnabled();
|
||||
copyBasicRacingProcedureProperties(configuration.getBasicConfiguration(), dto.basicConfiguration);
|
||||
}
|
||||
if (configuration.getLeagueConfiguration() != null) {
|
||||
dto.leagueConfiguration = new DeviceConfigurationDTO.RegattaConfigurationDTO.LeagueConfigurationDTO();
|
||||
dto.leagueConfiguration.classFlag = configuration.getLeagueConfiguration().getClassFlag();
|
||||
dto.leagueConfiguration.hasIndividualRecall = configuration.getLeagueConfiguration().hasIndividualRecall();
|
||||
dto.leagueConfiguration.isResultEntryEnabled = configuration.getLeagueConfiguration().isResultEntryEnabled();
|
||||
copyBasicRacingProcedureProperties(configuration.getLeagueConfiguration(), dto.leagueConfiguration);
|
||||
}
|
||||
return dto;
|
||||
}
|
||||
|
||||
private void copyBasicRacingProcedureProperties(RacingProcedureConfiguration configuration, final RacingProcedureConfigurationDTO racingProcedureConfigurationDTO) {
|
||||
racingProcedureConfigurationDTO.classFlag = configuration.getClassFlag();
|
||||
racingProcedureConfigurationDTO.hasIndividualRecall = configuration.hasIndividualRecall();
|
||||
racingProcedureConfigurationDTO.isResultEntryEnabled = configuration.isResultEntryEnabled();
|
||||
}
|
||||
|
||||
private void copyRacingProcedureWithConfigurableStartModeFlagProperties(ConfigurableStartModeFlagRacingProcedureConfiguration configuration, final RacingProcedureWithConfigurableStartModeFlagConfigurationDTO racingProcedureConfigurationDTO) {
|
||||
racingProcedureConfigurationDTO.startModeFlags = configuration.getStartModeFlags();
|
||||
}
|
||||
|
||||
private DeviceConfigurationImpl convertToDeviceConfiguration(DeviceConfigurationDTO dto) {
|
||||
DeviceConfigurationImpl configuration = new DeviceConfigurationImpl(convertToRegattaConfiguration(dto.regattaConfiguration));
|
||||
@@ -4906,9 +4919,15 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
if (dto.rrs26Configuration != null) {
|
||||
RRS26ConfigurationImpl config = new RRS26ConfigurationImpl();
|
||||
applyGeneralRacingProcedureConfigProperties(dto.rrs26Configuration, config);
|
||||
config.setStartModeFlags(dto.rrs26Configuration.startModeFlags);
|
||||
applyRacingProcedureWithConfigurableStartModeFlagConfigProperties(dto.rrs26Configuration, config);
|
||||
configuration.setRRS26Configuration(config);
|
||||
}
|
||||
if (dto.swcStartConfiguration != null) {
|
||||
SWCStartConfigurationImpl config = new SWCStartConfigurationImpl();
|
||||
applyGeneralRacingProcedureConfigProperties(dto.swcStartConfiguration, config);
|
||||
applyRacingProcedureWithConfigurableStartModeFlagConfigProperties(dto.swcStartConfiguration, config);
|
||||
configuration.setSWCStartConfiguration(config);
|
||||
}
|
||||
if (dto.gateStartConfiguration != null) {
|
||||
GateStartConfigurationImpl config = new GateStartConfigurationImpl();
|
||||
applyGeneralRacingProcedureConfigProperties(dto.gateStartConfiguration, config);
|
||||
@@ -4941,6 +4960,12 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
config.setResultEntryEnabled(racingProcedureConfigurationDTO.isResultEntryEnabled);
|
||||
}
|
||||
|
||||
private void applyRacingProcedureWithConfigurableStartModeFlagConfigProperties(
|
||||
RacingProcedureWithConfigurableStartModeFlagConfigurationDTO racingProcedureConfigurationDTO,
|
||||
RacingProcedureWithConfigurableStartModeFlagConfigurationImpl config) {
|
||||
config.setStartModeFlags(racingProcedureConfigurationDTO.startModeFlags);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setStartTimeAndProcedure(RaceLogSetStartTimeAndProcedureDTO dto) {
|
||||
TimePoint newStartTime = getService().setStartTimeAndProcedure(dto.leaderboardName, dto.raceColumnName,
|
||||
|
||||
+8
-1
@@ -10,10 +10,16 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
public class DeviceConfigurationDTO implements IsSerializable {
|
||||
|
||||
public static class RegattaConfigurationDTO implements IsSerializable {
|
||||
public static class RRS26ConfigurationDTO extends RacingProcedureConfigurationDTO {
|
||||
public static class RacingProcedureWithConfigurableStartModeFlagConfigurationDTO extends RacingProcedureConfigurationDTO {
|
||||
public List<Flags> startModeFlags;
|
||||
}
|
||||
|
||||
public static class RRS26ConfigurationDTO extends RacingProcedureWithConfigurableStartModeFlagConfigurationDTO {
|
||||
}
|
||||
|
||||
public static class SWCStartConfigurationDTO extends RacingProcedureWithConfigurableStartModeFlagConfigurationDTO {
|
||||
}
|
||||
|
||||
public static class GateStartConfigurationDTO extends RacingProcedureConfigurationDTO {
|
||||
public Boolean hasPathfinder;
|
||||
public Boolean hasAdditionalGolfDownTime;
|
||||
@@ -36,6 +42,7 @@ public class DeviceConfigurationDTO implements IsSerializable {
|
||||
public CourseDesignerMode defaultCourseDesignerMode;
|
||||
|
||||
public RRS26ConfigurationDTO rrs26Configuration;
|
||||
public SWCStartConfigurationDTO swcStartConfiguration;
|
||||
public GateStartConfigurationDTO gateStartConfiguration;
|
||||
public ESSConfigurationDTO essConfiguration;
|
||||
public RacingProcedureConfigurationDTO basicConfiguration;
|
||||
|
||||
+3
-3
@@ -26,13 +26,13 @@ public class RaceInfoDTO implements IsSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
public static class RRS26InfoDTO implements RaceInfoExtensionDTO {
|
||||
public static class LineStartInfoDTO implements RaceInfoExtensionDTO {
|
||||
public Flags startModeFlag;
|
||||
|
||||
// for GWT serialization
|
||||
public RRS26InfoDTO() { }
|
||||
public LineStartInfoDTO() { }
|
||||
|
||||
public RRS26InfoDTO(Flags startMode) {
|
||||
public LineStartInfoDTO(Flags startMode) {
|
||||
this.startModeFlag = startMode;
|
||||
}
|
||||
}
|
||||
|
||||
+15
-3
@@ -4,7 +4,8 @@ import com.google.gwt.maps.client.controls.MapTypeStyle;
|
||||
import com.google.gwt.maps.client.maptypes.MapTypeStyleElementType;
|
||||
import com.google.gwt.maps.client.maptypes.MapTypeStyleFeatureType;
|
||||
import com.google.gwt.maps.client.maptypes.MapTypeStyler;
|
||||
import com.sap.sse.common.impl.RGBColor;
|
||||
import com.sap.sailing.gwt.ui.client.shared.racemap.ColorMapTypeStyler;
|
||||
import com.sap.sse.common.Color;
|
||||
|
||||
public class GoogleMapStyleHelper {
|
||||
|
||||
@@ -16,12 +17,23 @@ public class GoogleMapStyleHelper {
|
||||
return createElementStyleWithVisibility(featureType, MapTypeStyleElementType.ALL, "simplified");
|
||||
}
|
||||
|
||||
public static MapTypeStyle createColorStyle(MapTypeStyleFeatureType featureType, RGBColor color, int saturation, int lightness) {
|
||||
public static MapTypeStyle createColorStyle(MapTypeStyleFeatureType featureType, Color color, int saturation, int lightness) {
|
||||
return createElementStyleWithColor(featureType, MapTypeStyleElementType.ALL, color, saturation, lightness);
|
||||
}
|
||||
|
||||
public static MapTypeStyle createColorStyle(MapTypeStyleFeatureType featureType, Color color) {
|
||||
MapTypeStyle result = MapTypeStyle.newInstance();
|
||||
result.setFeatureType(featureType);
|
||||
result.setElementType(MapTypeStyleElementType.ALL);
|
||||
|
||||
MapTypeStyler[] typeStylers = new MapTypeStyler[3];
|
||||
typeStylers[0] = ColorMapTypeStyler.newColorStyler(color.getAsHtml()).cast();
|
||||
result.setStylers(typeStylers);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static MapTypeStyle createElementStyleWithColor(MapTypeStyleFeatureType featureType, MapTypeStyleElementType elementType,
|
||||
RGBColor rgbColor, int saturation, int ligthness) {
|
||||
Color rgbColor, int saturation, int ligthness) {
|
||||
MapTypeStyle result = MapTypeStyle.newInstance();
|
||||
result.setFeatureType(featureType);
|
||||
result.setElementType(elementType);
|
||||
|
||||
Regular → Executable
+2
@@ -10,6 +10,8 @@
|
||||
<li>The protest time is now more configurable. You can set the start time and
|
||||
the duration. The default protest duration is 90 min and the last duration is
|
||||
stored in the settings, so you don't need to change it the next time.</li>
|
||||
<li>If the protest time is set for a race, it is shown in the race summary view.</li>
|
||||
<li>Support for a new racing procedure for the Sailing World Cup, including "Oscar" flag</li>
|
||||
</ul>
|
||||
|
||||
<h5 class="articleSubheadline">October 2016</h5>
|
||||
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 353 B |
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:18:51Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.polars.datamining/resources/stringmessages/Polars_StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:53:44Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.polars.datamining/resources/stringmessages/Polars_StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="99b784fd6920a22f02e85034e5d2ef70" form="base64">H4sIAAAAAAAAAF2PTQrCQAyF93OKXEH32TiiFBSGunAdOrEObTPQaaHHd/6s4Cbv4yW8JMaPNOs3OTmgSRyU2a0jnqgbWCzUVksdaz+uk+AP1Y37RixvGAEylYwzLVRCIWExw3fN1TwubsMoEFU9ndiWpGdMBBmz2QTt5eUsy4I7QR66M4V15ika8TQZMBVVb67b/j74ALSew+fwAAAA</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:21:01Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.polars.datamining/resources/stringmessages/Polars_StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:53:44Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.polars.datamining/resources/stringmessages/Polars_StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="99b784fd6920a22f02e85034e5d2ef70" form="base64">H4sIAAAAAAAAAF2PTQrCQAyF93OKXEH32TiiFBSGunAdOrEObTPQaaHHd/6s4Cbv4yW8JMaPNOs3OTmgSRyU2a0jnqgbWCzUVksdaz+uk+AP1Y37RixvGAEylYwzLVRCIWExw3fN1TwubsMoEFU9ndiWpGdMBBmz2QTt5eUsy4I7QR66M4V15ika8TQZMBVVb67b/j74ALSew+fwAAAA</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:22:43Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.polars.datamining/resources/stringmessages/Polars_StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:53:44Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.polars.datamining/resources/stringmessages/Polars_StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="99b784fd6920a22f02e85034e5d2ef70" form="base64">H4sIAAAAAAAAAF2PTQrCQAyF93OKXEH32TiiFBSGunAdOrEObTPQaaHHd/6s4Cbv4yW8JMaPNOs3OTmgSRyU2a0jnqgbWCzUVksdaz+uk+AP1Y37RixvGAEylYwzLVRCIWExw3fN1TwubsMoEFU9ndiWpGdMBBmz2QTt5eUsy4I7QR66M4V15ika8TQZMBVVb67b/j74ALSew+fwAAAA</internal-file>
|
||||
|
||||
+12
-3
@@ -9,6 +9,7 @@ import com.sap.sailing.domain.base.configuration.procedures.ESSConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.GateStartConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LeagueConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.CourseDesignerMode;
|
||||
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
|
||||
@@ -18,21 +19,23 @@ import com.sap.sailing.server.gateway.serialization.impl.RegattaConfigurationJso
|
||||
public class RegattaConfigurationJsonDeserializer implements JsonDeserializer<RegattaConfiguration> {
|
||||
|
||||
public static RegattaConfigurationJsonDeserializer create() {
|
||||
return new RegattaConfigurationJsonDeserializer(RRS26ConfigurationJsonDeserializer.create(),
|
||||
return new RegattaConfigurationJsonDeserializer(RRS26ConfigurationJsonDeserializer.create(), SWCStartConfigurationJsonDeserializer.create(),
|
||||
GateStartConfigurationJsonDeserializer.create(), ESSConfigurationJsonDeserializer.create(),
|
||||
RacingProcedureConfigurationJsonDeserializer.create(), LeagueConfigurationJsonDeserializer.create());
|
||||
}
|
||||
|
||||
private final RRS26ConfigurationJsonDeserializer rrs26Deserializer;
|
||||
private final SWCStartConfigurationJsonDeserializer swcStartDeserializer;
|
||||
private final GateStartConfigurationJsonDeserializer gateStartDeserializer;
|
||||
private final ESSConfigurationJsonDeserializer essDeserializer;
|
||||
private final RacingProcedureConfigurationJsonDeserializer basicDeserializer;
|
||||
private final LeagueConfigurationJsonDeserializer leagueDeserializer;
|
||||
|
||||
public RegattaConfigurationJsonDeserializer(RRS26ConfigurationJsonDeserializer rrs26,
|
||||
public RegattaConfigurationJsonDeserializer(RRS26ConfigurationJsonDeserializer rrs26, SWCStartConfigurationJsonDeserializer swcStart,
|
||||
GateStartConfigurationJsonDeserializer gateStart, ESSConfigurationJsonDeserializer ess,
|
||||
RacingProcedureConfigurationJsonDeserializer basicDeserializer, LeagueConfigurationJsonDeserializer leagueDeserializer) {
|
||||
this.rrs26Deserializer = rrs26;
|
||||
this.swcStartDeserializer = swcStart;
|
||||
this.gateStartDeserializer = gateStart;
|
||||
this.essDeserializer = ess;
|
||||
this.basicDeserializer = basicDeserializer;
|
||||
@@ -60,7 +63,13 @@ public class RegattaConfigurationJsonDeserializer implements JsonDeserializer<Re
|
||||
Helpers.getNestedObjectSafe(object, RegattaConfigurationJsonSerializer.FIELD_RRS26));
|
||||
configuration.setRRS26Configuration(rrs26Configuration);
|
||||
}
|
||||
|
||||
|
||||
if (object.containsKey(RegattaConfigurationJsonSerializer.FIELD_SWC_START)) {
|
||||
SWCStartConfiguration swcStartConfiguration = swcStartDeserializer.deserialize(
|
||||
Helpers.getNestedObjectSafe(object, RegattaConfigurationJsonSerializer.FIELD_SWC_START));
|
||||
configuration.setSWCStartConfiguration(swcStartConfiguration);
|
||||
}
|
||||
|
||||
if (object.containsKey(RegattaConfigurationJsonSerializer.FIELD_GATE_START)) {
|
||||
GateStartConfiguration gateStartConfiguration =
|
||||
gateStartDeserializer.deserialize(
|
||||
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
package com.sap.sailing.server.gateway.deserialization.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.JSONObject;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.impl.SWCStartConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
|
||||
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
|
||||
import com.sap.sailing.server.gateway.serialization.impl.SWCStartConfigurationJsonSerializer;
|
||||
|
||||
public class SWCStartConfigurationJsonDeserializer extends RacingProcedureConfigurationJsonDeserializer implements
|
||||
JsonDeserializer<RacingProcedureConfiguration> {
|
||||
|
||||
public static SWCStartConfigurationJsonDeserializer create() {
|
||||
return new SWCStartConfigurationJsonDeserializer();
|
||||
}
|
||||
|
||||
public SWCStartConfigurationJsonDeserializer() {
|
||||
super();
|
||||
}
|
||||
|
||||
@Override
|
||||
public SWCStartConfiguration deserialize(JSONObject object) throws JsonDeserializationException {
|
||||
return (SWCStartConfiguration) super.deserialize(object);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RacingProcedureConfiguration createResult(JSONObject object, Boolean inidividualRecall, Boolean resultEntryEnabled, Flags classFlag)
|
||||
throws JsonDeserializationException {
|
||||
List<Flags> startModeFlags = null;
|
||||
if (object.containsKey(SWCStartConfigurationJsonSerializer.FIELD_START_MODE_FLAGS)) {
|
||||
startModeFlags = new ArrayList<Flags>();
|
||||
JSONArray objects = Helpers.getNestedArraySafe(object,
|
||||
SWCStartConfigurationJsonSerializer.FIELD_START_MODE_FLAGS);
|
||||
for (Object value : objects) {
|
||||
startModeFlags.add(Flags.valueOf(value.toString()));
|
||||
}
|
||||
}
|
||||
SWCStartConfigurationImpl result = new SWCStartConfigurationImpl();
|
||||
result.setClassFlag(classFlag);
|
||||
result.setHasIndividualRecall(inidividualRecall);
|
||||
result.setResultEntryEnabled(resultEntryEnabled);
|
||||
result.setStartModeFlags(startModeFlags);
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
+9
-2
@@ -9,7 +9,7 @@ import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
public class RegattaConfigurationJsonSerializer implements JsonSerializer<RegattaConfiguration> {
|
||||
|
||||
public static RegattaConfigurationJsonSerializer create() {
|
||||
return new RegattaConfigurationJsonSerializer(RRS26ConfigurationJsonSerializer.create(),
|
||||
return new RegattaConfigurationJsonSerializer(RRS26ConfigurationJsonSerializer.create(), SWCStartConfigurationJsonSerializer.create(),
|
||||
GateStartConfigurationJsonSerializer.create(), ESSConfigurationJsonSerializer.create(),
|
||||
RacingProcedureConfigurationJsonSerializer.create(), LeagueConfigurationJsonSerializer.create());
|
||||
}
|
||||
@@ -17,21 +17,24 @@ public class RegattaConfigurationJsonSerializer implements JsonSerializer<Regatt
|
||||
public static final Object FIELD_DEFAULT_RACING_PROCEDURE_TYPE = "defaultRacingProcedureType";
|
||||
public static final Object FIELD_DEFAULT_COURSE_DESIGNER_MODE = "defaultCourseDesignerMode";
|
||||
public static final String FIELD_RRS26 = "rrs26";
|
||||
public static final String FIELD_SWC_START = "swcStart";
|
||||
public static final String FIELD_GATE_START = "gateStart";
|
||||
public static final String FIELD_ESS = "ess";
|
||||
public static final String FIELD_LEAGUE = "league";
|
||||
public static final String FIELD_BASIC = "basic";
|
||||
|
||||
private final JsonSerializer<RacingProcedureConfiguration> rrs26Serializer;
|
||||
private final JsonSerializer<RacingProcedureConfiguration> swcStartSerializer;
|
||||
private final JsonSerializer<RacingProcedureConfiguration> gateStartSerializer;
|
||||
private final JsonSerializer<RacingProcedureConfiguration> essSerializer;
|
||||
private final JsonSerializer<RacingProcedureConfiguration> basicSerializer;
|
||||
private final JsonSerializer<RacingProcedureConfiguration> leagueSerializer;
|
||||
|
||||
public RegattaConfigurationJsonSerializer(JsonSerializer<RacingProcedureConfiguration> rrs26,
|
||||
public RegattaConfigurationJsonSerializer(JsonSerializer<RacingProcedureConfiguration> rrs26, JsonSerializer<RacingProcedureConfiguration> swcStart,
|
||||
JsonSerializer<RacingProcedureConfiguration> gateStart, JsonSerializer<RacingProcedureConfiguration> ess,
|
||||
JsonSerializer<RacingProcedureConfiguration> basicSerializer, JsonSerializer<RacingProcedureConfiguration> leagueSerializer) {
|
||||
this.rrs26Serializer = rrs26;
|
||||
this.swcStartSerializer = swcStart;
|
||||
this.gateStartSerializer = gateStart;
|
||||
this.essSerializer = ess;
|
||||
this.basicSerializer = basicSerializer;
|
||||
@@ -51,6 +54,10 @@ public class RegattaConfigurationJsonSerializer implements JsonSerializer<Regatt
|
||||
result.put(FIELD_RRS26, rrs26Serializer.serialize(object.getRRS26Configuration()));
|
||||
}
|
||||
|
||||
if (object.getSWCStartConfiguration() != null) {
|
||||
result.put(FIELD_SWC_START, swcStartSerializer.serialize(object.getSWCStartConfiguration()));
|
||||
}
|
||||
|
||||
if (object.getGateStartConfiguration() != null) {
|
||||
result.put(FIELD_GATE_START, gateStartSerializer.serialize(object.getGateStartConfiguration()));
|
||||
}
|
||||
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package com.sap.sailing.server.gateway.serialization.impl;
|
||||
|
||||
import org.json.simple.JSONArray;
|
||||
import org.json.simple.JSONObject;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCStartConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
|
||||
public class SWCStartConfigurationJsonSerializer extends RacingProcedureConfigurationJsonSerializer implements
|
||||
JsonSerializer<RacingProcedureConfiguration> {
|
||||
|
||||
public static SWCStartConfigurationJsonSerializer create() {
|
||||
return new SWCStartConfigurationJsonSerializer();
|
||||
}
|
||||
|
||||
public static final String FIELD_START_MODE_FLAGS = "startModeFlags";
|
||||
|
||||
public SWCStartConfigurationJsonSerializer() {
|
||||
super();
|
||||
}
|
||||
|
||||
@Override
|
||||
public JSONObject serialize(RacingProcedureConfiguration baseObject) {
|
||||
JSONObject result = super.serialize(baseObject);
|
||||
SWCStartConfiguration object = (SWCStartConfiguration) baseObject;
|
||||
|
||||
if (object.getStartModeFlags() != null) {
|
||||
JSONArray startModeFlags = new JSONArray();
|
||||
for (Flags item : object.getStartModeFlags()) {
|
||||
startModeFlags.add(item);
|
||||
}
|
||||
result.put(FIELD_START_MODE_FLAGS, startModeFlags);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
+2
-1
@@ -35,6 +35,7 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
|
||||
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogEventSerializer;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
import com.sap.sse.common.impl.TimeRangeImpl;
|
||||
|
||||
public class RaceLogEventSerializerTest {
|
||||
|
||||
@@ -198,7 +199,7 @@ public class RaceLogEventSerializerTest {
|
||||
@Test
|
||||
public void testProtestStartTimeSerializer() {
|
||||
// we use the real event type here because we do not want to re-implement the dispatching.
|
||||
RaceLogEvent event = new RaceLogProtestStartTimeEventImpl(null, author, 0, null);
|
||||
RaceLogEvent event = new RaceLogProtestStartTimeEventImpl(null, author, 0, new TimeRangeImpl(MillisecondsTimePoint.now(), MillisecondsTimePoint.now()));
|
||||
serializer.serialize(event);
|
||||
verify(protestStartTimeEventSerializer).serialize(event);
|
||||
}
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:19:18Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:24Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="c8a799f35957b659646c59bd67421d2f" form="base64">H4sIAAAAAAAAAKVUTW/bMAy9+1cQ2CEbkAVpdwvgQ5YuWIChDZr2sKPs0A1XWTIk2VkQ5L+PkvNhtzZarBfbEh/f4yNlGZHiQt3jk3BO3GU/KlQuNrwJ+/EBSIGpQzDYXx0GoDNAD+Hl9WEQmZA9l4iun+Tz/tvhy5tUEsUaTaKFWZ8YGlsMGrdzmCJqJq02enuPtpTO/iL1/EBOYuw3WTbshmLtXYWmIty+xPgY6GMwQC+svOiAX0AeMFVC7iy90vZNEMdYFDHczaSw1qfMSZHd4HpVJn8wdbHfg0wb8ChIPSz0byMsZEcsfAWFZ0sgKkFSJBKjTzCewJn+VuQ4hKtJ0L9BmxoqHGnVXcB3vd7Ftw3ajiJ4fNxyEAYvoqOGoVWqDc60MeyEhU6emqyt3A6NPg+NIXdaeSH9ATepzgt05LRZMhJt3aCTl9k5GjgKD1kfJwOSFHpaUZ+NYOVC1zuPbsVg4V1y7KJV93+NIW0p9dbeM4de8c5BtLXePFaPBSeQevLH9WRmWv9VHWPdkpRgnTAOrObS3vdTDOF6Ao5y7JYNNuavxXzdDUFRFEb/pVw4lDtgJN9q7MSWyVloobhmBvBn/FuXwTX3CqliKVDaUUZpCHOvjM5hNV3Cirviw+GCcZTaETxocKVRfBtm7awhFDwki1CRJQc7XRooLRrg0jLiaXNZboP+9DxDglJvR5GPL+tw/Oixx0VEeWGIb+FF/Y74WYl0Fy/rd2SFLF1t5qeQUvumDKN/18D20lAGAAA=</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:21:25Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:23Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="c8a799f35957b659646c59bd67421d2f" form="base64">H4sIAAAAAAAAAKVUTW/bMAy9+1cQ2CEbkAVpdwvgQ5YuWIChDZr2sKPs0A1XWTIk2VkQ5L+PkvNhtzZarBfbEh/f4yNlGZHiQt3jk3BO3GU/KlQuNrwJ+/EBSIGpQzDYXx0GoDNAD+Hl9WEQmZA9l4iun+Tz/tvhy5tUEsUaTaKFWZ8YGlsMGrdzmCJqJq02enuPtpTO/iL1/EBOYuw3WTbshmLtXYWmIty+xPgY6GMwQC+svOiAX0AeMFVC7iy90vZNEMdYFDHczaSw1qfMSZHd4HpVJn8wdbHfg0wb8ChIPSz0byMsZEcsfAWFZ0sgKkFSJBKjTzCewJn+VuQ4hKtJ0L9BmxoqHGnVXcB3vd7Ftw3ajiJ4fNxyEAYvoqOGoVWqDc60MeyEhU6emqyt3A6NPg+NIXdaeSH9ATepzgt05LRZMhJt3aCTl9k5GjgKD1kfJwOSFHpaUZ+NYOVC1zuPbsVg4V1y7KJV93+NIW0p9dbeM4de8c5BtLXePFaPBSeQevLH9WRmWv9VHWPdkpRgnTAOrObS3vdTDOF6Ao5y7JYNNuavxXzdDUFRFEb/pVw4lDtgJN9q7MSWyVloobhmBvBn/FuXwTX3CqliKVDaUUZpCHOvjM5hNV3Cirviw+GCcZTaETxocKVRfBtm7awhFDwki1CRJQc7XRooLRrg0jLiaXNZboP+9DxDglJvR5GPL+tw/Oixx0VEeWGIb+FF/Y74WYl0Fy/rd2SFLF1t5qeQUvumDKN/18D20lAGAAA=</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:23:04Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:24Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sailing.server/resources/stringmessages/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="c8a799f35957b659646c59bd67421d2f" form="base64">H4sIAAAAAAAAAKVUTW/bMAy9+1cQ2CEbkAVpdwvgQ5YuWIChDZr2sKPs0A1XWTIk2VkQ5L+PkvNhtzZarBfbEh/f4yNlGZHiQt3jk3BO3GU/KlQuNrwJ+/EBSIGpQzDYXx0GoDNAD+Hl9WEQmZA9l4iun+Tz/tvhy5tUEsUaTaKFWZ8YGlsMGrdzmCJqJq02enuPtpTO/iL1/EBOYuw3WTbshmLtXYWmIty+xPgY6GMwQC+svOiAX0AeMFVC7iy90vZNEMdYFDHczaSw1qfMSZHd4HpVJn8wdbHfg0wb8ChIPSz0byMsZEcsfAWFZ0sgKkFSJBKjTzCewJn+VuQ4hKtJ0L9BmxoqHGnVXcB3vd7Ftw3ajiJ4fNxyEAYvoqOGoVWqDc60MeyEhU6emqyt3A6NPg+NIXdaeSH9ATepzgt05LRZMhJt3aCTl9k5GjgKD1kfJwOSFHpaUZ+NYOVC1zuPbsVg4V1y7KJV93+NIW0p9dbeM4de8c5BtLXePFaPBSeQevLH9WRmWv9VHWPdkpRgnTAOrObS3vdTDOF6Ao5y7JYNNuavxXzdDUFRFEb/pVw4lDtgJN9q7MSWyVloobhmBvBn/FuXwTX3CqliKVDaUUZpCHOvjM5hNV3Cirviw+GCcZTaETxocKVRfBtm7awhFDwki1CRJQc7XRooLRrg0jLiaXNZboP+9DxDglJvR5GPL+tw/Oixx0VEeWGIb+FF/Y74WYl0Fy/rd2SFLF1t5qeQUvumDKN/18D20lAGAAA=</internal-file>
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
package com.sap.sse.common.impl.test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNull;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import com.sap.sse.common.impl.AbstractColor;
|
||||
import com.sap.sse.common.impl.HSVColor;
|
||||
import com.sap.sse.common.impl.RGBColor;
|
||||
import com.sap.sse.common.Color;
|
||||
import com.sap.sse.common.Util.Triple;
|
||||
|
||||
import junit.framework.Assert;
|
||||
|
||||
@@ -71,5 +75,21 @@ public class AbstractColorTest {
|
||||
public void testRgbWithoutParentheses() {
|
||||
assertNull(AbstractColor.getCssColor("rgb"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testHSVConversion() {
|
||||
Color color = new RGBColor(5, 6, 7);
|
||||
Triple<Float, Float, Float> hsvValues = color.getAsHSV();
|
||||
HSVColor hsv = new HSVColor(hsvValues.getA(), hsvValues.getB(), hsvValues.getC());
|
||||
Triple<Integer, Integer, Integer> rgbValues = hsv.getAsRGB();
|
||||
assertEquals(5, (int) rgbValues.getA());
|
||||
assertEquals(6, (int) rgbValues.getB());
|
||||
assertEquals(7, (int) rgbValues.getC());
|
||||
// according to http://www.rapidtables.com/convert/color/rgb-to-hsv.htm rgb(5, 6, 7) equals
|
||||
// hsv(210, 0.286, 0.027)
|
||||
assertEquals(210.0, hsvValues.getA(), 0.01);
|
||||
assertEquals(0.286, hsvValues.getB(), 0.01);
|
||||
assertEquals(0.027, hsvValues.getC(), 0.01);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -107,7 +107,7 @@ public class RGBColor extends AbstractColor {
|
||||
}
|
||||
}
|
||||
|
||||
Util.Triple<Float, Float, Float> HSVColor = new Util.Triple<Float, Float, Float>(hue, saturation, brightness);
|
||||
Util.Triple<Float, Float, Float> HSVColor = new Util.Triple<Float, Float, Float>(hue * 360, saturation, brightness);
|
||||
return HSVColor;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:19:08Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:06Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="299055c6be272a85a07b907e3c6ce40a" form="base64">H4sIAAAAAAAAAD2MQQoCMQxF9znFLHWnB8hicCXSjYMHKBpLsE2hTQdhmLsbpuoieT958MeZig+EYyc4erAX7ICpJbQB59+cLH8JjqXfnXDKTRS3bQ1KpWKCi2St+BKzMdJdWQL+Yha4Um1RJw7CT6aCy2Eddstx3cP/d5absG6GZTAHH6Y6WeOvAAAA</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:21:16Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:06Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="299055c6be272a85a07b907e3c6ce40a" form="base64">H4sIAAAAAAAAAD2MQQoCMQxF9znFLHWnB8hicCXSjYMHKBpLsE2hTQdhmLsbpuoieT958MeZig+EYyc4erAX7ICpJbQB59+cLH8JjqXfnXDKTRS3bQ1KpWKCi2St+BKzMdJdWQL+Yha4Um1RJw7CT6aCy2Eddstx3cP/d5absG6GZTAHH6Y6WeOvAAAA</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:22:55Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:54:06Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.datamining/resources/stringmessages/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="299055c6be272a85a07b907e3c6ce40a" form="base64">H4sIAAAAAAAAAD2MQQoCMQxF9znFLHWnB8hicCXSjYMHKBpLsE2hTQdhmLsbpuoieT958MeZig+EYyc4erAX7ICpJbQB59+cLH8JjqXfnXDKTRS3bQ1KpWKCi2St+BKzMdJdWQL+Yha4Um1RJw7CT6aCy2Eddstx3cP/d5absG6GZTAHH6Y6WeOvAAAA</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:19:56Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:26Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="37afe0b1eb405886cd475fe305c64722" form="base64">H4sIAAAAAAAAAJ1SwW7bMAy95yt4bNHBPeTcQ4tiQLGiGNrmAxiZTojSkiHKSb3Dvn2klGTddSdL1OPj4/PT9SNpuHsrKRMMLKSQItyP+Ms+b+sO3vcEmXSWwnFXERBxJGAFhIyxTyNsNk+PMMmsUAydMu84ojQwxd4au5Wu70Mg1ae+DmwXsL4rITwQbAXjB5QEsxL8vu3wqLchU0+xMIoCRy2E/fWF6ActTToZrMCJ0Kr/wfgwhw8qL7ZXpfQDpAFa+UxxtUf1M0q2tgXok7V8A7PAnzNEol5B52HgwDYEJsojq3KKer2SFFBOgvOBg7mdMqj5fvbVFVUDK7S5p4tpHDv4Xt93JsY7qHdohf3Esr9xaNXsWgJG2Nqx+mFILLBFpU2Wv7iXVMhG2ZPPCykW1yuLSzHmEx7GWSsi0+DxuLDyVjwUo7HI4hGxMPhY34g+cZyEKnbPdDAF2wXGNMcaIDz1fV3vax8M2QKlBQuHTnFSZPH8BKumZk+mSTi0f3HxoGsGPzTl1Wc/w+b1GW7gsvhdLRx9JZgnSdibvirlyCL/btgYn88TKme9gV/PqXDtbRf7Mbij1R9TuhdHUgMAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:21:58Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:26Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="37afe0b1eb405886cd475fe305c64722" form="base64">H4sIAAAAAAAAAJ1SwW7bMAy95yt4bNHBPeTcQ4tiQLGiGNrmAxiZTojSkiHKSb3Dvn2klGTddSdL1OPj4/PT9SNpuHsrKRMMLKSQItyP+Ms+b+sO3vcEmXSWwnFXERBxJGAFhIyxTyNsNk+PMMmsUAydMu84ojQwxd4au5Wu70Mg1ae+DmwXsL4rITwQbAXjB5QEsxL8vu3wqLchU0+xMIoCRy2E/fWF6ActTToZrMCJ0Kr/wfgwhw8qL7ZXpfQDpAFa+UxxtUf1M0q2tgXok7V8A7PAnzNEol5B52HgwDYEJsojq3KKer2SFFBOgvOBg7mdMqj5fvbVFVUDK7S5p4tpHDv4Xt93JsY7qHdohf3Esr9xaNXsWgJG2Nqx+mFILLBFpU2Wv7iXVMhG2ZPPCykW1yuLSzHmEx7GWSsi0+DxuLDyVjwUo7HI4hGxMPhY34g+cZyEKnbPdDAF2wXGNMcaIDz1fV3vax8M2QKlBQuHTnFSZPH8BKumZk+mSTi0f3HxoGsGPzTl1Wc/w+b1GW7gsvhdLRx9JZgnSdibvirlyCL/btgYn88TKme9gV/PqXDtbRf7Mbij1R9TuhdHUgMAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:23:42Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:26Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.filestorage/resources/stringmessages/FileStorageStringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="37afe0b1eb405886cd475fe305c64722" form="base64">H4sIAAAAAAAAAJ1SwW7bMAy95yt4bNHBPeTcQ4tiQLGiGNrmAxiZTojSkiHKSb3Dvn2klGTddSdL1OPj4/PT9SNpuHsrKRMMLKSQItyP+Ms+b+sO3vcEmXSWwnFXERBxJGAFhIyxTyNsNk+PMMmsUAydMu84ojQwxd4au5Wu70Mg1ae+DmwXsL4rITwQbAXjB5QEsxL8vu3wqLchU0+xMIoCRy2E/fWF6ActTToZrMCJ0Kr/wfgwhw8qL7ZXpfQDpAFa+UxxtUf1M0q2tgXok7V8A7PAnzNEol5B52HgwDYEJsojq3KKer2SFFBOgvOBg7mdMqj5fvbVFVUDK7S5p4tpHDv4Xt93JsY7qHdohf3Esr9xaNXsWgJG2Nqx+mFILLBFpU2Wv7iXVMhG2ZPPCykW1yuLSzHmEx7GWSsi0+DxuLDyVjwUo7HI4hGxMPhY34g+cZyEKnbPdDAF2wXGNMcaIDz1fV3vax8M2QKlBQuHTnFSZPH8BKumZk+mSTi0f3HxoGsGPzTl1Wc/w+b1GW7gsvhdLRx9JZgnSdibvirlyCL/btgYn88TKme9gV/PqXDtbRf7Mbij1R9TuhdHUgMAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:20:17Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:54Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="85e48bcf9e250e66161b1b03d11cf699" form="base64">H4sIAAAAAAAAAH1SzU4jMQy+5yn8BIgXyKEa2MuuAFEEZ5O4naiZZOR4WiG0746TtLNod+Hi/2/8eb4UPJLdqjFMU9b4sTmTD/b+p3GYHEU7NGfQe7vx3pAPYm/VmEJ8JL5lzmw3CagGkJ1bmMnDaQyRAEVomiWkPUgGl5OgE5CRoKOv4CESFgI3kjvAW14YEskp86FOJ3IScgJMHoTfAPcY0pVxMReyQ7WNudADZ0d+YRowxnaGEKxFqNUz30eaY6Bity0D7qlp7Ic8TUsKDivhlyBjH7LtRuXzqQsnbZ+PMHpT0L+3aU73yKb0WLcIYIE+YFxeor/L8kRFlNxMLJXKUMuQsv4YbcC8dlaAfua/87rqi/G+v/IPjv5CdDaNvDZX1K+M/itY1N63uCOGiK/xAi3/YC8DF3hR5XZMZVS1mjcJJ7J3aswR40L2uVrjqTgOc30G9uZP3AXryiiTtAv7hbFNDZ+zqkbVqwreg7Xyowk+50RJ1i7sVOn3699mbu9yS1GfoD0/0tIy8wFPN7vhNwMAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:22:23Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:54Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="85e48bcf9e250e66161b1b03d11cf699" form="base64">H4sIAAAAAAAAAH1SzU4jMQy+5yn8BIgXyKEa2MuuAFEEZ5O4naiZZOR4WiG0746TtLNod+Hi/2/8eb4UPJLdqjFMU9b4sTmTD/b+p3GYHEU7NGfQe7vx3pAPYm/VmEJ8JL5lzmw3CagGkJ1bmMnDaQyRAEVomiWkPUgGl5OgE5CRoKOv4CESFgI3kjvAW14YEskp86FOJ3IScgJMHoTfAPcY0pVxMReyQ7WNudADZ0d+YRowxnaGEKxFqNUz30eaY6Bity0D7qlp7Ic8TUsKDivhlyBjH7LtRuXzqQsnbZ+PMHpT0L+3aU73yKb0WLcIYIE+YFxeor/L8kRFlNxMLJXKUMuQsv4YbcC8dlaAfua/87rqi/G+v/IPjv5CdDaNvDZX1K+M/itY1N63uCOGiK/xAi3/YC8DF3hR5XZMZVS1mjcJJ7J3aswR40L2uVrjqTgOc30G9uZP3AXryiiTtAv7hbFNDZ+zqkbVqwreg7Xyowk+50RJ1i7sVOn3699mbu9yS1GfoD0/0tIy8wFPN7vhNwMAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:24:11Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:54Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/filestorage/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="85e48bcf9e250e66161b1b03d11cf699" form="base64">H4sIAAAAAAAAAH1SzU4jMQy+5yn8BIgXyKEa2MuuAFEEZ5O4naiZZOR4WiG0746TtLNod+Hi/2/8eb4UPJLdqjFMU9b4sTmTD/b+p3GYHEU7NGfQe7vx3pAPYm/VmEJ8JL5lzmw3CagGkJ1bmMnDaQyRAEVomiWkPUgGl5OgE5CRoKOv4CESFgI3kjvAW14YEskp86FOJ3IScgJMHoTfAPcY0pVxMReyQ7WNudADZ0d+YRowxnaGEKxFqNUz30eaY6Bity0D7qlp7Ic8TUsKDivhlyBjH7LtRuXzqQsnbZ+PMHpT0L+3aU73yKb0WLcIYIE+YFxeor/L8kRFlNxMLJXKUMuQsv4YbcC8dlaAfua/87rqi/G+v/IPjv5CdDaNvDZX1K+M/itY1N63uCOGiK/xAi3/YC8DF3hR5XZMZVS1mjcJJ7J3aswR40L2uVrjqTgOc30G9uZP3AXryiiTtAv7hbFNDZ+zqkbVqwreg7Xyowk+50RJ1i7sVOn3699mbu9yS1GfoD0/0tIy8wFPN7vhNwMAAA==</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:20:07Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:41Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties" source-language="en" target-language="ja">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="d38efe4badae12b0c22cb2104d135a30" form="base64">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</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:22:09Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:40Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties" source-language="en" target-language="ru">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="d38efe4badae12b0c22cb2104d135a30" form="base64">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</internal-file>
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-09T11:23:59Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<file datatype="javapropertyresourcebundle" date="2016-11-23T14:55:41Z" original="/usr/sap/ljs/app/Converter_2566045106627533633/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/i18n/StringMessages.properties" source-language="en" target-language="zh-CN">
|
||||
<header>
|
||||
<skl>
|
||||
<internal-file crc="d38efe4badae12b0c22cb2104d135a30" form="base64">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</internal-file>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<string name="preference_energy_saving_sending_interval_summary">Choose a value as high as possible to preserve battery life while still maintaining a reasonable live experience, depending on your use case.</string>
|
||||
|
||||
<string name="preference_energy_saving_sending_interval_message">GPS updates will be sent to the server%1$s %2$s.</string>
|
||||
<string name="preference_energy_saving_sending_interval_message_key">msgSndIntMessage</string>
|
||||
<string name="preference_energy_saving_sending_interval_message_key" translatable="false">msgSndIntMessage</string>
|
||||
<string name="preference_energy_saving_sending_interval_message_every">every</string>
|
||||
<string-array name="preference_energy_saving_sending_interval_entries">
|
||||
<item>immediately</item>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 490 B |
Loaded 100 of 134 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user